From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 1 Oct 2021 13:22:17 +0000 (+0200)
Subject: qemu: process: Make qemuProcessPrepareDomainDiskBootorder more universal
X-Git-Tag: v7.9.0-rc1~187
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c90d17c812a972399a8c7435dbe0ea8dab8e4b68;p=thirdparty%2Flibvirt.git

qemu: process: Make qemuProcessPrepareDomainDiskBootorder more universal

Rename it to 'qemuProcessPrepareDeviceBootorder' and call it from
'qemuProcessPrepareDomain' rather than
'qemuProcessPrepareDomainStorage'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index f5c28ed4bf..58fbb38c5e 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -6264,7 +6264,7 @@ qemuProcessPrepareDomainNUMAPlacement(virDomainObj *vm)
 
 
 static void
-qemuProcessPrepareDomainDiskBootorder(virDomainDef *def)
+qemuProcessPrepareDeviceBootorder(virDomainDef *def)
 {
     size_t i;
     unsigned int bootCD = 0;
@@ -6350,8 +6350,6 @@ qemuProcessPrepareDomainStorage(virQEMUDriver *driver,
             return -1;
     }
 
-    qemuProcessPrepareDomainDiskBootorder(vm->def);
-
     return 0;
 }
 
@@ -6559,6 +6557,8 @@ qemuProcessPrepareDomain(virQEMUDriver *driver,
     if (qemuAssignDeviceAliases(vm->def, priv->qemuCaps) < 0)
         return -1;
 
+    qemuProcessPrepareDeviceBootorder(vm->def);
+
     VIR_DEBUG("Setting graphics devices");
     if (qemuProcessSetupGraphics(driver, vm, priv->qemuCaps, flags) < 0)
         return -1;