qemu: capabilities: QEMU_CAPS_MEM_MERGE

The code assumes that the feature tracked by this capability always
exists.

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

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 1843ed99adab8ace32e98ab5c2ab1437b88a2e6c..9ac8e3b8ba03b918ae7a8b3a99698d420232571d 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -267,7 +267,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "vfio-pci.bootindex", /* X_QEMU_CAPS_VFIO_PCI_BOOTINDEX */
               "scsi-generic", /* X_QEMU_CAPS_DEVICE_SCSI_GENERIC */
               "scsi-generic.bootindex", /* X_QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX */
-              "mem-merge", /* QEMU_CAPS_MEM_MERGE */
+              "mem-merge", /* X_QEMU_CAPS_MEM_MERGE */
 
               /* 145 */
               "vnc-websocket", /* X_QEMU_CAPS_VNC_WEBSOCKET */
@@ -3209,7 +3209,6 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
     { "fsdev", "multidevs", QEMU_CAPS_FSDEV_MULTIDEVS },
     { "fsdev", "fmode", QEMU_CAPS_FSDEV_CREATEMODE }, /* Could have also checked fsdev->dmode */
     { "fw_cfg", "file", QEMU_CAPS_FW_CFG },
-    { "machine", "mem-merge", QEMU_CAPS_MEM_MERGE },
     { "machine", "aes-key-wrap", QEMU_CAPS_AES_KEY_WRAP },
     { "machine", "dea-key-wrap", QEMU_CAPS_DEA_KEY_WRAP },
     { "machine", "kernel_irqchip", QEMU_CAPS_MACHINE_KERNEL_IRQCHIP },

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 973a1e747e5852e555d853ae285a36e13bbe530b..59b0d437663ac3d30768beaf018b9eaebcff4754 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -246,7 +246,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     X_QEMU_CAPS_VFIO_PCI_BOOTINDEX, /* bootindex param for vfio-pci device */
     X_QEMU_CAPS_DEVICE_SCSI_GENERIC, /* -device scsi-generic */
     X_QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX, /* -device scsi-generic.bootindex */
-    QEMU_CAPS_MEM_MERGE, /* -machine mem-merge */
+    X_QEMU_CAPS_MEM_MERGE, /* -machine mem-merge */
 
     /* 145 */
     X_QEMU_CAPS_VNC_WEBSOCKET, /* -vnc x:y,websocket */

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index fa770b65df4ae467f1c3d355bcfdff44835a0c92..7ef70182288d964492a04a2a170e3d7dfaebd92b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -26,7 +26,6 @@
   <flag name='virtio-ccw'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='virtio-mmio'/>
   <flag name='enable-fips'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index 93c2a6d1b64f45bc430770323c590317a05b81a0..0eefa61e1c298bb0d50c41733fd8004a503579bc 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -54,7 +54,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index a0c9ee469c602e7601054d3c8c549d92cdf6cf0b..2317a70ee6dcd4ca9306b657d800585196580860 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -41,7 +41,6 @@
   <flag name='megasas'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 47c046334e1f3e715289dfbf6fbdb2df078b4673..ed5a8297d43c99426097c86079cfc4c7dc2232d2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -41,7 +41,6 @@
   <flag name='nvram'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 70bc9be6bdb3279055334596e36cfc18ec8bf40c..20a1d23e07abcc26977810cfbf8b6fb734e2b936 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -26,7 +26,6 @@
   <flag name='virtio-ccw'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='virtio-mmio'/>
   <flag name='enable-fips'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 0afe896105ed667a32a1cf860078aa5e95376ccf..39c1f41e34b4c994a6a115ddfd0f7d69cde7b40f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -54,7 +54,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
index 33088ee25787945e05b412b47dad3f1b40f26abc..3b09d49d160d36486206d944c1379579cc9f2c0a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -41,7 +41,6 @@
   <flag name='nvram'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
index 17537f168af8e5eee0010c37e033c1e8cf21a732..15b63bb26e9f0bf7831c51654edd9a95301fcc57 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@@ -16,7 +16,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='tpm-passthrough'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='virtio-mmio'/>
   <flag name='enable-fips'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
index 4b1c1f3bcfd1e6a6219c873dba38aa5cc8c6831b..eb4416ab29860891bc851521ba067377a6629b3b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@@ -16,7 +16,6 @@
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
   <flag name='tpm-passthrough'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='virtio-mmio'/>
   <flag name='enable-fips'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
index f2566ffd74a0f0e3218347c06adc394eff6a883d..8157d4e13d075adbd80ced80be2c88fe842caf0b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@@ -28,7 +28,6 @@
   <flag name='virtio-ccw'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='enable-fips'/>
   <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 3889b820fb5f65d5562bc11d33e99ff72097c158..5427b008b9693ccaca83a53e325cd5f903a2a4c7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -54,7 +54,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
index 211e58b6f23f4acf62aa26b4e76363c4ff00b1f3..849473a4f2eacb3bf3e54f77b58c8627b530bd25 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -42,7 +42,6 @@
   <flag name='nvram'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
index 159eef1593b5d5e883f82a73b3cf0f9109334e44..63a17e848d564b986cfb75eaec1ce458e53de907 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -54,7 +54,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
index 26c3bc830e09439a129cf7b9434dec56aa003e5a..38ab21d32af2de1cadb0cc35a022b916e879b587 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@@ -43,7 +43,6 @@
   <flag name='megasas'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
index 6d5792e75bbd65c5028a453812bb4c6fb90e252b..47798dbc0b9afd70f678373ab77e296af95cc5a1 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@@ -43,7 +43,6 @@
   <flag name='nvram'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
index e7c133be4f0ef4d1b71426a019f320a1c85499ef..820a5101536101f004a87099a0bf0b844454644c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@@ -46,7 +46,6 @@
   <flag name='megasas'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
index 232bcebe533697b79c90d22667d1bbd6d592d00f..293fbdfc66167fe66c550decc72f19ee8836eeca 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@@ -46,7 +46,6 @@
   <flag name='megasas'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
index 2f2680613dbda2ead8ca681ce9907f80f7f77893..8514238a6445652a07e0b63bcf5951ef7d7df1fc 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@@ -28,7 +28,6 @@
   <flag name='virtio-ccw'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='enable-fips'/>
   <flag name='active-commit'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
index e872586554c779b8f8dab86c16a5c49dc298b737..a2acbf96296a39b539be1755ef6ae4516300cd39 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -54,7 +54,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
index 54565a0d5e1cc87e72141b772c268830b8ea4a2a..e6a73cef1250b1bd657b0230a28dd9738c62542f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -54,7 +54,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 57c0d772d5c5eb86bd0f680bb66c78571444acfc..ca5cc1329f624bcf25c4b5d82358504e27b0286a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -43,7 +43,6 @@
   <flag name='megasas'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 59730ce1f5da7d5dd692b3eb047ff165fd44eca5..3ea3055859b0489b8f395bbd894b254db9634150 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -43,7 +43,6 @@
   <flag name='nvram'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 5fa5700a08d4d5942fd3fef0b2ac9fdedd6b3d31..df2644d09b238b3d6bf0c64c794d1b596e3ea6a7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -28,7 +28,6 @@
   <flag name='virtio-ccw'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='enable-fips'/>
   <flag name='active-commit'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 02dfde8a52aa9f9f06e2e9b331f7a6e9ae1bc6d6..9f555464692f40c57db0c230090808f6fd1c99c4 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -54,7 +54,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 226d0f461d8c459f38199af9dd8857f183568ad0..7e6389123eebea8f93924fc6f53cae85fbed6b5b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -45,7 +45,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 4282cc7de26fb8c3db22e2198b2df73864a17c11..7118745ada650b91eb57b8f1b5a17ab9ad4bdd45 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -44,7 +44,6 @@
   <flag name='nvram'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index b4962a5b8da7a7494e3e660ece3d26280f3a8666..8b61261f7fffb2a685f5184d9404518320577d8a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -46,7 +46,6 @@
   <flag name='megasas'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index 85327e7f4f02fc01bc9fa7c096ff8a0880d11e35..0d2ef61be623f7273f6ac4bbfe92e0aed4762a47 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -54,7 +54,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index 4407d94de892984ce340c8f5c7ac2867783a486b..603cf7735dfc3cf4ce36224318da484edad6f44a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -16,7 +16,6 @@
   <flag name='nbd-server'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='enable-fips'/>
   <flag name='spice-file-xfer-disable'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index dc3a10a68413d18d846498d8d70fef1e00b045c9..17f2bd9c258b7acefff09ffa516eecef8e4dc811 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -54,7 +54,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 7cb81b5dc695241996801d94a7a2a2e4671a8de9..687a0e76116de70dc0f15cd2f03fbd483a64eab7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -45,7 +45,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index f27aab083279f0064f28fd293a07cd28d70870fd..e986a071505b9c3d0cc9be83d002bf0ea79e9c08 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -44,7 +44,6 @@
   <flag name='nvram'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index bf2eef88744e3c6f14a8432e15ba2526b22e22cb..77a3a5d0ec5b591355f553c9c367bf06b0303e9a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -46,7 +46,6 @@
   <flag name='megasas'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 44b84d2ca051f01b264dff5540c04498464acc4c..374806d013ac5b128ce84b8331c0238865223f0c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -28,7 +28,6 @@
   <flag name='virtio-ccw'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 8be1677e664611fecd97c17a41a6fc337509e0bb..31fd94ce3159b5cf028001f98a5cafd448852626 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -54,7 +54,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index d97cd365e37375ed5453c708771a14f093a055ee..e7226a92fb0917b8f05d8b33bb48275c8d02fe21 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -44,7 +44,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index 1518b22d6afd9d8214c5f4a0384f3344250c7704..359ceb42ab222983ca30867a781cbc7984b2fd60 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -28,7 +28,6 @@
   <flag name='virtio-ccw'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index b1e74a6e47eeb74754dca131542c11d843bf8e50..f7af5bb2350c7be07ae9c3d5e9db613ad632ff8e 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -53,7 +53,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index ac63539ab3181bde5dff4283e9f9beac0224b8dc..346da4f795088297c984b0bbc311791fcce731fa 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -53,7 +53,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='mem-merge'/>
   <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>