diff options
author | Luyao Zhong <luyao.zhong@intel.com> | 2018-12-20 17:14:43 +0800 |
---|---|---|
committer | John Ferlan <jferlan@redhat.com> | 2019-01-02 09:00:34 -0500 |
commit | e9b28cc9bcebb2913f1f33060385742ad3b59bf3 (patch) | |
tree | eea27ccee8ece04e44686191998e668b5e8fe069 | |
parent | db521e7d03e5e97a743a1c35decb50dd50e3e8db (diff) | |
download | libvirt-e9b28cc9bcebb2913f1f33060385742ad3b59bf3.tar.gz |
qemu: Introduce QEMU_CAPS_OBJECT_MEMORY_FILE_ALIGN capability
This capability tracks if memory-backend-file has the align
attribute or not.
Signed-off-by: Luyao Zhong <luyao.zhong@intel.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
-rw-r--r-- | src/qemu/qemu_capabilities.c | 4 | ||||
-rw-r--r-- | src/qemu/qemu_capabilities.h | 1 | ||||
-rw-r--r-- | tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 | ||||
-rw-r--r-- | tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 | ||||
-rw-r--r-- | tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 | ||||
-rw-r--r-- | tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 | ||||
-rw-r--r-- | tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 | ||||
-rw-r--r-- | tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 1 | ||||
-rw-r--r-- | tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 1 | ||||
-rw-r--r-- | tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 | ||||
-rw-r--r-- | tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 | ||||
-rw-r--r-- | tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 | ||||
-rw-r--r-- | tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 |
13 files changed, 15 insertions, 1 deletions
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 51bf97b039..d4fac18337 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -514,7 +514,8 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "memory-backend-memfd.hugetlb", "iothread.poll-max-ns", "machine.pseries.cap-nested-hv", - "egl-headless.rendernode" + "egl-headless.rendernode", + "memory-backend-file.align", ); @@ -1365,6 +1366,7 @@ static virQEMUCapsObjectTypeProps virQEMUCapsDeviceProps[] = { static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsMemoryBackendFile[] = { { "discard-data", QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD }, + { "align", QEMU_CAPS_OBJECT_MEMORY_FILE_ALIGN }, }; static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsMemoryBackendMemfd[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 1ed7639513..9df4a873ff 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -499,6 +499,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_IOTHREAD_POLLING, /* -object iothread.poll-max-ns */ QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV, /* -machine pseries.cap-nested-hv */ QEMU_CAPS_EGL_HEADLESS_RENDERNODE, /* -display egl-headless,rendernode= */ + QEMU_CAPS_OBJECT_MEMORY_FILE_ALIGN, /* -object memory-backend-file,align= */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 8dd90f5e72..186a6ccfeb 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -165,6 +165,7 @@ <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='iothread.poll-max-ns'/> + <flag name='memory-backend-file.align'/> <version>2011090</version> <kvmVersion>0</kvmVersion> <microcodeVersion>345725</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index e64610340f..c47ebd77ad 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -163,6 +163,7 @@ <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='iothread.poll-max-ns'/> + <flag name='memory-backend-file.align'/> <version>2011090</version> <kvmVersion>0</kvmVersion> <microcodeVersion>426509</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index b18bd74dee..49249f5adf 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -132,6 +132,7 @@ <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='iothread.poll-max-ns'/> + <flag name='memory-backend-file.align'/> <version>2012000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>375102</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index ac97e168f1..54c4a65e57 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -206,6 +206,7 @@ <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='iothread.poll-max-ns'/> + <flag name='memory-backend-file.align'/> <version>2011090</version> <kvmVersion>0</kvmVersion> <microcodeVersion>414371</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index f11d860efb..24a3c2b716 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -163,6 +163,7 @@ <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='iothread.poll-max-ns'/> + <flag name='memory-backend-file.align'/> <version>2012050</version> <kvmVersion>0</kvmVersion> <microcodeVersion>444946</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml index 552b319791..1b5d8e6e12 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml @@ -103,6 +103,7 @@ <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='iothread.poll-max-ns'/> + <flag name='memory-backend-file.align'/> <version>3000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>0</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml index 4f9832dc09..3c76f6355d 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml @@ -103,6 +103,7 @@ <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='iothread.poll-max-ns'/> + <flag name='memory-backend-file.align'/> <version>3000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>0</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml index 1c4177c9f4..8569de6538 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml @@ -134,6 +134,7 @@ <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='iothread.poll-max-ns'/> + <flag name='memory-backend-file.align'/> <version>3000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>388416</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index b2d98a6afa..15df8a5bba 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -208,6 +208,7 @@ <flag name='memory-backend-memfd'/> <flag name='memory-backend-memfd.hugetlb'/> <flag name='iothread.poll-max-ns'/> + <flag name='memory-backend-file.align'/> <version>3000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>425972</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index b06b17316a..48f4fdfcee 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -166,6 +166,7 @@ <flag name='memory-backend-memfd.hugetlb'/> <flag name='iothread.poll-max-ns'/> <flag name='machine.pseries.cap-nested-hv'/> + <flag name='memory-backend-file.align'/> <version>3000091</version> <kvmVersion>0</kvmVersion> <microcodeVersion>437731</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index 6c9c0c6612..6be80ce2db 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -209,6 +209,7 @@ <flag name='memory-backend-memfd.hugetlb'/> <flag name='iothread.poll-max-ns'/> <flag name='egl-headless.rendernode'/> + <flag name='memory-backend-file.align'/> <version>3000092</version> <kvmVersion>0</kvmVersion> <microcodeVersion>440395</microcodeVersion> |