[PATCH 10/14] qemu: capabilities: QEMU_CAPS_MEM_MERGE

The code assumes that the feature tracked by this capability always exists. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - 41 files changed, 2 insertions(+), 42 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 175b6bd239..d26a3c97c1 100644 --- 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 */ @@ -3207,7 +3207,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 aa4c314e92..dd7b6c6bef 100644 --- 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 fa770b65df..7ef7018228 100644 --- 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 93c2a6d1b6..0eefa61e1c 100644 --- 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 22045eb552..8124a6c5fe 100644 --- 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 62cc85c2c1..6873374877 100644 --- 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 f1c0ee2fe6..357edf4d3d 100644 --- 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 27d26d52d3..fec85973b5 100644 --- 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 3dd3f2f636..9175e95f1e 100644 --- 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 17537f168a..15b63bb26e 100644 --- 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 4b1c1f3bcf..eb4416ab29 100644 --- 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 17c29c3946..42b65a98d8 100644 --- 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 62ca822db6..d5616a462e 100644 --- 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 4849bb6f1e..e696cb7b31 100644 --- 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 f4ea032b2d..b31e58d6c5 100644 --- 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 4496d6302b..df579cbe64 100644 --- 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 1900ff1688..1d46cf51c8 100644 --- 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 ba8c363266..ddb359d1ef 100644 --- 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 6fc79de762..ca7cf1e860 100644 --- 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 81130ffa41..56a1b56edf 100644 --- 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 f468826bf3..1662376d8b 100644 --- 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 1309f8236a..5e05c3b821 100644 --- 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 6ab5c71abc..4a9ef1eeee 100644 --- 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 32cacd2447..5c5106a445 100644 --- 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 054f854933..4650d4aafa 100644 --- 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 34f59a1135..7c60a271f1 100644 --- 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 86bc49aefb..cf2baad491 100644 --- 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 d87485f033..3a7818c508 100644 --- 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 6060e23866..559668186d 100644 --- 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 fda858eb43..0d7b45ef65 100644 --- 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 4407d94de8..603cf7735d 100644 --- 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 1ec964fc12..995a3b621d 100644 --- 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 3f18c96301..8c37099fe5 100644 --- 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 e5d3b2cc04..7fd7bfe243 100644 --- 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 c2c06913f7..1ac244226d 100644 --- 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 ce9ce06f4c..149b6fcbd6 100644 --- 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 7d570168ff..29b254fd50 100644 --- 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 d4ce906038..c7c9bc236a 100644 --- 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 30bd32074e..8195a4ad5e 100644 --- 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 b079112f6d..31581dd568 100644 --- 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 e3dabacea5..bc705780e7 100644 --- 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'/> -- 2.31.1