qemu: caps: Always assume QEMU_CAPS_DEVICE_DEL_EVENT

DEVICE_DELETED was added in qemu commit 0402a5d65ec00 which was released
in v1.5.0.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 218dd7c7150c1fc402ac37bbfd3bb44f4de45803..7cb2c390d09778e7f9ec9f10095e03a7b1625117 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -987,7 +987,6 @@ struct virQEMUCapsStringFlags virQEMUCapsMigration[] = {
 };
 
 struct virQEMUCapsStringFlags virQEMUCapsEvents[] = {
-    { "DEVICE_DELETED", QEMU_CAPS_DEVICE_DEL_EVENT },
     { "MIGRATION", QEMU_CAPS_MIGRATION_EVENT },
     { "VSERPORT_CHANGE", QEMU_CAPS_VSERPORT_CHANGE },
     { "DEVICE_TRAY_MOVED", QEMU_CAPS_DEVICE_TRAY_MOVED },

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 9c1279bffb5badd462e76d11173645ce83e72612..bdfec4a84703d67bb88316549c7891fa8f06196f 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -257,7 +257,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
 
     /* 150 */
     X_QEMU_CAPS_VNC_SHARE_POLICY, /* set display sharing policy */
-    QEMU_CAPS_DEVICE_DEL_EVENT, /* DEVICE_DELETED event */
+    X_QEMU_CAPS_DEVICE_DEL_EVENT, /* DEVICE_DELETED event */
     QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, /* -device i82801b11-bridge */
     QEMU_CAPS_I440FX_PCI_HOLE64_SIZE, /* i440FX-pcihost.pci-hole64-size */
     QEMU_CAPS_Q35_PCI_HOLE64_SIZE, /* q35-pcihost.pci-hole64-size */

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index db626d5c6f8e13184019f9b8d4b76b454e429f29..021fac15c1a9d415efa95fc54629c1c61550a385 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -9486,9 +9486,6 @@ qemuDomainUpdateDeviceList(virQEMUDriverPtr driver,
     char **aliases;
     int rc;
 
-    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE_DEL_EVENT))
-        return 0;
-
     if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
         return -1;
     rc = qemuMonitorGetDeviceAliases(priv->mon, &aliases);

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 2497cd0fef10086938464fdabf30f792aa7ad9f7..6e76aef6dbfc9dcd42e5d39cb85255b10eebe48e 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -5116,9 +5116,6 @@ qemuDomainMarkDeviceAliasForRemoval(virDomainObjPtr vm,
 
     memset(&priv->unplug, 0, sizeof(priv->unplug));
 
-    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE_DEL_EVENT))
-        return;
-
     priv->unplug.alias = alias;
 }
 
@@ -5142,11 +5139,9 @@ qemuDomainResetDeviceRemoval(virDomainObjPtr vm)
 /* Returns:
  *  -1 Unplug of the device failed
  *
- *   0 DEVICE_DELETED event is supported and removal of the device did not
- *     finish in qemuDomainRemoveDeviceWaitTime
+ *   0 removal of the device did not finish in qemuDomainRemoveDeviceWaitTime
  *
  *   1 when the caller is responsible for finishing the device removal:
- *      - DEVICE_DELETED event is unsupported
  *      - DEVICE_DELETED event arrived before the timeout time
  *      - we failed to reliably wait for the event and thus use fallback behavior
  */
@@ -5157,9 +5152,6 @@ qemuDomainWaitForDeviceRemoval(virDomainObjPtr vm)
     unsigned long long until;
     int rc;
 
-    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE_DEL_EVENT))
-        return 1;
-
     if (virTimeMillisNow(&until) < 0)
         return 1;
     until += qemuDomainRemoveDeviceWaitTime;

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 0583eb03f2ae2d55baf1fbd46af1ea0459c01822..7536c1cbb0606e8f3618d05780ccfc8ce54248ab 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3635,9 +3635,6 @@ qemuProcessUpdateDevices(virQEMUDriverPtr driver,
     char **tmp;
     int ret = -1;
 
-    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE_DEL_EVENT))
-        return 0;
-
     old = priv->qemuDevices;
     priv->qemuDevices = NULL;
     if (qemuDomainUpdateDeviceList(driver, vm, QEMU_ASYNC_JOB_NONE) < 0)

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index bd539e29e8665782420579b0981e7d9391531202..75c7bcfeb070f7076b23b8700419508160c67e79 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -61,7 +61,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index e2f12923783b4a05a056699592ffe301b9c59963..fc9bc435ec37b3055ba49bfb8a2a0ee5b8f3e165 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -61,7 +61,6 @@
   <flag name='vfio-pci'/>
   <flag name='mem-merge'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index 0f04e2b363fe051e2e2ce1750c11dfc87aca3142..d40431374ac745e092db2da6683ee392dc31ee8c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -62,7 +62,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index 5398075a2f938f9e20fda7211b3878992263241d..cfe6a7be9fd2ef2c0a3086ff5cd930878e5d1666 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -64,7 +64,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index 8f3094d608a694467ed91bd5368988938cb84c7e..5e5579e969d744229e810fe6f5346464f55be61d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -50,7 +50,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index 358e07ebf1efa0e504dced0bfdb75b05bb411be0..e289afa36433101c99969f865e1a6ea5f1272eeb 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -50,7 +50,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index 2837c20fac1ebf1d014982bdebd6e4d9edf6395c..5af438c2a6e5a3ad33ff518ebe74e62905193841 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -35,7 +35,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='virtio-mmio'/>
   <flag name='boot-strict'/>
   <flag name='msg-timestamp'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index dea5f515d7e5428dddbdcf067b624f62eaa5d137..9f008bb147d595205f78b905f94225939fb26574 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -64,7 +64,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index 38d2e40b20ad8eb8528076a5149da5103a3e5596..7c668957b2b69a491ff2487dbceafe6652b3ebd6 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -35,7 +35,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='virtio-mmio'/>
   <flag name='boot-strict'/>
   <flag name='msg-timestamp'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index f0236053eb8807647be0f4004d5ae8ce7adf3eb5..3ddf445b59f884ffc7dfde56890369246018ab53 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -64,7 +64,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index db165d9c8f5652262ae4ab8e029ac9e8de289aa8..b1d1891f64ce66edd8efbbd3f8fa7b4e8cf9e1e2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -50,7 +50,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index af8dfeb9703a54361213d949caccdb1a754e5a85..3656de5e81edfd6934b056b3207df3d648b12171 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -50,7 +50,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index eec39e5c9ee3527ca49c82240ff341771b5474c9..5dd7b4f7f3b62c27b68a386caa01fa2c336d389a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -35,7 +35,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='virtio-mmio'/>
   <flag name='boot-strict'/>
   <flag name='msg-timestamp'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 739f1df0da335a28459b113066f0ebfa3d7a541b..5d4ef49ecd277f2ed292497faa4dd27723bc0b46 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -64,7 +64,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index bac4e0000708e5c922d96ccc218fe72206323958..37f9d088422d91622d6945037b72980a67fce725 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -64,7 +64,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 46b5ef74f64bfa86f5f88d971a9fae826a9e4434..5d249ed1a822c7d3f82ca28461519003d6dbcec5 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -64,7 +64,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index 4e9c8862b9b94a1de460232ef8003c8dec7d04e8..70576ec3a2ee9090521fc9a7f19ad4003e18d7af 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -52,7 +52,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index 76eb5f5b2884ae0e2ab456320a6b9df05e8f2bb1..ab3b8ab9943b6429a486cd6675399d34cf87faa1 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -50,7 +50,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 149bb65c789372f98c594d71f38cd4b9f354dd3c..e0b086303e0a2c057e74963120aa5f3405f811cd 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -64,7 +64,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index 911564e223b8cc0636f8687a94281de451bb08b9..848c43d8d6d46cc5dc501d34e5bb22ba2009c3de 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -35,7 +35,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='virtio-mmio'/>
   <flag name='boot-strict'/>
   <flag name='msg-timestamp'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index 5a6ffd0edf8d43ee500c9d42476f9655fc31bb6c..24c3d7c72cce4c70642ff4f9aa24b71065caaf89 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -64,7 +64,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index 8f3f141a2558696233c052b5d0283d868aaec655..6b37130a055ce43ffa28cf41fd8443eb34b749a0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -35,7 +35,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='virtio-mmio'/>
   <flag name='boot-strict'/>
   <flag name='msg-timestamp'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index 7bb9c6acb64b9ce7787f95f3ea393e3cbaa7f7c6..27a5d7ae67d954b5e3bd2e9fe76483f8f776cab6 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -64,7 +64,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index 8dad5a056217d0152ebbe8194cad4787f0c158e4..ac1bb33095826d80e1fd6d4fb026ac42482c225f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -50,7 +50,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index a20d0d9bf58375c6e495b33a592e329c01c428f7..c2738d186cf42cd6d6259c620d5ddbf959709aa8 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -35,7 +35,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='virtio-mmio'/>
   <flag name='boot-strict'/>
   <flag name='msg-timestamp'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index 4692225957886f15ac7df76743404cc68bd705a0..72dfaebf8c96e8b084ee9999860d9bdea01267aa 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -64,7 +64,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
index 41fec3e9c679846aff04d7707836b1242446a529..9780abc8e512614d3850cf850edd4712aa4dc7b1 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -50,7 +50,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
index 9574cdfc2d27f0c7443a4e7b6c53d89f1b538fb0..09e826113ad25abf936d4888e739d57fe6cda42c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@@ -25,7 +25,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='virtio-mmio'/>
   <flag name='boot-strict'/>
   <flag name='msg-timestamp'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
index 3451419434efb6ad733d38e13d816095c3deafcc..093dcb4c0f82a99eff2b6c9c3e5957b0ff4abc91 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@@ -25,7 +25,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='virtio-mmio'/>
   <flag name='boot-strict'/>
   <flag name='msg-timestamp'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
index fb5b22f66725a3e710e7b5aa926e1fcf31eae21b..00d931971c4260adba499c9a0ef9740ad2d2fb6c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@@ -37,7 +37,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='boot-strict'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index 63bf7f2193233c78f448d597c1d784f16914d2ef..77d2d959c5318abe4b8e365699d5f5b781e09b80 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -64,7 +64,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
index 8ea7674e0e21bb22bb9b0bdab1237ad534d2ba1b..ecdb9bb59de8139648053406fb5a320f61b48880 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -51,7 +51,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
index 2ebc6b7ee4bd14bcbcd2e7ae3c012d1d0c727811..48a4b10e676f2ef4bddc1c44bed696919c3484b1 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -64,7 +64,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
index 405d8ab47c0ab3bae1be4ebe2b330977b40817d1..c7d28f6c952bd4794eb8e92b930bf430f239b1fe 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@@ -54,7 +54,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
index 2e116976aa21821e1ac88c919255d674c1006498..a4c0d6b32b2c73c72e6347b9f6abacb8dd876010 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@@ -54,7 +54,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
index fa1711c2c84516f07d3cd480ef07bf71c30c5560..27341fd58f0c7eac8459460dd5e22f79ad32fa89 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -64,7 +64,6 @@
   <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='mlock'/>
-  <flag name='device-del-event'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>

diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index cdec25fca395462016db8851a95c5e03ecb31575..6d70d5897f2372b84159974c7ece6acfcf0129a8 100644 (file)
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -78,7 +78,6 @@ qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt,
     virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_IVSHMEM_PLAIN);
     virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL);
     virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_SCSI_DISK_WWN);
-    virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_DEL_EVENT);
 
     if (qemuTestCapsCacheInsert(driver.qemuCapsCache, priv->qemuCaps) < 0)
         goto cleanup;