27 lines
845 B
Diff
27 lines
845 B
Diff
|
From b78860242162ab5ef1e73973eeca36e0261bfeb5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: xiaoyuliang <xiaoyuliang@kylinos.cn>
|
||
|
|
Date: Wed, 21 Aug 2024 11:26:41 +0800
|
||
|
|
Subject: [PATCH] Add if condition to avoid assertion failed error in
|
||
|
|
blockdev_init
|
||
|
|
|
||
|
|
---
|
||
|
|
blockdev.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/blockdev.c b/blockdev.c
|
||
|
|
index bc7a947dea..d2fe5c361c 100644
|
||
|
|
--- a/blockdev.c
|
||
|
|
+++ b/blockdev.c
|
||
|
|
@@ -588,7 +588,7 @@ static BlockBackend *blockdev_init(const char *file, QDict *bs_opts,
|
||
|
|
|
||
|
|
read_only = qemu_opt_get_bool(opts, BDRV_OPT_READ_ONLY, false);
|
||
|
|
|
||
|
|
- if (!file || !*file) {
|
||
|
|
+ if ((!file || !*file) && qdict_size(bs_opts) == 2) {
|
||
|
|
cache = qdict_get_try_str(bs_opts, BDRV_OPT_CACHE_NO_FLUSH);
|
||
|
|
if (cache && !strcmp(cache, "on")) {
|
||
|
|
bdrv_flags |= BDRV_O_NO_FLUSH;
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|