From: Max Reitz <mreitz@redhat.com>
Date: Fri, 1 Feb 2019 19:29:34 +0000 (+0100)
Subject: block: BDS options may lack the "driver" option
X-Git-Tag: v4.0.0-rc0~78^2^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=62a01a27f7f67853553679201e8617ccd28e965b;p=thirdparty%2Fqemu.git

block: BDS options may lack the "driver" option

When BDSs are created by qemu itself (e.g. as filters in block jobs),
they may not have a "driver" option in their options QDict.  When
generating a json:{} filename, however, it must always be present.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Message-id: 20190201192935.18394-31-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---

diff --git a/block.c b/block.c
index 9d9929e1a23..35e78e2172d 100644
--- a/block.c
+++ b/block.c
@@ -5618,6 +5618,12 @@ static bool append_strong_runtime_options(QDict *d, BlockDriverState *bs)
         }
     }
 
+    if (!qdict_haskey(d, "driver")) {
+        /* Drivers created with bdrv_new_open_driver() may not have a
+         * @driver option.  Add it here. */
+        qdict_put_str(d, "driver", bs->drv->format_name);
+    }
+
     return found_any;
 }