[Qemu-devel] [PATCH for-3.1 v10 30/31] block: BDS options may lack the "driver" option

Max Reitz posted 31 patches 7 years, 6 months ago
There is a newer version of this series
[Qemu-devel] [PATCH for-3.1 v10 30/31] block: BDS options may lack the "driver" option
Posted by Max Reitz 7 years, 6 months ago
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>
---
 block.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/block.c b/block.c
index c4aec7ea65..5118d992c3 100644
--- a/block.c
+++ b/block.c
@@ -5242,6 +5242,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;
 }
 
-- 
2.17.1


Re: [Qemu-devel] [PATCH for-3.1 v10 30/31] block: BDS options may lack the "driver" option
Posted by Alberto Garcia 7 years, 5 months ago
On Thu 09 Aug 2018 11:35:27 PM CEST, Max Reitz wrote:
> 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>

Berto