External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Introduce QEMU_CAPS_ARM_MAX_CPU

Browse Source 
Mirrors the existing QEMU_CAPS_X86_MAX_CPU.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Tested-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Andrea Bolognani 2019-07-08 13:21:00 +02:00
parent 29830b75af
commit d1b5c2c5ba
5 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/qemu_capabilities.c
View File

@ -547,6 +547,9 @@ VIR_ENUM_IMPL(virQEMUCaps,
"query-cpu-model-comparison", "query-cpu-model-comparison",
"ramfb", "ramfb",
"machine.pseries.cap-ccf-assist", "machine.pseries.cap-ccf-assist",
/* 345 */
"arm-max-cpu",
); );
@ -1141,6 +1144,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
{ "vhost-user-gpu", QEMU_CAPS_DEVICE_VHOST_USER_GPU }, { "vhost-user-gpu", QEMU_CAPS_DEVICE_VHOST_USER_GPU },
{ "vhost-user-vga", QEMU_CAPS_DEVICE_VHOST_USER_VGA }, { "vhost-user-vga", QEMU_CAPS_DEVICE_VHOST_USER_VGA },
{ "ramfb", QEMU_CAPS_DEVICE_RAMFB }, { "ramfb", QEMU_CAPS_DEVICE_RAMFB },
{ "max-arm-cpu", QEMU_CAPS_ARM_MAX_CPU },
}; };
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[] = { static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[] = {

3
src/qemu/qemu_capabilities.h
View File

@ -529,6 +529,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
QEMU_CAPS_DEVICE_RAMFB, /* -device ramfb */ QEMU_CAPS_DEVICE_RAMFB, /* -device ramfb */
QEMU_CAPS_MACHINE_PSERIES_CAP_CCF_ASSIST, /* -machine pseries.cap-ccf-assist */ QEMU_CAPS_MACHINE_PSERIES_CAP_CCF_ASSIST, /* -machine pseries.cap-ccf-assist */
/* 345 */
QEMU_CAPS_ARM_MAX_CPU, /* max-arm-cpu type exists */
QEMU_CAPS_LAST /* this must always be the last item */ QEMU_CAPS_LAST /* this must always be the last item */
} virQEMUCapsFlags; } virQEMUCapsFlags;

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

@ -153,6 +153,7 @@
<flag name='memory-backend-memfd.hugetlb'/> <flag name='memory-backend-memfd.hugetlb'/>
<flag name='iothread.poll-max-ns'/> <flag name='iothread.poll-max-ns'/>
<flag name='memory-backend-file.align'/> <flag name='memory-backend-file.align'/>
<flag name='arm-max-cpu'/>
<version>2012000</version> <version>2012000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>61700289</microcodeVersion> <microcodeVersion>61700289</microcodeVersion>

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

@ -166,6 +166,7 @@
<flag name='bochs-display'/> <flag name='bochs-display'/>
<flag name='migration-file-drop-cache'/> <flag name='migration-file-drop-cache'/>
<flag name='ramfb'/> <flag name='ramfb'/>
<flag name='arm-max-cpu'/>
<version>4000000</version> <version>4000000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>61700240</microcodeVersion> <microcodeVersion>61700240</microcodeVersion>

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

@ -169,6 +169,7 @@
<flag name='migration-file-drop-cache'/> <flag name='migration-file-drop-cache'/>
<flag name='vhost-user-gpu'/> <flag name='vhost-user-gpu'/>
<flag name='ramfb'/> <flag name='ramfb'/>
<flag name='arm-max-cpu'/>
<version>4001050</version> <version>4001050</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<microcodeVersion>61700242</microcodeVersion> <microcodeVersion>61700242</microcodeVersion>