From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57673) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g8ZjC-0003w7-Ur for qemu-devel@nongnu.org; Fri, 05 Oct 2018 19:41:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g8Zj7-0000sX-W9 for qemu-devel@nongnu.org; Fri, 05 Oct 2018 19:41:50 -0400 From: Max Reitz Date: Sat, 6 Oct 2018 01:40:22 +0200 Message-Id: <20181005234023.8104-31-mreitz@redhat.com> In-Reply-To: <20181005234023.8104-1-mreitz@redhat.com> References: <20181005234023.8104-1-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v11 30/31] block: BDS options may lack the "driver" option List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, Max Reitz , Kevin Wolf , Alberto Garcia 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 Reviewed-by: Alberto Garcia --- block.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/block.c b/block.c index 041adb90d1..ecb228b8f8 100644 --- a/block.c +++ b/block.c @@ -5306,6 +5306,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