All of lore.kernel.org
 help / color / mirror / Atom feed
From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>,
	Kevin Wolf <kwolf@redhat.com>
Subject: [Qemu-devel] [PATCH v9 30/31] block: BDS options may lack the "driver" option
Date: Thu, 28 Jun 2018 02:07:44 +0200	[thread overview]
Message-ID: <20180628000745.4477-31-mreitz@redhat.com> (raw)
In-Reply-To: <20180628000745.4477-1-mreitz@redhat.com>

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 10f8f0efb8..6d460e71bb 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

  parent reply	other threads:[~2018-06-28  0:08 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-28  0:07 [Qemu-devel] [PATCH v9 00/31] block: Fix some filename generation issues Max Reitz
2018-06-28  0:07 ` [Qemu-devel] [PATCH v9 01/31] block: Use bdrv_refresh_filename() to pull Max Reitz
2018-06-28 21:48   ` Eric Blake
2018-06-28  0:07 ` [Qemu-devel] [PATCH v9 02/31] block: Use children list in bdrv_refresh_filename Max Reitz
2018-07-19 12:47   ` [Qemu-devel] [Qemu-block] " Ari Sundholm
2018-07-21 21:14     ` Max Reitz
2018-07-23 12:15       ` Ari Sundholm
2018-06-28  0:07 ` [Qemu-devel] [PATCH v9 03/31] block: Skip implicit nodes for filename info Max Reitz
2018-06-28 21:49   ` Eric Blake
2018-08-07 14:31   ` [Qemu-devel] [Qemu-block] " Alberto Garcia
2018-06-28  0:07 ` [Qemu-devel] [PATCH v9 04/31] block: Add BDS.auto_backing_file Max Reitz
2018-06-28 21:55   ` Eric Blake
2018-06-28  0:07 ` [Qemu-devel] [PATCH v9 05/31] block: Respect backing bs in bdrv_refresh_filename Max Reitz
2018-06-28 21:58   ` Eric Blake
2018-06-28  0:07 ` [Qemu-devel] [PATCH v9 06/31] iotests.py: Add filter_imgfmt() Max Reitz
2018-06-28 21:59   ` Eric Blake
2018-08-07 15:15   ` [Qemu-devel] [Qemu-block] " Alberto Garcia
2018-06-28  0:07 ` [Qemu-devel] [PATCH v9 07/31] iotests.py: Add node_info() Max Reitz
2018-08-07 14:49   ` [Qemu-devel] [Qemu-block] " Alberto Garcia
2018-08-09 17:53     ` Max Reitz
2018-06-28  0:07 ` [Qemu-devel] [PATCH v9 08/31] iotests: Add test for backing file overrides Max Reitz
2018-06-28  0:07 ` [Qemu-devel] [PATCH v9 09/31] block: Make path_combine() return the path Max Reitz
2018-06-28  0:07 ` [Qemu-devel] [PATCH v9 10/31] block: bdrv_get_full_backing_filename_from_...'s ret. val Max Reitz
2018-08-07 15:03   ` [Qemu-devel] [Qemu-block] " Alberto Garcia
2018-06-28  0:07 ` [Qemu-devel] [PATCH v9 11/31] block: bdrv_get_full_backing_filename's " Max Reitz
2018-08-07 15:07   ` [Qemu-devel] [Qemu-block] " Alberto Garcia
2018-06-28  0:07 ` [Qemu-devel] [PATCH v9 12/31] block: Add bdrv_make_absolute_filename() Max Reitz
2018-08-07 15:07   ` [Qemu-devel] [Qemu-block] " Alberto Garcia
2018-06-28  0:07 ` [Qemu-devel] [PATCH v9 13/31] block: Fix bdrv_find_backing_image() Max Reitz
2018-08-07 15:10   ` [Qemu-devel] [Qemu-block] " Alberto Garcia
2018-06-28  0:07 ` [Qemu-devel] [PATCH v9 14/31] block: Add bdrv_dirname() Max Reitz
2018-08-07 15:11   ` [Qemu-devel] [Qemu-block] " Alberto Garcia
2018-06-28  0:07 ` [Qemu-devel] [PATCH v9 15/31] blkverify: Make bdrv_dirname() return NULL Max Reitz
2018-06-28  0:07 ` [Qemu-devel] [PATCH v9 16/31] quorum: " Max Reitz
2018-06-28  0:07 ` [Qemu-devel] [PATCH v9 17/31] block/nbd: " Max Reitz
2018-06-28 22:05   ` Eric Blake
2018-06-28  0:07 ` [Qemu-devel] [PATCH v9 18/31] block/nfs: Implement bdrv_dirname() Max Reitz
2018-06-28  0:07 ` [Qemu-devel] [PATCH v9 19/31] block: Use bdrv_dirname() for relative filenames Max Reitz
2018-06-28  0:07 ` [Qemu-devel] [PATCH v9 20/31] iotests: Add quorum case to test 110 Max Reitz
2018-06-28  0:07 ` [Qemu-devel] [PATCH v9 21/31] block: Add strong_runtime_opts to BlockDriver Max Reitz
2018-06-28  0:07 ` [Qemu-devel] [PATCH v9 22/31] block: Add BlockDriver.bdrv_gather_child_options Max Reitz
2018-06-28  0:07 ` [Qemu-devel] [PATCH v9 23/31] block: Generically refresh runtime options Max Reitz
2018-06-28  0:07 ` [Qemu-devel] [PATCH v9 24/31] block: Purify .bdrv_refresh_filename() Max Reitz
2018-06-28  0:07 ` [Qemu-devel] [PATCH v9 25/31] block: Do not copy exact_filename from format file Max Reitz
2018-06-28  0:07 ` [Qemu-devel] [PATCH v9 26/31] block/nvme: Fix bdrv_refresh_filename() Max Reitz
2018-06-28  0:07 ` [Qemu-devel] [PATCH v9 27/31] block/curl: Harmonize option defaults Max Reitz
2018-06-28  0:07 ` [Qemu-devel] [PATCH v9 28/31] block/curl: Implement bdrv_refresh_filename() Max Reitz
2018-06-28  0:07 ` [Qemu-devel] [PATCH v9 29/31] block/null: Generate filename even with latency-ns Max Reitz
2018-06-28  0:07 ` Max Reitz [this message]
2018-06-28  0:07 ` [Qemu-devel] [PATCH v9 31/31] iotests: Test json:{} filenames of internal BDSs Max Reitz
2018-07-13  9:49 ` [Qemu-devel] [PATCH v9 00/31] block: Fix some filename generation issues Max Reitz
2018-07-19 12:53   ` [Qemu-devel] [Qemu-block] " Ari Sundholm

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180628000745.4477-31-mreitz@redhat.com \
    --to=mreitz@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.