QEMU upstream (or qemu-xen) may not have set "running" state in
xenstore. "running" with QEMU doesn't mean that the binary is
running, it means that the emulation have started. When adding a
pci-passthrough device to QEMU, we do so via QMP, we have a direct
answer to whether QEMU is running or not, no need to check ahead.
Moving the check to do it only with qemu-trad makes upcoming changes
simpler.
Signed-off-by: Anthony PERARD <anthony.per...@citrix.com>
Acked-by: Ian Jackson <ian.jack...@eu.citrix.com>
---
tools/libxl/libxl_pci.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c
index b9ca69f5f0b3..071880b8556b 100644
--- a/tools/libxl/libxl_pci.c
+++ b/tools/libxl/libxl_pci.c
@@ -1004,13 +1004,13 @@ static int do_pci_add(libxl__gc *gc, uint32_t domid,
if (type == LIBXL_DOMAIN_TYPE_HVM) {
hvm = 1;
- if (libxl__wait_for_device_model_deprecated(gc, domid, "running",
- NULL, NULL, NULL) < 0) {
- rc = ERROR_FAIL;
- goto out;
- }
switch (libxl__device_model_version_running(gc, domid)) {
case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL:
+ if (libxl__wait_for_device_model_deprecated(gc, domid,
+ "running", NULL, NULL, NULL) < 0) {
+ rc = ERROR_FAIL;
+ goto out;
+ }
rc = qemu_pci_add_xenstore(gc, domid, pcidev);
break;
case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN:
@@ -1395,12 +1395,11 @@ static int do_pci_remove(libxl__gc *gc, uint32_t domid,
rc = ERROR_FAIL;
if (type == LIBXL_DOMAIN_TYPE_HVM) {
hvm = 1;
- if (libxl__wait_for_device_model_deprecated(gc, domid, "running",
- NULL, NULL, NULL) < 0)
- goto out_fail;
-
switch (libxl__device_model_version_running(gc, domid)) {
case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL:
+ if (libxl__wait_for_device_model_deprecated(gc, domid,
+ "running", NULL, NULL, NULL) < 0)
+ goto out_fail;
rc = qemu_pci_remove_xenstore(gc, domid, pcidev, force);
break;
case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN:
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
