From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:38515) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyI5p-0001KV-Ci for qemu-devel@nongnu.org; Mon, 25 Feb 2019 10:22:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyI5o-0001qR-NC for qemu-devel@nongnu.org; Mon, 25 Feb 2019 10:22:57 -0500 From: Kevin Wolf Date: Mon, 25 Feb 2019 16:20:38 +0100 Message-Id: <20190225152053.15976-57-kwolf@redhat.com> In-Reply-To: <20190225152053.15976-1-kwolf@redhat.com> References: <20190225152053.15976-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 56/71] 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: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org From: Max Reitz 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 Message-id: 20190201192935.18394-31-mreitz@redhat.com Signed-off-by: Max Reitz --- block.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/block.c b/block.c index 9d9929e1a2..35e78e2172 100644 --- a/block.c +++ b/block.c @@ -5618,6 +5618,12 @@ static bool append_strong_runtime_options(QDict *d= , BlockDriverState *bs) } } =20 + 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; } =20 --=20 2.20.1