libvirt/libvirt-qemu_extdevice-Init...

51 lines
1.7 KiB
Diff

From 1d90c111815d3c96446b83f2f389363f44592a7a Mon Sep 17 00:00:00 2001
Message-Id: <1d90c111815d3c96446b83f2f389363f44592a7a@dist-git>
From: Michal Privoznik <mprivozn@redhat.com>
Date: Mon, 5 Dec 2022 12:27:24 +0100
Subject: [PATCH] qemu_extdevice: Init paths in qemuExtDevicesPrepareDomain()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The path generation phase belongs conceptually into domain
preparation phase and not host preparation. Move
qemuExtDevicesInitPaths() call from qemuExtDevicesPrepareHost()
into qemuExtDevicesPrepareDomain().
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
(cherry picked from commit f1958a3e5e465c389ce3c8cae2a26c5b00775440)
https://bugzilla.redhat.com/show_bug.cgi?id=2150760
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
src/qemu/qemu_extdevice.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c
index 3eaf6571a2..34454891f6 100644
--- a/src/qemu/qemu_extdevice.c
+++ b/src/qemu/qemu_extdevice.c
@@ -97,6 +97,9 @@ qemuExtDevicesPrepareDomain(virQEMUDriver *driver,
int ret = 0;
size_t i;
+ if (qemuExtDevicesInitPaths(driver, vm->def) < 0)
+ return -1;
+
for (i = 0; i < vm->def->nvideos; i++) {
virDomainVideoDef *video = vm->def->videos[i];
@@ -134,9 +137,6 @@ qemuExtDevicesPrepareHost(virQEMUDriver *driver,
virDomainDef *def = vm->def;
size_t i;
- if (qemuExtDevicesInitPaths(driver, def) < 0)
- return -1;
-
for (i = 0; i < def->ntpms; i++) {
virDomainTPMDef *tpm = def->tpms[i];
--
2.38.1