]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: capabilities: Retire QEMU_CAPS_MACH_VIRT_GIC_VERSION
authorPeter Krempa <pkrempa@redhat.com>
Mon, 6 Mar 2023 15:25:53 +0000 (16:25 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Tue, 7 Mar 2023 11:26:32 +0000 (12:26 +0100)
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.h
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml

index 4c1f6d11ed90d92cad9e30769243b497f9e1fb57..9777f5b112ace5f8e85c0e3601542bd6a6321a8a 100644 (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:
index 2bb7f1d87dee7d227280e04194dcf104ade8fd29..7f4884fc932992ca3ce93ce5d5552848c02d94ad 100644 (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-* */
 
index 575e4fb98b1cb200011acdc8626f2215c7a8f226..e0cc16e7304ce186ea33c1f719fe4e1e1ec58e55 100644 (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'/>
index f0dd035263dcd8afd9a6104efb6ad88be0c189c4..52529690c352e69c02d0babb6b0e6e4bff5d8156 100644 (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'/>
index 783bf39f42b98f0f5c31657b7de8489d6b227ca3..8657478d86a53dce0d99ddeec9aac4beca01fde1 100644 (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'/>
index 2bd64c9546405abafbfeef153a7bafb6cc0f3127..a71b955266af203e7553e3309b5bd2743ebff35a 100644 (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'/>
index 6d3fbac8ab039a631f9f44b809eea855b17c64c0..c41bf8fefaefe9831e4a22c9006a789d338e2491 100644 (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'/>
index 05aa663b7bcef082f35b7e72d9781d267d686b1d..73dd78b5553604cb29ec8cf037d9b8d25a7029e6 100644 (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'/>