From 8278c1cf3ba3ad55f42ab690a83de66a76ec9316 Mon Sep 17 00:00:00 2001

From: Markus Armbruster <armbru@redhat.com>

Date: Fri, 17 May 2019 06:51:12 +0200

Subject: [PATCH 45/53] vl: Factor configure_blockdev() out of main()

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Markus Armbruster <armbru@redhat.com>

Message-id: <20190517065120.12028-24-armbru@redhat.com>

Patchwork-id: 88008

O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH v3 23/31] vl: Factor configure_blockdev() out of main()

Bugzilla: 1624009

RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>

RH-Acked-by: Thomas Huth <thuth@redhat.com>

RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>

Signed-off-by: Markus Armbruster <armbru@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Message-Id: <20190308131445.17502-7-armbru@redhat.com>

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

(cherry picked from commit d11bf9bf0fd66057aa5e8acb1bbc797419d5a4e6)

[Conflict in vl.c due to lack of commit c4f26c9f37c and 7c89fcbac86]

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 vl.c | 72 +++++++++++++++++++++++++++++++++++++++-----------------------------

 1 file changed, 41 insertions(+), 31 deletions(-)

diff --git a/vl.c b/vl.c

index a5c17a0..e0e60fb 100644

--- a/vl.c

+++ b/vl.c

@@ -1279,6 +1279,46 @@ typedef struct BlockdevOptionsQueueEntry {

 typedef QSIMPLEQ_HEAD(, BlockdevOptionsQueueEntry) BlockdevOptionsQueue;

+static void configure_blockdev(BlockdevOptionsQueue *bdo_queue,

+                               MachineClass *machine_class, int snapshot)

+{

+    /*

+     * If the currently selected machine wishes to override the

+     * units-per-bus property of its default HBA interface type, do so

+     * now.

+     */

+    if (machine_class->units_per_default_bus) {

+        override_max_devs(machine_class->block_default_type,

+                          machine_class->units_per_default_bus);

+    }

+

+    /* open the virtual block devices */

+    while (!QSIMPLEQ_EMPTY(bdo_queue)) {

+        BlockdevOptionsQueueEntry *bdo = QSIMPLEQ_FIRST(bdo_queue);

+

+        QSIMPLEQ_REMOVE_HEAD(bdo_queue, entry);

+        loc_push_restore(&bdo->loc);

+        qmp_blockdev_add(bdo->bdo, &error_fatal);

+        loc_pop(&bdo->loc);

+        qapi_free_BlockdevOptions(bdo->bdo);

+        g_free(bdo);

+    }

+    if (snapshot || replay_mode != REPLAY_MODE_NONE) {

+        qemu_opts_foreach(qemu_find_opts("drive"), drive_enable_snapshot,

+                          NULL, NULL);

+    }

+    if (qemu_opts_foreach(qemu_find_opts("drive"), drive_init_func,

+                          &machine_class->block_default_type, NULL)) {

+        exit(1);

+    }

+

+    default_drive(default_cdrom, snapshot, machine_class->block_default_type, 2,

+                  CDROM_OPTS);

+    default_drive(default_floppy, snapshot, IF_FLOPPY, 0, FD_OPTS);

+    default_drive(default_sdcard, snapshot, IF_SD, 0, SD_OPTS);

+

+}

+

 static QemuOptsList qemu_smp_opts = {

     .name = "smp-opts",

     .implied_opt_name = "cpus",

@@ -4550,37 +4590,7 @@ int main(int argc, char **argv, char **envp)

     ram_mig_init();

     dirty_bitmap_mig_init();

-    /* If the currently selected machine wishes to override the units-per-bus

-     * property of its default HBA interface type, do so now. */

-    if (machine_class->units_per_default_bus) {

-        override_max_devs(machine_class->block_default_type,

-                          machine_class->units_per_default_bus);

-    }

-

-    /* open the virtual block devices */

-    while (!QSIMPLEQ_EMPTY(&bdo_queue)) {

-        BlockdevOptionsQueueEntry *bdo = QSIMPLEQ_FIRST(&bdo_queue);

-

-        QSIMPLEQ_REMOVE_HEAD(&bdo_queue, entry);

-        loc_push_restore(&bdo->loc);

-        qmp_blockdev_add(bdo->bdo, &error_fatal);

-        loc_pop(&bdo->loc);

-        qapi_free_BlockdevOptions(bdo->bdo);

-        g_free(bdo);

-    }

-    if (snapshot || replay_mode != REPLAY_MODE_NONE) {

-        qemu_opts_foreach(qemu_find_opts("drive"), drive_enable_snapshot,

-                          NULL, NULL);

-    }

-    if (qemu_opts_foreach(qemu_find_opts("drive"), drive_init_func,

-                          &machine_class->block_default_type, NULL)) {

-        exit(1);

-    }

-

-    default_drive(default_cdrom, snapshot, machine_class->block_default_type, 2,

-                  CDROM_OPTS);

-    default_drive(default_floppy, snapshot, IF_FLOPPY, 0, FD_OPTS);

-    default_drive(default_sdcard, snapshot, IF_SD, 0, SD_OPTS);

+    configure_blockdev(&bdo_queue, machine_class, snapshot);

     if (qemu_opts_foreach(qemu_find_opts("mon"),

                           mon_init_func, NULL, NULL)) {

-- 

1.8.3.1