qemu: Introduce a new capability for virtio-gpu-ccw

QEMU on S390 (since v2.11) can support virtio-gpu-ccw device. Let's introduce a new qemu capability for the device. Signed-off-by: Farhan Ali <alifm@linux.vnet.ibm.com> Signed-off-by: Boris Fiuczynski <fiuczy@linux.vnet.ibm.com>
2024-12-22 17:34:18 +03:00 · 2018-03-23 13:22:38 -04:00 · 2018-03-23 13:22:38 -04:00 · a6441402a5
commit a6441402a5
parent f0fd90d722
9 changed files with 237 additions and 18 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -460,6 +460,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
              "pl011",
              "machine.pseries.max-cpu-compat",
              "dump-completed",
+              "virtio-gpu-ccw",
    );


@ -1695,6 +1696,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
    { "sclplmconsole", QEMU_CAPS_DEVICE_SCLPLMCONSOLE },
    { "isa-serial", QEMU_CAPS_DEVICE_ISA_SERIAL },
    { "pl011", QEMU_CAPS_DEVICE_PL011 },
+    { "virtio-gpu-ccw", QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW },
 };

 static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBalloon[] = {
@ -1948,6 +1950,9 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = {
    { "spapr-pci-host-bridge", virQEMUCapsObjectPropsSpaprPCIHostBridge,
      ARRAY_CARDINALITY(virQEMUCapsObjectPropsSpaprPCIHostBridge),
      QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE },
+    { "virtio-gpu-ccw", virQEMUCapsObjectPropsVirtioGpu,
+      ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioGpu),
+      QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW },
 };


--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -444,6 +444,7 @@ typedef enum {
    QEMU_CAPS_DEVICE_PL011, /* -device pl011 (not user-instantiable) */
    QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT, /* -machine pseries,max-cpu-compat= */
    QEMU_CAPS_DUMP_COMPLETED, /* DUMP_COMPLETED event */
+    QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW, /* -device virtio-gpu-ccw */

    QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
@ -3456,6 +3456,71 @@
  "id": "libvirt-33"
 }

+{
+  "return": [
+    {
+      "name": "notify_on_empty",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "ioeventfd",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "any_layout",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "devno",
+      "description": "Identifier of an I/O device in the channel subsystem, example: fe.1.23ab",
+      "type": "str"
+    },
+    {
+      "name": "indirect_desc",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "event_idx",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "virtio-backend",
+      "type": "child<virtio-gpu-device>"
+    },
+    {
+      "name": "yres",
+      "type": "uint32"
+    },
+    {
+      "name": "xres",
+      "type": "uint32"
+    },
+    {
+      "name": "iommu_platform",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "max_outputs",
+      "type": "uint32"
+    },
+    {
+      "name": "max_hostmem",
+      "type": "size"
+    },
+    {
+      "name": "max_revision",
+      "type": "uint32"
+    }
+  ],
+  "id": "libvirt-34"
+}
+
 {
  "return": [
    {
@ -3506,7 +3571,7 @@
      "cpu-max": 248
    }
  ],
-  "id": "libvirt-34"
+  "id": "libvirt-35"
 }

 {
@ -4040,20 +4105,20 @@
      "migration-safe": true
    }
  ],
-  "id": "libvirt-35"
+  "id": "libvirt-36"
 }

 {
  "return": [
  ],
-  "id": "libvirt-36"
+  "id": "libvirt-37"
 }

 {
  "return": [
    "emulator"
  ],
-  "id": "libvirt-37"
+  "id": "libvirt-38"
 }

 {
@ -5174,7 +5239,7 @@
      "option": "drive"
    }
  ],
-  "id": "libvirt-38"
+  "id": "libvirt-39"
 }

 {
@ -5232,7 +5297,7 @@
      "capability": "x-multifd"
    }
  ],
-  "id": "libvirt-39"
+  "id": "libvirt-40"
 }

 {
@ -15100,7 +15165,7 @@
      "meta-type": "object"
    }
  ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }

 {
@ -15139,11 +15204,11 @@
      }
    }
  },
-  "id": "libvirt-41"
+  "id": "libvirt-42"
 }

 {
-  "id": "libvirt-42",
+  "id": "libvirt-43",
  "error": {
    "class": "GenericError",
    "desc": "Property '.migratable' not found"
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@ -146,9 +146,10 @@
  <flag name='disk-share-rw'/>
  <flag name='iscsi.password-secret'/>
  <flag name='dump-completed'/>
+  <flag name='virtio-gpu-ccw'/>
  <version>2011000</version>
  <kvmVersion>0</kvmVersion>
-  <microcodeVersion>340897</microcodeVersion>
+  <microcodeVersion>342058</microcodeVersion>
  <package></package>
  <arch>s390x</arch>
  <hostCPU type='kvm' model='z14-base' migratability='no'>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
@ -3549,6 +3549,71 @@
  "id": "libvirt-33"
 }

+{
+  "return": [
+    {
+      "name": "notify_on_empty",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "ioeventfd",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "any_layout",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "devno",
+      "description": "Identifier of an I/O device in the channel subsystem, example: fe.1.23ab",
+      "type": "str"
+    },
+    {
+      "name": "indirect_desc",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "event_idx",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "virtio-backend",
+      "type": "child<virtio-gpu-device>"
+    },
+    {
+      "name": "yres",
+      "type": "uint32"
+    },
+    {
+      "name": "xres",
+      "type": "uint32"
+    },
+    {
+      "name": "iommu_platform",
+      "description": "on/off",
+      "type": "bool"
+    },
+    {
+      "name": "max_outputs",
+      "type": "uint32"
+    },
+    {
+      "name": "max_hostmem",
+      "type": "size"
+    },
+    {
+      "name": "max_revision",
+      "type": "uint32"
+    }
+  ],
+  "id": "libvirt-34"
+}
+
 {
  "return": [
    {
@ -3604,7 +3669,7 @@
      "alias": "s390-ccw-virtio"
    }
  ],
-  "id": "libvirt-34"
+  "id": "libvirt-35"
 }

 {
@ -6259,20 +6324,20 @@
      "migration-safe": true
    }
  ],
-  "id": "libvirt-35"
+  "id": "libvirt-36"
 }

 {
  "return": [
  ],
-  "id": "libvirt-36"
+  "id": "libvirt-37"
 }

 {
  "return": [
    "emulator"
  ],
-  "id": "libvirt-37"
+  "id": "libvirt-38"
 }

 {
@ -7428,7 +7493,7 @@
      "option": "drive"
    }
  ],
-  "id": "libvirt-38"
+  "id": "libvirt-39"
 }

 {
@ -7490,7 +7555,7 @@
      "capability": "dirty-bitmaps"
    }
  ],
-  "id": "libvirt-39"
+  "id": "libvirt-40"
 }

 {
@ -18858,11 +18923,11 @@
      "meta-type": "object"
    }
  ],
-  "id": "libvirt-40"
+  "id": "libvirt-41"
 }

 {
-  "id": "libvirt-41",
+  "id": "libvirt-42",
  "error": {
    "class": "GenericError",
    "desc": "The CPU definition 'max' is unknown."
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@ -146,6 +146,7 @@
  <flag name='disk-share-rw'/>
  <flag name='iscsi.password-secret'/>
  <flag name='dump-completed'/>
+  <flag name='virtio-gpu-ccw'/>
  <version>2011090</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.xml
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.xml
@ -0,0 +1,35 @@
+<domain type='qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1803</uuid>
+  <memory>219136</memory>
+  <currentMemory>219136</currentMemory>
+  <vcpu>1</vcpu>
+  <os>
+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
+  </os>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <disk type='block' device='disk'>
+      <source dev='/dev/HostVG/QEMUGuest1'/>
+      <target dev='hda' bus='virtio'/>
+      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0'/>
+    </disk>
+    <memballoon model='virtio'>
+      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x1'/>
+    </memballoon>
+    <graphics type='vnc'/>
+    <video>
+      <model type='virtio' heads='1' primary='yes'/>
+      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0002'/>
+    </video>
+    <video>
+      <model type='virtio' heads='1'/>
+      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0003'/>
+    </video>
+    <panic model='s390'/>
+  </devices>
+</domain>
--- a/tests/qemuxml2xmloutdata/video-virtio-gpu-ccw.xml
+++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-ccw.xml
@ -0,0 +1,39 @@
+<domain type='qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1803</uuid>
+  <memory unit='KiB'>219136</memory>
+  <currentMemory unit='KiB'>219136</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <disk type='block' device='disk'>
+      <driver name='qemu' type='raw'/>
+      <source dev='/dev/HostVG/QEMUGuest1'/>
+      <target dev='hda' bus='virtio'/>
+      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
+    </disk>
+    <graphics type='vnc' port='-1' autoport='yes'>
+      <listen type='address'/>
+    </graphics>
+    <video>
+      <model type='virtio' heads='1' primary='yes'/>
+      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0002'/>
+    </video>
+    <video>
+      <model type='virtio' heads='1'/>
+      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0003'/>
+    </video>
+    <memballoon model='virtio'>
+      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
+    </memballoon>
+    <panic model='s390'/>
+  </devices>
+</domain>
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@ -1180,6 +1180,13 @@ mymain(void)
    DO_TEST("video-qxl-heads", NONE);
    DO_TEST("video-qxl-noheads", NONE);
    DO_TEST("video-virtio-gpu-secondary", NONE);
+    DO_TEST("video-virtio-gpu-ccw",
+            QEMU_CAPS_VIRTIO_CCW,
+            QEMU_CAPS_DEVICE_VIRTIO_GPU,
+            QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
+            QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS,
+            QEMU_CAPS_VNC,
+            QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW);

    DO_TEST("intel-iommu",
            QEMU_CAPS_DEVICE_INTEL_IOMMU);