From d6245e36c24969efcaa835ce6e9a9c953f47cc87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Fri, 30 Sep 2022 16:18:26 +0200 Subject: [PATCH] qemu: retire QEMU_CAPS_CCW MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now that we no longer use the capability, stop probing for existence of 'virtual-css-bridge' and its properties. Signed-off-by: Ján Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_capabilities.c | 9 +-- src/qemu/qemu_capabilities.h | 2 +- .../caps_4.2.0.s390x.replies | 71 ++++++----------- .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - .../caps_5.2.0.s390x.replies | 76 +++++++------------ .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - .../caps_6.0.0.s390x.replies | 76 +++++++------------ .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - 8 files changed, 78 insertions(+), 159 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 699111a431..50bde370e8 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -479,7 +479,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "memory-backend-file.discard-data", /* QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD */ /* 295 */ - "virtual-css-bridge", /* QEMU_CAPS_CCW */ + "virtual-css-bridge", /* X_QEMU_CAPS_CCW */ "virtual-css-bridge.cssid-unrestricted", /* X_QEMU_CAPS_CCW_CSSID_UNRESTRICTED */ "vfio-ccw", /* QEMU_CAPS_DEVICE_VFIO_CCW */ "sdl-gl", /* X_QEMU_CAPS_SDL_GL */ @@ -1328,7 +1328,6 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "virtio-tablet-ccw", QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW }, { "pcie-pci-bridge", QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE }, { "pr-manager-helper", QEMU_CAPS_PR_MANAGER_HELPER }, - { "virtual-css-bridge", QEMU_CAPS_CCW }, { "vfio-ccw", QEMU_CAPS_DEVICE_VFIO_CCW }, { "hda-output", QEMU_CAPS_HDA_OUTPUT }, { "vmgenid", QEMU_CAPS_DEVICE_VMGENID }, @@ -1531,9 +1530,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsIntelIOMMU[] = { { "aw-bits", QEMU_CAPS_INTEL_IOMMU_AW_BITS, NULL }, }; -static struct virQEMUCapsDevicePropsFlags virQEMUCapsObjectPropsVirtualCSSBridge[] = { -}; - static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsMCH[] = { { "extended-tseg-mbytes", QEMU_CAPS_MCH_EXTENDED_TSEG_MBYTES, NULL }, }; @@ -1680,9 +1676,6 @@ static virQEMUCapsDeviceTypeProps virQEMUCapsDeviceProps[] = { { "virtio-gpu-ccw", virQEMUCapsDevicePropsVirtioGpu, G_N_ELEMENTS(virQEMUCapsDevicePropsVirtioGpu), QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW }, - { "virtual-css-bridge", virQEMUCapsObjectPropsVirtualCSSBridge, - G_N_ELEMENTS(virQEMUCapsObjectPropsVirtualCSSBridge), - QEMU_CAPS_CCW }, { "mch", virQEMUCapsDevicePropsMCH, G_N_ELEMENTS(virQEMUCapsDevicePropsMCH), QEMU_CAPS_DEVICE_MCH }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 263ef850c7..ca919ff368 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -458,7 +458,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD, /* -object memory-backend-file,discard-data */ /* 295 */ - QEMU_CAPS_CCW, /* -device virtual-css-bridge */ + X_QEMU_CAPS_CCW, /* -device virtual-css-bridge */ X_QEMU_CAPS_CCW_CSSID_UNRESTRICTED, /* virtual-css-bridge.cssid-unrestricted= */ QEMU_CAPS_DEVICE_VFIO_CCW, /* -device vfio-ccw */ X_QEMU_CAPS_SDL_GL, /* -sdl gl */ diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies index b7e6abb749..8c7bbb85ec 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies @@ -16875,35 +16875,12 @@ "id": "libvirt-26" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtual-css-bridge" - }, - "id": "libvirt-27" -} - -{ - "return": [ - { - "name": "cssid-unrestricted", - "description": "A css device can use any cssid, regardless whether virtual or not (read only, always true)", - "type": "bool" - }, - { - "name": "css_dev_path", - "type": "bool" - } - ], - "id": "libvirt-27" -} - { "execute": "device-list-properties", "arguments": { "typename": "usb-host" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -16992,7 +16969,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -17000,7 +16977,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -17071,7 +17048,7 @@ "type": "uint16" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -17079,7 +17056,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -17144,7 +17121,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -17152,7 +17129,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -17216,12 +17193,12 @@ "type": "int" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { "execute": "query-machines", - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -17348,7 +17325,7 @@ "deprecated": false } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -17356,7 +17333,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -17461,12 +17438,12 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-cpu-definitions", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -18073,34 +18050,34 @@ "migration-safe": true } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-tpm-models", - "id": "libvirt-35" + "id": "libvirt-34" } { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-tpm-types", - "id": "libvirt-36" + "id": "libvirt-35" } { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -19247,12 +19224,12 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-migrate-capabilities", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -19330,7 +19307,7 @@ "capability": "validate-uuid" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -19341,7 +19318,7 @@ "name": "host" } }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -19395,7 +19372,7 @@ } } }, - "id": "libvirt-39" + "id": "libvirt-38" } { diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 4bb6d1fc5e..6cd7256b0d 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -62,7 +62,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies index 720bf54649..f89a42680a 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies @@ -19295,40 +19295,16 @@ "id": "libvirt-26" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtual-css-bridge" - }, - "id": "libvirt-27" -} - -{ - "return": [ - { - "default-value": true, - "name": "css_dev_path", - "type": "bool" - }, - { - "name": "cssid-unrestricted", - "description": "A css device can use any cssid, regardless whether virtual or not (read only, always true)", - "type": "bool" - } - ], - "id": "libvirt-27" -} - { "execute": "device-list-properties", "arguments": { "typename": "usb-host" }, - "id": "libvirt-28" + "id": "libvirt-27" } { - "id": "libvirt-28", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -19340,7 +19316,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -19416,7 +19392,7 @@ "type": "uint16" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -19424,7 +19400,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -19435,7 +19411,7 @@ "type": "str" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -19443,7 +19419,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -19513,7 +19489,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -19521,7 +19497,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -19590,12 +19566,12 @@ "type": "int" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { "execute": "query-machines", - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -19764,7 +19740,7 @@ "default-ram-id": "s390.ram" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -19772,7 +19748,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -19857,12 +19833,12 @@ "type": "string" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-cpu-definitions", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -20543,34 +20519,34 @@ "deprecated": false } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-tpm-models", - "id": "libvirt-36" + "id": "libvirt-35" } { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-types", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -21726,12 +21702,12 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-migrate-capabilities", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -21809,7 +21785,7 @@ "capability": "validate-uuid" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -21820,7 +21796,7 @@ "name": "host" } }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -21876,7 +21852,7 @@ } } }, - "id": "libvirt-40" + "id": "libvirt-39" } { diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index 40eb1550af..40a4a8b19d 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -60,7 +60,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.replies b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.replies index cb225eab00..83e75ca0fa 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.replies @@ -20929,40 +20929,16 @@ "id": "libvirt-26" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtual-css-bridge" - }, - "id": "libvirt-27" -} - -{ - "return": [ - { - "default-value": true, - "name": "css_dev_path", - "type": "bool" - }, - { - "name": "cssid-unrestricted", - "description": "A css device can use any cssid, regardless whether virtual or not (read only, always true)", - "type": "bool" - } - ], - "id": "libvirt-27" -} - { "execute": "device-list-properties", "arguments": { "typename": "usb-host" }, - "id": "libvirt-28" + "id": "libvirt-27" } { - "id": "libvirt-28", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -20974,7 +20950,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -21054,7 +21030,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -21062,7 +21038,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -21073,7 +21049,7 @@ "type": "str" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -21081,7 +21057,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -21151,7 +21127,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -21159,7 +21135,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -21228,12 +21204,12 @@ "type": "int" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { "execute": "query-machines", - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -21411,7 +21387,7 @@ "default-ram-id": "s390.ram" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -21419,7 +21395,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -21517,12 +21493,12 @@ "type": "child" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-cpu-definitions", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -22203,34 +22179,34 @@ "deprecated": false } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-tpm-models", - "id": "libvirt-36" + "id": "libvirt-35" } { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-types", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -23406,12 +23382,12 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-migrate-capabilities", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -23493,7 +23469,7 @@ "capability": "background-snapshot" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -23504,7 +23480,7 @@ "name": "host" } }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -23561,7 +23537,7 @@ } } }, - "id": "libvirt-40" + "id": "libvirt-39" } { diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index 2628ab1409..3b6e8a0a47 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -60,7 +60,6 @@ -