On Sat, Oct 08, 2016 at 09:59:20AM -0400, John Ferlan wrote:
>
>
> On 09/30/2016 12:02 PM, Pavel Hrdina wrote:
> > We usually uses QEMU_CASP_DEVICE_$NAME to probe for existence of some
>
> libvirt generally uses QEMU_CAPS_DEVICE_$NAME
>
> > device and QEMU_CAPS_$NAME_$PROP to probe for existence of some property
> > of that device.
> >
> > This also remove wrong assumption for QEMU_CAPS_DEVICE_VIRTIO_GPU that
> > it's also 'virtio-vga' which isn't true.
>
> This will remove the wrong ...
>
> >
> > Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
> > ---
> > src/qemu/qemu_capabilities.c | 4 +-
> > src/qemu/qemu_capabilities.h | 4 +-
> > src/qemu/qemu_process.c | 2 +-
> > .../qemucapabilitiesdata/caps_1.2.2.x86_64.replies | 30 ++++++----
> > .../qemucapabilitiesdata/caps_1.3.1.x86_64.replies | 28 ++++++----
> > .../qemucapabilitiesdata/caps_1.4.2.x86_64.replies | 30 ++++++----
> > .../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 30 ++++++----
> > .../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 30 ++++++----
> > .../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 30 ++++++----
> > .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 32 +++++++----
> > .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 54 ++++++++++++++----
> > .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 64 ++++++++++++++++++----
> > .../caps_2.6.0-gicv2.aarch64.replies | 35 ++++++++++++
> > .../caps_2.6.0-gicv3.aarch64.replies | 35 ++++++++++++
> > .../caps_2.6.0.ppc64le.replies | 35 ++++++++++++
> > .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 64 ++++++++++++++++++----
> > .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 64 ++++++++++++++++++----
> > tests/qemuxml2argvtest.c | 4 +-
> > 18 files changed, 444 insertions(+), 131 deletions(-)
> >
>
> I think there's two things going on here... A name change wouldn't
> affect the replies files...
OK, I'll stop hiding two changes into one patch.
>
> [ahh, umm - I just read patch 9... I think there's some synergies there
> - glad I waited before sending all my comments... But I didn't change
> anything below...]
>
> > diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> > index ae83317..5449b07 100644
> > --- a/src/qemu/qemu_capabilities.c
> > +++ b/src/qemu/qemu_capabilities.c
> > @@ -1676,7 +1676,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsQxl[] = {
> > };
> >
> > static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioGpu[] = {
> > - { "virgl", QEMU_CAPS_DEVICE_VIRTIO_GPU_VIRGL },
> > + { "virgl", QEMU_CAPS_VIRTIO_GPU_VIRGL },
> > };
> >
> > static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsICH9[] = {
> > @@ -1745,6 +1745,8 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = {
> > ARRAY_CARDINALITY(virQEMUCapsObjectPropsQxl) },
> > { "virtio-gpu-pci", virQEMUCapsObjectPropsVirtioGpu,
> > ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioGpu) },
> > + { "virtio-gpu-device", virQEMUCapsObjectPropsVirtioGpu,
> > + ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioGpu) },
>
> Should this be a separate bug fix? Since this is less renaming and more
> adding something that wasn't there and causes all the change to the
> qemucapabilitiesdata replies files.
>
> The "virtio-gpu" cap was added with commit id '21373feb' - it added
> "virtio-gpu-pci" and "virtio-gpu-device" to virQEMUCapsObjectTypes.
>
> The "virtio-gcpu.virgl" cap was added with commit id '06198b9c' - it
> added the virQEMUCapsObjectPropsVirtioGpu and added just
> "virtio-gpu-pci" to virQEMUCapsObjectProps.
>
> So it seems you are indicating it should have also added
> "virtio-gpu-device" to that table - is that what's going on here?
>
> I think it should be separate and clearly stated.
I guess that I was just too lazy to make a separate patch for that.
> > { "ICH9-LPC", virQEMUCapsObjectPropsICH9,
> > ARRAY_CARDINALITY(virQEMUCapsObjectPropsICH9) },
> > { "virtio-balloon-pci", virQEMUCapsObjectPropsVirtioBalloon,
> > diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
> > index 2effcb7..1766aa6 100644
> > --- a/src/qemu/qemu_capabilities.h
> > +++ b/src/qemu/qemu_capabilities.h
> > @@ -328,8 +328,8 @@ typedef enum {
> >
> > /* 200 */
> > QEMU_CAPS_INCOMING_DEFER, /* -incoming defer and migrate_incoming */
> > - QEMU_CAPS_DEVICE_VIRTIO_GPU, /* -device virtio-gpu-* & virtio-vga */
> > - QEMU_CAPS_DEVICE_VIRTIO_GPU_VIRGL, /* -device virtio-gpu-*.virgl */
> > + QEMU_CAPS_DEVICE_VIRTIO_GPU, /* -device virtio-gpu-* */
> > + QEMU_CAPS_VIRTIO_GPU_VIRGL, /* -device virtio-gpu-*.virgl */
>
> Any specific reason to remove the & virtio-vga comment? As I read
> commit id '21373feb' it says "It can be used with -device virtio-vga for
> primary devices, or -device virtio-gpu for non-vga devices. However,
> only the primary device (VGA) is supported with this patch."
The reason is that if *virtio-gpu-pci* exists it doesn't ensure that
*virtio-vga* exists. One example is aarch64 where there is only
*virtio-gpu-pci*. So the comment is wrong and also usage of that capability is
wrong. Following patch adds proper check for *virtio-vga*. I should probably
change the order of some patches.
Pavel
> The name change reasoning is right/ok, but needs to be separate.
>
> John
>
> > QEMU_CAPS_VIRTIO_KEYBOARD, /* -device virtio-keyboard-{device,pci} */
> > QEMU_CAPS_VIRTIO_MOUSE, /* -device virtio-mouse-{device,pci} */
> >
> > diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
> > index eb3add9..7068a54 100644
> > --- a/src/qemu/qemu_process.c
> > +++ b/src/qemu/qemu_process.c
> > @@ -4476,7 +4476,7 @@ qemuProcessStartValidateVideo(virDomainObjPtr vm,
> > if (video->accel) {
> > if (video->accel->accel3d == VIR_TRISTATE_SWITCH_ON &&
> > (video->type != VIR_DOMAIN_VIDEO_TYPE_VIRTIO ||
> > - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_GPU_VIRGL))) {
> > + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_VIRGL))) {
> > virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
> > _("%s 3d acceleration is not supported"),
> > virDomainVideoTypeToString(video->type));
> > diff --git a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies
> > index 6d356db..dff9788 100644
> > --- a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies
> > +++ b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies
> > @@ -1604,6 +1604,14 @@
> > "id": "libvirt-33",
> > "error": {
> > "class": "DeviceNotFound",
> > + "desc": "Device 'virtio-gpu-device' not found"
> > + }
> > +}
> > +
> > +{
> > + "id": "libvirt-34",
> > + "error": {
> > + "class": "DeviceNotFound",
> > "desc": "Device 'ICH9-LPC' not found"
> > }
> > }
> > @@ -1643,11 +1651,11 @@
> > "type": "on/off"
> > }
> > ],
> > - "id": "libvirt-34"
> > + "id": "libvirt-35"
> > }
> >
> > {
> > - "id": "libvirt-35",
> > + "id": "libvirt-36",
> > "error": {
> > "class": "DeviceNotFound",
> > "desc": "Device 'virtio-balloon-ccw' not found"
> > @@ -1655,7 +1663,7 @@
> > }
> >
> > {
> > - "id": "libvirt-36",
> > + "id": "libvirt-37",
> > "error": {
> > "class": "DeviceNotFound",
> > "desc": "Device 'virtio-balloon-device' not found"
> > @@ -1689,7 +1697,7 @@
> > "type": "uint32"
> > }
> > ],
> > - "id": "libvirt-37"
> > + "id": "libvirt-38"
> > }
> >
> > {
> > @@ -1730,7 +1738,7 @@
> > "name": "none"
> > }
> > ],
> > - "id": "libvirt-38"
> > + "id": "libvirt-39"
> > }
> >
> > {
> > @@ -1802,7 +1810,7 @@
> > "name": "Opteron_G4"
> > }
> > ],
> > - "id": "libvirt-39"
> > + "id": "libvirt-40"
> > }
> >
> > {
> > @@ -1810,11 +1818,11 @@
> > "enabled": false,
> > "present": true
> > },
> > - "id": "libvirt-40"
> > + "id": "libvirt-41"
> > }
> >
> > {
> > - "id": "libvirt-41",
> > + "id": "libvirt-42",
> > "error": {
> > "class": "CommandNotFound",
> > "desc": "The command query-tpm-models has not been found"
> > @@ -1822,7 +1830,7 @@
> > }
> >
> > {
> > - "id": "libvirt-42",
> > + "id": "libvirt-43",
> > "error": {
> > "class": "CommandNotFound",
> > "desc": "The command query-tpm-types has not been found"
> > @@ -1830,7 +1838,7 @@
> > }
> >
> > {
> > - "id": "libvirt-43",
> > + "id": "libvirt-44",
> > "error": {
> > "class": "CommandNotFound",
> > "desc": "The command query-command-line-options has not been found"
> > @@ -1844,5 +1852,5 @@
> > "capability": "xbzrle"
> > }
> > ],
> > - "id": "libvirt-44"
> > + "id": "libvirt-45"
> > }
> > diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies
> > index 69bf0c2..c40f9fe 100644
> > --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies
> > +++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies
> > @@ -1804,6 +1804,14 @@
> > "id": "libvirt-34",
> > "error": {
> > "class": "DeviceNotFound",
> > + "desc": "Device 'virtio-gpu-device' not found"
> > + }
> > +}
> > +
> > +{
> > + "id": "libvirt-35",
> > + "error": {
> > + "class": "DeviceNotFound",
> > "desc": "Device 'ICH9-LPC' not found"
> > }
> > }
> > @@ -1843,11 +1851,11 @@
> > "type": "on/off"
> > }
> > ],
> > - "id": "libvirt-35"
> > + "id": "libvirt-36"
> > }
> >
> > {
> > - "id": "libvirt-36",
> > + "id": "libvirt-37",
> > "error": {
> > "class": "DeviceNotFound",
> > "desc": "Device 'virtio-balloon-ccw' not found"
> > @@ -1855,7 +1863,7 @@
> > }
> >
> > {
> > - "id": "libvirt-37",
> > + "id": "libvirt-38",
> > "error": {
> > "class": "DeviceNotFound",
> > "desc": "Device 'virtio-balloon-device' not found"
> > @@ -1909,7 +1917,7 @@
> > "type": "on/off"
> > }
> > ],
> > - "id": "libvirt-38"
> > + "id": "libvirt-39"
> > }
> >
> > {
> > @@ -1957,7 +1965,7 @@
> > "name": "none"
> > }
> > ],
> > - "id": "libvirt-39"
> > + "id": "libvirt-40"
> > }
> >
> > {
> > @@ -2035,7 +2043,7 @@
> > "name": "Opteron_G5"
> > }
> > ],
> > - "id": "libvirt-40"
> > + "id": "libvirt-41"
> > }
> >
> > {
> > @@ -2043,11 +2051,11 @@
> > "enabled": false,
> > "present": true
> > },
> > - "id": "libvirt-41"
> > + "id": "libvirt-42"
> > }
> >
> > {
> > - "id": "libvirt-42",
> > + "id": "libvirt-43",
> > "error": {
> > "class": "CommandNotFound",
> > "desc": "The command query-tpm-models has not been found"
> > @@ -2055,7 +2063,7 @@
> > }
> >
> > {
> > - "id": "libvirt-43",
> > + "id": "libvirt-44",
> > "error": {
> > "class": "CommandNotFound",
> > "desc": "The command query-tpm-types has not been found"
> > @@ -2063,7 +2071,7 @@
> > }
> >
> > {
> > - "id": "libvirt-44",
> > + "id": "libvirt-45",
> > "error": {
> > "class": "CommandNotFound",
> > "desc": "The command query-command-line-options has not been found"
> > diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies
> > index a69846a..7e86cff 100644
> > --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies
> > +++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies
> > @@ -1851,6 +1851,14 @@
> > "id": "libvirt-34",
> > "error": {
> > "class": "DeviceNotFound",
> > + "desc": "Device 'virtio-gpu-device' not found"
> > + }
> > +}
> > +
> > +{
> > + "id": "libvirt-35",
> > + "error": {
> > + "class": "DeviceNotFound",
> > "desc": "Device 'ICH9-LPC' not found"
> > }
> > }
> > @@ -1890,11 +1898,11 @@
> > "type": "on/off"
> > }
> > ],
> > - "id": "libvirt-35"
> > + "id": "libvirt-36"
> > }
> >
> > {
> > - "id": "libvirt-36",
> > + "id": "libvirt-37",
> > "error": {
> > "class": "DeviceNotFound",
> > "desc": "Device 'virtio-balloon-ccw' not found"
> > @@ -1902,7 +1910,7 @@
> > }
> >
> > {
> > - "id": "libvirt-37",
> > + "id": "libvirt-38",
> > "error": {
> > "class": "DeviceNotFound",
> > "desc": "Device 'virtio-balloon-device' not found"
> > @@ -1956,7 +1964,7 @@
> > "type": "on/off"
> > }
> > ],
> > - "id": "libvirt-38"
> > + "id": "libvirt-39"
> > }
> >
> > {
> > @@ -2007,7 +2015,7 @@
> > "name": "none"
> > }
> > ],
> > - "id": "libvirt-39"
> > + "id": "libvirt-40"
> > }
> >
> > {
> > @@ -2085,7 +2093,7 @@
> > "name": "qemu64"
> > }
> > ],
> > - "id": "libvirt-40"
> > + "id": "libvirt-41"
> > }
> >
> > {
> > @@ -2093,11 +2101,11 @@
> > "enabled": false,
> > "present": true
> > },
> > - "id": "libvirt-41"
> > + "id": "libvirt-42"
> > }
> >
> > {
> > - "id": "libvirt-42",
> > + "id": "libvirt-43",
> > "error": {
> > "class": "CommandNotFound",
> > "desc": "The command query-tpm-models has not been found"
> > @@ -2105,7 +2113,7 @@
> > }
> >
> > {
> > - "id": "libvirt-43",
> > + "id": "libvirt-44",
> > "error": {
> > "class": "CommandNotFound",
> > "desc": "The command query-tpm-types has not been found"
> > @@ -2113,7 +2121,7 @@
> > }
> >
> > {
> > - "id": "libvirt-44",
> > + "id": "libvirt-45",
> > "error": {
> > "class": "CommandNotFound",
> > "desc": "The command query-command-line-options has not been found"
> > @@ -2127,5 +2135,5 @@
> > "capability": "xbzrle"
> > }
> > ],
> > - "id": "libvirt-45"
> > + "id": "libvirt-46"
> > }
> > diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
> > index 2c835ad..7486579 100644
> > --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
> > +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
> > @@ -1954,6 +1954,14 @@
> > "id": "libvirt-34",
> > "error": {
> > "class": "DeviceNotFound",
> > + "desc": "Device 'virtio-gpu-device' not found"
> > + }
> > +}
> > +
> > +{
> > + "id": "libvirt-35",
> > + "error": {
> > + "class": "DeviceNotFound",
> > "desc": "Device 'ICH9-LPC' not found"
> > }
> > }
> > @@ -1993,11 +2001,11 @@
> > "type": "on/off"
> > }
> > ],
> > - "id": "libvirt-35"
> > + "id": "libvirt-36"
> > }
> >
> > {
> > - "id": "libvirt-36",
> > + "id": "libvirt-37",
> > "error": {
> > "class": "DeviceNotFound",
> > "desc": "Device 'virtio-balloon-ccw' not found"
> > @@ -2007,7 +2015,7 @@
> > {
> > "return": [
> > ],
> > - "id": "libvirt-37"
> > + "id": "libvirt-38"
> > }
> >
> > {
> > @@ -2057,7 +2065,7 @@
> > "type": "on/off"
> > }
> > ],
> > - "id": "libvirt-38"
> > + "id": "libvirt-39"
> > }
> >
> > {
> > @@ -2130,7 +2138,7 @@
> > "cpu-max": 1
> > }
> > ],
> > - "id": "libvirt-39"
> > + "id": "libvirt-40"
> > }
> >
> > {
> > @@ -2208,7 +2216,7 @@
> > "name": "qemu64"
> > }
> > ],
> > - "id": "libvirt-40"
> > + "id": "libvirt-41"
> > }
> >
> > {
> > @@ -2216,19 +2224,19 @@
> > "enabled": false,
> > "present": true
> > },
> > - "id": "libvirt-41"
> > + "id": "libvirt-42"
> > }
> >
> > {
> > "return": [
> > ],
> > - "id": "libvirt-42"
> > + "id": "libvirt-43"
> > }
> >
> > {
> > "return": [
> > ],
> > - "id": "libvirt-43"
> > + "id": "libvirt-44"
> > }
> >
> > {
> > @@ -2929,7 +2937,7 @@
> > "option": "drive"
> > }
> > ],
> > - "id": "libvirt-44"
> > + "id": "libvirt-45"
> > }
> >
> > {
> > @@ -2939,5 +2947,5 @@
> > "capability": "xbzrle"
> > }
> > ],
> > - "id": "libvirt-45"
> > + "id": "libvirt-46"
> > }
> > diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
> > index 91481bb..aad28ca 100644
> > --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
> > +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
> > @@ -1999,6 +1999,14 @@
> > "id": "libvirt-34",
> > "error": {
> > "class": "DeviceNotFound",
> > + "desc": "Device 'virtio-gpu-device' not found"
> > + }
> > +}
> > +
> > +{
> > + "id": "libvirt-35",
> > + "error": {
> > + "class": "DeviceNotFound",
> > "desc": "Device 'ICH9-LPC' not found"
> > }
> > }
> > @@ -2038,11 +2046,11 @@
> > "type": "on/off"
> > }
> > ],
> > - "id": "libvirt-35"
> > + "id": "libvirt-36"
> > }
> >
> > {
> > - "id": "libvirt-36",
> > + "id": "libvirt-37",
> > "error": {
> > "class": "DeviceNotFound",
> > "desc": "Device 'virtio-balloon-ccw' not found"
> > @@ -2052,7 +2060,7 @@
> > {
> > "return": [
> > ],
> > - "id": "libvirt-37"
> > + "id": "libvirt-38"
> > }
> >
> > {
> > @@ -2102,7 +2110,7 @@
> > "type": "on/off"
> > }
> > ],
> > - "id": "libvirt-38"
> > + "id": "libvirt-39"
> > }
> >
> > {
> > @@ -2183,7 +2191,7 @@
> > "cpu-max": 1
> > }
> > ],
> > - "id": "libvirt-39"
> > + "id": "libvirt-40"
> > }
> >
> > {
> > @@ -2261,7 +2269,7 @@
> > "name": "qemu64"
> > }
> > ],
> > - "id": "libvirt-40"
> > + "id": "libvirt-41"
> > }
> >
> > {
> > @@ -2269,19 +2277,19 @@
> > "enabled": false,
> > "present": true
> > },
> > - "id": "libvirt-41"
> > + "id": "libvirt-42"
> > }
> >
> > {
> > "return": [
> > ],
> > - "id": "libvirt-42"
> > + "id": "libvirt-43"
> > }
> >
> > {
> > "return": [
> > ],
> > - "id": "libvirt-43"
> > + "id": "libvirt-44"
> > }
> >
> > {
> > @@ -2884,7 +2892,7 @@
> > "option": "drive"
> > }
> > ],
> > - "id": "libvirt-44"
> > + "id": "libvirt-45"
> > }
> >
> > {
> > @@ -2906,5 +2914,5 @@
> > "capability": "zero-blocks"
> > }
> > ],
> > - "id": "libvirt-45"
> > + "id": "libvirt-46"
> > }
> > diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
> > index bde8c20..b44d5f1 100644
> > --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
> > +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
> > @@ -2016,6 +2016,14 @@
> > "id": "libvirt-34",
> > "error": {
> > "class": "DeviceNotFound",
> > + "desc": "Device 'virtio-gpu-device' not found"
> > + }
> > +}
> > +
> > +{
> > + "id": "libvirt-35",
> > + "error": {
> > + "class": "DeviceNotFound",
> > "desc": "Device 'ICH9-LPC' not found"
> > }
> > }
> > @@ -2055,11 +2063,11 @@
> > "type": "on/off"
> > }
> > ],
> > - "id": "libvirt-35"
> > + "id": "libvirt-36"
> > }
> >
> > {
> > - "id": "libvirt-36",
> > + "id": "libvirt-37",
> > "error": {
> > "class": "DeviceNotFound",
> > "desc": "Device 'virtio-balloon-ccw' not found"
> > @@ -2069,7 +2077,7 @@
> > {
> > "return": [
> > ],
> > - "id": "libvirt-37"
> > + "id": "libvirt-38"
> > }
> >
> > {
> > @@ -2119,7 +2127,7 @@
> > "type": "on/off"
> > }
> > ],
> > - "id": "libvirt-38"
> > + "id": "libvirt-39"
> > }
> >
> > {
> > @@ -2208,7 +2216,7 @@
> > "cpu-max": 1
> > }
> > ],
> > - "id": "libvirt-39"
> > + "id": "libvirt-40"
> > }
> >
> > {
> > @@ -2286,7 +2294,7 @@
> > "name": "qemu64"
> > }
> > ],
> > - "id": "libvirt-40"
> > + "id": "libvirt-41"
> > }
> >
> > {
> > @@ -2294,19 +2302,19 @@
> > "enabled": false,
> > "present": true
> > },
> > - "id": "libvirt-41"
> > + "id": "libvirt-42"
> > }
> >
> > {
> > "return": [
> > ],
> > - "id": "libvirt-42"
> > + "id": "libvirt-43"
> > }
> >
> > {
> > "return": [
> > ],
> > - "id": "libvirt-43"
> > + "id": "libvirt-44"
> > }
> >
> > {
> > @@ -3099,7 +3107,7 @@
> > "option": "drive"
> > }
> > ],
> > - "id": "libvirt-44"
> > + "id": "libvirt-45"
> > }
> >
> > {
> > @@ -3121,5 +3129,5 @@
> > "capability": "zero-blocks"
> > }
> > ],
> > - "id": "libvirt-45"
> > + "id": "libvirt-46"
> > }
> > diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
> > index 344497c..a7d8f36 100644
> > --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
> > +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
> > @@ -2368,6 +2368,14 @@
> > }
> >
> > {
> > + "id": "libvirt-34",
> > + "error": {
> > + "class": "DeviceNotFound",
> > + "desc": "Device 'virtio-gpu-device' not found"
> > + }
> > +}
> > +
> > +{
> > "return": [
> > {
> > "name": "memory-hotplug-support",
> > @@ -2418,7 +2426,7 @@
> > "type": "pci-devfn"
> > }
> > ],
> > - "id": "libvirt-34"
> > + "id": "libvirt-35"
> > }
> >
> > {
> > @@ -2468,11 +2476,11 @@
> > "type": "uint32"
> > }
> > ],
> > - "id": "libvirt-35"
> > + "id": "libvirt-36"
> > }
> >
> > {
> > - "id": "libvirt-36",
> > + "id": "libvirt-37",
> > "error": {
> > "class": "DeviceNotFound",
> > "desc": "Device 'virtio-balloon-ccw' not found"
> > @@ -2482,7 +2490,7 @@
> > {
> > "return": [
> > ],
> > - "id": "libvirt-37"
> > + "id": "libvirt-38"
> > }
> >
> > {
> > @@ -2536,7 +2544,7 @@
> > "type": "on/off"
> > }
> > ],
> > - "id": "libvirt-38"
> > + "id": "libvirt-39"
> > }
> >
> > {
> > @@ -2641,7 +2649,7 @@
> > "cpu-max": 255
> > }
> > ],
> > - "id": "libvirt-39"
> > + "id": "libvirt-40"
> > }
> >
> > {
> > @@ -2722,7 +2730,7 @@
> > "name": "qemu64"
> > }
> > ],
> > - "id": "libvirt-40"
> > + "id": "libvirt-41"
> > }
> >
> > {
> > @@ -2730,21 +2738,21 @@
> > "enabled": false,
> > "present": true
> > },
> > - "id": "libvirt-41"
> > + "id": "libvirt-42"
> > }
> >
> > {
> > "return": [
> > "tpm-tis"
> > ],
> > - "id": "libvirt-42"
> > + "id": "libvirt-43"
> > }
> >
> > {
> > "return": [
> > "passthrough"
> > ],
> > - "id": "libvirt-43"
> > + "id": "libvirt-44"
> > }
> >
> > {
> > @@ -3604,7 +3612,7 @@
> > "option": "drive"
> > }
> > ],
> > - "id": "libvirt-44"
> > + "id": "libvirt-45"
> > }
> >
> > {
> > @@ -3626,5 +3634,5 @@
> > "capability": "zero-blocks"
> > }
> > ],
> > - "id": "libvirt-45"
> > + "id": "libvirt-46"
> > }
> > diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
> > index 95a3fc8..c483c48 100644
> > --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
> > +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
> > @@ -2806,6 +2806,36 @@
> > {
> > "return": [
> > {
> > + "name": "any_layout",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "notify_on_empty",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "event_idx",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "indirect_desc",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "max_outputs",
> > + "type": "uint32"
> > + }
> > + ],
> > + "id": "libvirt-34"
> > +}
> > +
> > +{
> > + "return": [
> > + {
> > "name": "enable_tco",
> > "type": "bool"
> > },
> > @@ -2877,7 +2907,7 @@
> > "type": "bool"
> > }
> > ],
> > - "id": "libvirt-34"
> > + "id": "libvirt-35"
> > }
> >
> > {
> > @@ -2962,11 +2992,11 @@
> > "type": "uint32"
> > }
> > ],
> > - "id": "libvirt-35"
> > + "id": "libvirt-36"
> > }
> >
> > {
> > - "id": "libvirt-36",
> > + "id": "libvirt-37",
> > "error": {
> > "class": "DeviceNotFound",
> > "desc": "Device 'virtio-balloon-ccw' not found"
> > @@ -3009,7 +3039,7 @@
> > "type": "bool"
> > }
> > ],
> > - "id": "libvirt-37"
> > + "id": "libvirt-38"
> > }
> >
> > {
> > @@ -3079,7 +3109,7 @@
> > "type": "bool"
> > }
> > ],
> > - "id": "libvirt-38"
> > + "id": "libvirt-39"
> > }
> >
> > {
> > @@ -3208,7 +3238,7 @@
> > "cpu-max": 255
> > }
> > ],
> > - "id": "libvirt-39"
> > + "id": "libvirt-40"
> > }
> >
> > {
> > @@ -3298,7 +3328,7 @@
> > "name": "qemu64"
> > }
> > ],
> > - "id": "libvirt-40"
> > + "id": "libvirt-41"
> > }
> >
> > {
> > @@ -3306,21 +3336,21 @@
> > "enabled": false,
> > "present": true
> > },
> > - "id": "libvirt-41"
> > + "id": "libvirt-42"
> > }
> >
> > {
> > "return": [
> > "tpm-tis"
> > ],
> > - "id": "libvirt-42"
> > + "id": "libvirt-43"
> > }
> >
> > {
> > "return": [
> > "passthrough"
> > ],
> > - "id": "libvirt-43"
> > + "id": "libvirt-44"
> > }
> >
> > {
> > @@ -4328,7 +4358,7 @@
> > "option": "drive"
> > }
> > ],
> > - "id": "libvirt-44"
> > + "id": "libvirt-45"
> > }
> >
> > {
> > @@ -4358,5 +4388,5 @@
> > "capability": "events"
> > }
> > ],
> > - "id": "libvirt-45"
> > + "id": "libvirt-46"
> > }
> > diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
> > index 2deb044..75a00ce 100644
> > --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
> > +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
> > @@ -2944,6 +2944,46 @@
> > {
> > "return": [
> > {
> > + "name": "notify_on_empty",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "any_layout",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "indirect_desc",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "event_idx",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "stats",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "max_outputs",
> > + "type": "uint32"
> > + },
> > + {
> > + "name": "virgl",
> > + "description": "on/off",
> > + "type": "bool"
> > + }
> > + ],
> > + "id": "libvirt-34"
> > +}
> > +
> > +{
> > + "return": [
> > + {
> > "name": "memory-hotplug-support",
> > "type": "bool"
> > },
> > @@ -3015,7 +3055,7 @@
> > "type": "uint32"
> > }
> > ],
> > - "id": "libvirt-34"
> > + "id": "libvirt-35"
> > }
> >
> > {
> > @@ -3115,11 +3155,11 @@
> > "type": "bool"
> > }
> > ],
> > - "id": "libvirt-35"
> > + "id": "libvirt-36"
> > }
> >
> > {
> > - "id": "libvirt-36",
> > + "id": "libvirt-37",
> > "error": {
> > "class": "DeviceNotFound",
> > "desc": "Device 'virtio-balloon-ccw' not found"
> > @@ -3162,7 +3202,7 @@
> > "type": "bool"
> > }
> > ],
> > - "id": "libvirt-37"
> > + "id": "libvirt-38"
> > }
> >
> > {
> > @@ -3232,7 +3272,7 @@
> > "type": "uint32"
> > }
> > ],
> > - "id": "libvirt-38"
> > + "id": "libvirt-39"
> > }
> >
> > {
> > @@ -3369,7 +3409,7 @@
> > "cpu-max": 255
> > }
> > ],
> > - "id": "libvirt-39"
> > + "id": "libvirt-40"
> > }
> >
> > {
> > @@ -3459,7 +3499,7 @@
> > "name": "qemu64"
> > }
> > ],
> > - "id": "libvirt-40"
> > + "id": "libvirt-41"
> > }
> >
> > {
> > @@ -3467,21 +3507,21 @@
> > "enabled": false,
> > "present": true
> > },
> > - "id": "libvirt-41"
> > + "id": "libvirt-42"
> > }
> >
> > {
> > "return": [
> > "tpm-tis"
> > ],
> > - "id": "libvirt-42"
> > + "id": "libvirt-43"
> > }
> >
> > {
> > "return": [
> > "passthrough"
> > ],
> > - "id": "libvirt-43"
> > + "id": "libvirt-44"
> > }
> >
> > {
> > @@ -4526,7 +4566,7 @@
> > "option": "drive"
> > }
> > ],
> > - "id": "libvirt-44"
> > + "id": "libvirt-45"
> > }
> >
> > {
> > @@ -4560,5 +4600,5 @@
> > "capability": "x-postcopy-ram"
> > }
> > ],
> > - "id": "libvirt-45"
> > + "id": "libvirt-46"
> > }
> > diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies
> > index f6107a0..35095b5 100644
> > --- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies
> > +++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies
> > @@ -3390,6 +3390,41 @@
> > "type": "uint32"
> > }
> > ],
> > + "id": "libvirt-33"
> > +}
> > +
> > +{
> > + "return": [
> > + {
> > + "name": "notify_on_empty",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "any_layout",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "indirect_desc",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "event_idx",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "stats",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "max_outputs",
> > + "type": "uint32"
> > + }
> > + ],
> > "id": "libvirt-34"
> > }
> >
> > diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies
> > index 609e38b..0009f8f 100644
> > --- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies
> > +++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies
> > @@ -3390,6 +3390,41 @@
> > "type": "uint32"
> > }
> > ],
> > + "id": "libvirt-33"
> > +}
> > +
> > +{
> > + "return": [
> > + {
> > + "name": "notify_on_empty",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "any_layout",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "indirect_desc",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "event_idx",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "stats",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "max_outputs",
> > + "type": "uint32"
> > + }
> > + ],
> > "id": "libvirt-34"
> > }
> >
> > diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.replies b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.replies
> > index 7051e31..1835b6d 100644
> > --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.replies
> > +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.replies
> > @@ -3537,6 +3537,41 @@
> > "type": "uint32"
> > }
> > ],
> > + "id": "libvirt-33"
> > +}
> > +
> > +{
> > + "return": [
> > + {
> > + "name": "notify_on_empty",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "any_layout",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "indirect_desc",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "event_idx",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "stats",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "max_outputs",
> > + "type": "uint32"
> > + }
> > + ],
> > "id": "libvirt-34"
> > }
> >
> > diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
> > index 74e48b0..5db3f5a 100644
> > --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
> > +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
> > @@ -3026,6 +3026,46 @@
> > {
> > "return": [
> > {
> > + "name": "notify_on_empty",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "any_layout",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "indirect_desc",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "event_idx",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "stats",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "max_outputs",
> > + "type": "uint32"
> > + },
> > + {
> > + "name": "virgl",
> > + "description": "on/off",
> > + "type": "bool"
> > + }
> > + ],
> > + "id": "libvirt-34"
> > +}
> > +
> > +{
> > + "return": [
> > + {
> > "name": "memory-hotplug-support",
> > "type": "bool"
> > },
> > @@ -3097,7 +3137,7 @@
> > "type": "uint32"
> > }
> > ],
> > - "id": "libvirt-34"
> > + "id": "libvirt-35"
> > }
> >
> > {
> > @@ -3197,11 +3237,11 @@
> > "type": "bool"
> > }
> > ],
> > - "id": "libvirt-35"
> > + "id": "libvirt-36"
> > }
> >
> > {
> > - "id": "libvirt-36",
> > + "id": "libvirt-37",
> > "error": {
> > "class": "DeviceNotFound",
> > "desc": "Device 'virtio-balloon-ccw' not found"
> > @@ -3244,7 +3284,7 @@
> > "type": "bool"
> > }
> > ],
> > - "id": "libvirt-37"
> > + "id": "libvirt-38"
> > }
> >
> > {
> > @@ -3314,7 +3354,7 @@
> > "type": "uint32"
> > }
> > ],
> > - "id": "libvirt-38"
> > + "id": "libvirt-39"
> > }
> >
> > {
> > @@ -3427,7 +3467,7 @@
> > "cpu-max": 255
> > }
> > ],
> > - "id": "libvirt-39"
> > + "id": "libvirt-40"
> > }
> >
> > {
> > @@ -3517,7 +3557,7 @@
> > "name": "qemu64"
> > }
> > ],
> > - "id": "libvirt-40"
> > + "id": "libvirt-41"
> > }
> >
> > {
> > @@ -3525,21 +3565,21 @@
> > "enabled": false,
> > "present": true
> > },
> > - "id": "libvirt-41"
> > + "id": "libvirt-42"
> > }
> >
> > {
> > "return": [
> > "tpm-tis"
> > ],
> > - "id": "libvirt-42"
> > + "id": "libvirt-43"
> > }
> >
> > {
> > "return": [
> > "passthrough"
> > ],
> > - "id": "libvirt-43"
> > + "id": "libvirt-44"
> > }
> >
> > {
> > @@ -4633,7 +4673,7 @@
> > "option": "drive"
> > }
> > ],
> > - "id": "libvirt-44"
> > + "id": "libvirt-45"
> > }
> >
> > {
> > @@ -4667,5 +4707,5 @@
> > "capability": "postcopy-ram"
> > }
> > ],
> > - "id": "libvirt-45"
> > + "id": "libvirt-46"
> > }
> > diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
> > index 6514dd1..c525f66 100644
> > --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
> > +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
> > @@ -3199,6 +3199,46 @@
> > {
> > "return": [
> > {
> > + "name": "notify_on_empty",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "any_layout",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "indirect_desc",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "event_idx",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "stats",
> > + "description": "on/off",
> > + "type": "bool"
> > + },
> > + {
> > + "name": "max_outputs",
> > + "type": "uint32"
> > + },
> > + {
> > + "name": "virgl",
> > + "description": "on/off",
> > + "type": "bool"
> > + }
> > + ],
> > + "id": "libvirt-34"
> > +}
> > +
> > +{
> > + "return": [
> > + {
> > "name": "memory-hotplug-support",
> > "type": "bool"
> > },
> > @@ -3279,7 +3319,7 @@
> > "type": "uint32"
> > }
> > ],
> > - "id": "libvirt-34"
> > + "id": "libvirt-35"
> > }
> >
> > {
> > @@ -3383,11 +3423,11 @@
> > "type": "bool"
> > }
> > ],
> > - "id": "libvirt-35"
> > + "id": "libvirt-36"
> > }
> >
> > {
> > - "id": "libvirt-36",
> > + "id": "libvirt-37",
> > "error": {
> > "class": "DeviceNotFound",
> > "desc": "Device 'virtio-balloon-ccw' not found"
> > @@ -3430,7 +3470,7 @@
> > "type": "bool"
> > }
> > ],
> > - "id": "libvirt-37"
> > + "id": "libvirt-38"
> > }
> >
> > {
> > @@ -3505,7 +3545,7 @@
> > "type": "uint32"
> > }
> > ],
> > - "id": "libvirt-38"
> > + "id": "libvirt-39"
> > }
> >
> > {
> > @@ -3654,7 +3694,7 @@
> > "cpu-max": 255
> > }
> > ],
> > - "id": "libvirt-39"
> > + "id": "libvirt-40"
> > }
> >
> > {
> > @@ -3747,7 +3787,7 @@
> > "name": "qemu64"
> > }
> > ],
> > - "id": "libvirt-40"
> > + "id": "libvirt-41"
> > }
> >
> > {
> > @@ -3755,21 +3795,21 @@
> > "enabled": false,
> > "present": true
> > },
> > - "id": "libvirt-41"
> > + "id": "libvirt-42"
> > }
> >
> > {
> > "return": [
> > "tpm-tis"
> > ],
> > - "id": "libvirt-42"
> > + "id": "libvirt-43"
> > }
> >
> > {
> > "return": [
> > "passthrough"
> > ],
> > - "id": "libvirt-43"
> > + "id": "libvirt-44"
> > }
> >
> > {
> > @@ -4867,7 +4907,7 @@
> > "option": "drive"
> > }
> > ],
> > - "id": "libvirt-44"
> > + "id": "libvirt-45"
> > }
> >
> > {
> > @@ -4901,5 +4941,5 @@
> > "capability": "postcopy-ram"
> > }
> > ],
> > - "id": "libvirt-45"
> > + "id": "libvirt-46"
> > }
> > diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
> > index 1e910f3..6404865 100644
> > --- a/tests/qemuxml2argvtest.c
> > +++ b/tests/qemuxml2argvtest.c
> > @@ -1608,11 +1608,11 @@ mymain(void)
> > QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
> > DO_TEST("video-virtio-gpu-virgl",
> > QEMU_CAPS_DEVICE_VIRTIO_GPU,
> > - QEMU_CAPS_DEVICE_VIRTIO_GPU_VIRGL,
> > + QEMU_CAPS_VIRTIO_GPU_VIRGL,
> > QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
> > DO_TEST("video-virtio-gpu-spice-gl",
> > QEMU_CAPS_DEVICE_VIRTIO_GPU,
> > - QEMU_CAPS_DEVICE_VIRTIO_GPU_VIRGL,
> > + QEMU_CAPS_VIRTIO_GPU_VIRGL,
> > QEMU_CAPS_SPICE,
> > QEMU_CAPS_SPICE_GL,
> > QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
> >
>
> --
> libvir-list mailing list
> libvir-list@xxxxxxxxxx
> https://www.redhat.com/mailman/listinfo/libvir-list
Attachment:
signature.asc
Description: Digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list