diff mbox

[2/4] blockdev: Don't call create_implicit_virtio_device() when it has no effect

Message ID 1433434853-19229-3-git-send-email-peter.maydell@linaro.org
State Superseded
Headers show

Commit Message

Peter Maydell June 4, 2015, 4:20 p.m. UTC 
create_implicit_virtio_device() just adds a device to the "device" QEMU
options list. This means that it only has an effect if it is called
before vl.c processes that list to create all the devices. If it is
called after that (ie for hotplug drives created from the monitor) then
it has no effect. To avoid confusion, don't call the code at all if
it isn't going to do anything.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 blockdev.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/blockdev.c b/blockdev.c
index 9cf6123..177b285 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -78,6 +78,11 @@  static int if_max_devs[IF_COUNT] = {
     [IF_SCSI] = 7,
 };
 
+/* True once we've created all the command line drives and run
+ * drive_check_orphaned().
+ */
+static bool done_orphan_check;
+
 /**
  * Boards may call this to offer board-by-board overrides
  * of the default, global values.
@@ -239,6 +244,8 @@  bool drive_check_orphaned(void)
     DriveInfo *dinfo;
     bool rs = false;
 
+    done_orphan_check = true;
+
     for (blk = blk_next(NULL); blk; blk = blk_next(blk)) {
         dinfo = blk_legacy_dinfo(blk);
         /* If dinfo->bdrv->dev is NULL, it has no device attached. */
@@ -949,7 +956,10 @@  DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
         goto fail;
     }
 
-    if (type == IF_VIRTIO) {
+    if (type == IF_VIRTIO && !done_orphan_check) {
+        /* Drives created via the monitor (hotplugged) do not get the
+         * magic implicit device created for them.
+         */
         create_implicit_virtio_device(qdict_get_str(bs_opts, "id"), devaddr);
     }