From c90d17c812a972399a8c7435dbe0ea8dab8e4b68 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Fri, 1 Oct 2021 15:22:17 +0200 Subject: [PATCH] qemu: process: Make qemuProcessPrepareDomainDiskBootorder more universal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename it to 'qemuProcessPrepareDeviceBootorder' and call it from 'qemuProcessPrepareDomain' rather than 'qemuProcessPrepareDomainStorage'. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/qemu/qemu_process.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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;