openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Peter Krempa 2021-08-09 15:06:52 +02:00
parent db817385e8
commit e9badd8ac2
41 changed files with 2 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qemu/qemu_capabilities.c
View File

@ -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 },

2
src/qemu/qemu_capabilities.h
View File

@ -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 */

1
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
View File

@ -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'/>