External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-05 22:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: capabilities: Retire QEMU_CAPS_MACH_VIRT_GIC_VERSION

Browse Source 
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-03-06 16:25:53 +01:00
parent d81db7f7b2
commit f12b0b4a7a
8 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qemu/qemu_capabilities.c
View File

@ -341,7 +341,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 195 */
"e1000", /* QEMU_CAPS_DEVICE_E1000 */
"virtio-net", /* QEMU_CAPS_DEVICE_VIRTIO_NET */
"gic-version", /* QEMU_CAPS_MACH_VIRT_GIC_VERSION */
"gic-version", /* X_QEMU_CAPS_MACH_VIRT_GIC_VERSION */
"incoming-defer", /* X_QEMU_CAPS_INCOMING_DEFER */
"virtio-gpu", /* QEMU_CAPS_DEVICE_VIRTIO_GPU */
@ -5473,11 +5473,6 @@ void
virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps)
{
switch (qemuCaps->arch) {
case VIR_ARCH_AARCH64:
/* gic is arm specific */
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACH_VIRT_GIC_VERSION);
break;
case VIR_ARCH_S390:
case VIR_ARCH_S390X:
virQEMUCapsSet(qemuCaps, QEMU_CAPS_AES_KEY_WRAP);
@ -5485,6 +5480,7 @@ virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps)
virQEMUCapsSet(qemuCaps, QEMU_CAPS_LOADPARM);
break;
case VIR_ARCH_AARCH64:
case VIR_ARCH_I686:
case VIR_ARCH_X86_64:
case VIR_ARCH_ALPHA:

2
src/qemu/qemu_capabilities.h
View File

@ -319,7 +319,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
/* 195 */
QEMU_CAPS_DEVICE_E1000, /* -device e1000 */
QEMU_CAPS_DEVICE_VIRTIO_NET, /* -device virtio-net-* */
QEMU_CAPS_MACH_VIRT_GIC_VERSION, /* -machine virt,gic-version */
X_QEMU_CAPS_MACH_VIRT_GIC_VERSION, /* -machine virt,gic-version */
X_QEMU_CAPS_INCOMING_DEFER, /* -incoming defer and migrate_incoming */
QEMU_CAPS_DEVICE_VIRTIO_GPU, /* -device virtio-gpu-* */

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

@ -55,7 +55,6 @@
<flag name='rtl8139'/>
<flag name='e1000'/>
<flag name='virtio-net'/>
<flag name='gic-version'/>
<flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/>
<flag name='virtio-mouse'/>

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

@ -57,7 +57,6 @@
<flag name='rtl8139'/>
<flag name='e1000'/>
<flag name='virtio-net'/>
<flag name='gic-version'/>
<flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/>
<flag name='virtio-mouse'/>

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

@ -56,7 +56,6 @@
<flag name='rtl8139'/>
<flag name='e1000'/>
<flag name='virtio-net'/>
<flag name='gic-version'/>
<flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/>
<flag name='virtio-mouse'/>

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

@ -55,7 +55,6 @@
<flag name='rtl8139'/>
<flag name='e1000'/>
<flag name='virtio-net'/>
<flag name='gic-version'/>
<flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/>
<flag name='virtio-mouse'/>

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

@ -60,7 +60,6 @@
<flag name='rtl8139'/>
<flag name='e1000'/>
<flag name='virtio-net'/>
<flag name='gic-version'/>
<flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/>
<flag name='virtio-mouse'/>

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

@ -60,7 +60,6 @@
<flag name='rtl8139'/>
<flag name='e1000'/>
<flag name='virtio-net'/>
<flag name='gic-version'/>
<flag name='virtio-gpu'/>
<flag name='virtio-keyboard'/>
<flag name='virtio-mouse'/>