From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53823) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0XtB-0006eU-O2 for qemu-devel@nongnu.org; Thu, 04 Jun 2015 12:21:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z0XtA-0004qT-AM for qemu-devel@nongnu.org; Thu, 04 Jun 2015 12:21:05 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:34378) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0XtA-0004o9-4b for qemu-devel@nongnu.org; Thu, 04 Jun 2015 12:21:04 -0400 From: Peter Maydell Date: Thu, 4 Jun 2015 17:20:50 +0100 Message-Id: <1433434853-19229-2-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1433434853-19229-1-git-send-email-peter.maydell@linaro.org> References: <1433434853-19229-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 1/4] blockdev: Factor out create_implicit_virtio_device List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , qemu-block@nongnu.org, patches@linaro.org, Markus Armbruster , Alexander Graf , Christian Borntraeger , Cornelia Huck Factor out the code which creates the implicit virtio device for IF_VIRTIO drives, so we can call it from drive_check_orphaned(). Signed-off-by: Peter Maydell --- blockdev.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/blockdev.c b/blockdev.c index de94a8b..9cf6123 100644 --- a/blockdev.c +++ b/blockdev.c @@ -212,6 +212,27 @@ DriveInfo *drive_get(BlockInterfaceType type, int bus, int unit) return NULL; } +/* Create the virtio device whose existence is implied by the + * creation of a block device with if=virtio. + */ +static void create_implicit_virtio_device(const char *driveid, + const char *devaddr) +{ + QemuOpts *devopts; + + devopts = qemu_opts_create(qemu_find_opts("device"), NULL, 0, + &error_abort); + if (arch_type == QEMU_ARCH_S390X) { + qemu_opt_set(devopts, "driver", "virtio-blk-s390", &error_abort); + } else { + qemu_opt_set(devopts, "driver", "virtio-blk-pci", &error_abort); + } + qemu_opt_set(devopts, "drive", driveid, &error_abort); + if (devaddr) { + qemu_opt_set(devopts, "addr", devaddr, &error_abort); + } +} + bool drive_check_orphaned(void) { BlockBackend *blk; @@ -929,19 +950,7 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type) } if (type == IF_VIRTIO) { - QemuOpts *devopts; - devopts = qemu_opts_create(qemu_find_opts("device"), NULL, 0, - &error_abort); - if (arch_type == QEMU_ARCH_S390X) { - qemu_opt_set(devopts, "driver", "virtio-blk-s390", &error_abort); - } else { - qemu_opt_set(devopts, "driver", "virtio-blk-pci", &error_abort); - } - qemu_opt_set(devopts, "drive", qdict_get_str(bs_opts, "id"), - &error_abort); - if (devaddr) { - qemu_opt_set(devopts, "addr", devaddr, &error_abort); - } + create_implicit_virtio_device(qdict_get_str(bs_opts, "id"), devaddr); } filename = qemu_opt_get(legacy_opts, "file"); -- 1.9.1