NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: retire QEMU_CAPS_CCW

Browse Source 
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 <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Ján Tomko 2022-09-30 16:18:26 +02:00
parent bbaa22e24a
commit d6245e36c2
8 changed files with 78 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/qemu/qemu_capabilities.c
View File

@ -479,7 +479,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
"memory-backend-file.discard-data", /* QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD */ "memory-backend-file.discard-data", /* QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD */
/* 295 */ /* 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 */ "virtual-css-bridge.cssid-unrestricted", /* X_QEMU_CAPS_CCW_CSSID_UNRESTRICTED */
"vfio-ccw", /* QEMU_CAPS_DEVICE_VFIO_CCW */ "vfio-ccw", /* QEMU_CAPS_DEVICE_VFIO_CCW */
"sdl-gl", /* X_QEMU_CAPS_SDL_GL */ "sdl-gl", /* X_QEMU_CAPS_SDL_GL */
@ -1328,7 +1328,6 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
{ "virtio-tablet-ccw", QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW }, { "virtio-tablet-ccw", QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW },
{ "pcie-pci-bridge", QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE }, { "pcie-pci-bridge", QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE },
{ "pr-manager-helper", QEMU_CAPS_PR_MANAGER_HELPER }, { "pr-manager-helper", QEMU_CAPS_PR_MANAGER_HELPER },
{ "virtual-css-bridge", QEMU_CAPS_CCW },
{ "vfio-ccw", QEMU_CAPS_DEVICE_VFIO_CCW }, { "vfio-ccw", QEMU_CAPS_DEVICE_VFIO_CCW },
{ "hda-output", QEMU_CAPS_HDA_OUTPUT }, { "hda-output", QEMU_CAPS_HDA_OUTPUT },
{ "vmgenid", QEMU_CAPS_DEVICE_VMGENID }, { "vmgenid", QEMU_CAPS_DEVICE_VMGENID },
@ -1531,9 +1530,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsIntelIOMMU[] = {
{ "aw-bits", QEMU_CAPS_INTEL_IOMMU_AW_BITS, NULL }, { "aw-bits", QEMU_CAPS_INTEL_IOMMU_AW_BITS, NULL },
}; };
static struct virQEMUCapsDevicePropsFlags virQEMUCapsObjectPropsVirtualCSSBridge[] = {
};
static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsMCH[] = { static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsMCH[] = {
{ "extended-tseg-mbytes", QEMU_CAPS_MCH_EXTENDED_TSEG_MBYTES, NULL }, { "extended-tseg-mbytes", QEMU_CAPS_MCH_EXTENDED_TSEG_MBYTES, NULL },
}; };
@ -1680,9 +1676,6 @@ static virQEMUCapsDeviceTypeProps virQEMUCapsDeviceProps[] = {
{ "virtio-gpu-ccw", virQEMUCapsDevicePropsVirtioGpu, { "virtio-gpu-ccw", virQEMUCapsDevicePropsVirtioGpu,
G_N_ELEMENTS(virQEMUCapsDevicePropsVirtioGpu), G_N_ELEMENTS(virQEMUCapsDevicePropsVirtioGpu),
QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW }, QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW },
{ "virtual-css-bridge", virQEMUCapsObjectPropsVirtualCSSBridge,
G_N_ELEMENTS(virQEMUCapsObjectPropsVirtualCSSBridge),
QEMU_CAPS_CCW },
{ "mch", virQEMUCapsDevicePropsMCH, { "mch", virQEMUCapsDevicePropsMCH,
G_N_ELEMENTS(virQEMUCapsDevicePropsMCH), G_N_ELEMENTS(virQEMUCapsDevicePropsMCH),
QEMU_CAPS_DEVICE_MCH }, QEMU_CAPS_DEVICE_MCH },

2
src/qemu/qemu_capabilities.h
View File

@ -458,7 +458,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD, /* -object memory-backend-file,discard-data */ QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD, /* -object memory-backend-file,discard-data */
/* 295 */ /* 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= */ X_QEMU_CAPS_CCW_CSSID_UNRESTRICTED, /* virtual-css-bridge.cssid-unrestricted= */
QEMU_CAPS_DEVICE_VFIO_CCW, /* -device vfio-ccw */ QEMU_CAPS_DEVICE_VFIO_CCW, /* -device vfio-ccw */
X_QEMU_CAPS_SDL_GL, /* -sdl gl */ X_QEMU_CAPS_SDL_GL, /* -sdl gl */

71
tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
View File

@ -16875,35 +16875,12 @@
"id": "libvirt-26" "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", "execute": "device-list-properties",
"arguments": { "arguments": {
"typename": "usb-host" "typename": "usb-host"
}, },
"id": "libvirt-28" "id": "libvirt-27"
} }
{ {
@ -16992,7 +16969,7 @@
"type": "bool" "type": "bool"
} }
], ],
"id": "libvirt-28" "id": "libvirt-27"
} }
{ {
@ -17000,7 +16977,7 @@
"arguments": { "arguments": {
"typename": "vhost-user-fs-device" "typename": "vhost-user-fs-device"
}, },
"id": "libvirt-29" "id": "libvirt-28"
} }
{ {
@ -17071,7 +17048,7 @@
"type": "uint16" "type": "uint16"
} }
], ],
"id": "libvirt-29" "id": "libvirt-28"
} }
{ {
@ -17079,7 +17056,7 @@
"arguments": { "arguments": {
"typename": "memory-backend-file" "typename": "memory-backend-file"
}, },
"id": "libvirt-30" "id": "libvirt-29"
} }
{ {
@ -17144,7 +17121,7 @@
"type": "bool" "type": "bool"
} }
], ],
"id": "libvirt-30" "id": "libvirt-29"
} }
{ {
@ -17152,7 +17129,7 @@
"arguments": { "arguments": {
"typename": "memory-backend-memfd" "typename": "memory-backend-memfd"
}, },
"id": "libvirt-31" "id": "libvirt-30"
} }
{ {
@ -17216,12 +17193,12 @@
"type": "int" "type": "int"
} }
], ],
"id": "libvirt-31" "id": "libvirt-30"
} }
{ {
"execute": "query-machines", "execute": "query-machines",
"id": "libvirt-32" "id": "libvirt-31"
} }
{ {
@ -17348,7 +17325,7 @@
"deprecated": false "deprecated": false
} }
], ],
"id": "libvirt-32" "id": "libvirt-31"
} }
{ {
@ -17356,7 +17333,7 @@
"arguments": { "arguments": {
"typename": "none-machine" "typename": "none-machine"
}, },
"id": "libvirt-33" "id": "libvirt-32"
} }
{ {
@ -17461,12 +17438,12 @@
"type": "bool" "type": "bool"
} }
], ],
"id": "libvirt-33" "id": "libvirt-32"
} }
{ {
"execute": "query-cpu-definitions", "execute": "query-cpu-definitions",
"id": "libvirt-34" "id": "libvirt-33"
} }
{ {
@ -18073,34 +18050,34 @@
"migration-safe": true "migration-safe": true
} }
], ],
"id": "libvirt-34" "id": "libvirt-33"
} }
{ {
"execute": "query-tpm-models", "execute": "query-tpm-models",
"id": "libvirt-35" "id": "libvirt-34"
} }
{ {
"return": [ "return": [
], ],
"id": "libvirt-35" "id": "libvirt-34"
} }
{ {
"execute": "query-tpm-types", "execute": "query-tpm-types",
"id": "libvirt-36" "id": "libvirt-35"
} }
{ {
"return": [ "return": [
], ],
"id": "libvirt-36" "id": "libvirt-35"
} }
{ {
"execute": "query-command-line-options", "execute": "query-command-line-options",
"id": "libvirt-37" "id": "libvirt-36"
} }
{ {
@ -19247,12 +19224,12 @@
"option": "drive" "option": "drive"
} }
], ],
"id": "libvirt-37" "id": "libvirt-36"
} }
{ {
"execute": "query-migrate-capabilities", "execute": "query-migrate-capabilities",
"id": "libvirt-38" "id": "libvirt-37"
} }
{ {
@ -19330,7 +19307,7 @@
"capability": "validate-uuid" "capability": "validate-uuid"
} }
], ],
"id": "libvirt-38" "id": "libvirt-37"
} }
{ {
@ -19341,7 +19318,7 @@
"name": "host" "name": "host"
} }
}, },
"id": "libvirt-39" "id": "libvirt-38"
} }
{ {
@ -19395,7 +19372,7 @@
} }
} }
}, },
"id": "libvirt-39" "id": "libvirt-38"
} }
{ {

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

@ -62,7 +62,6 @@
<flag name='pr-manager-helper'/> <flag name='pr-manager-helper'/>
<flag name='qom-list-properties'/> <flag name='qom-list-properties'/>
<flag name='memory-backend-file.discard-data'/> <flag name='memory-backend-file.discard-data'/>
<flag name='virtual-css-bridge'/>
<flag name='vfio-ccw'/> <flag name='vfio-ccw'/>
<flag name='screendump_device'/> <flag name='screendump_device'/>
<flag name='vhost-vsock'/> <flag name='vhost-vsock'/>

76
tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies
View File

@ -19295,40 +19295,16 @@
"id": "libvirt-26" "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", "execute": "device-list-properties",
"arguments": { "arguments": {
"typename": "usb-host" "typename": "usb-host"
}, },
"id": "libvirt-28" "id": "libvirt-27"
} }
{ {
"id": "libvirt-28", "id": "libvirt-27",
"error": { "error": {
"class": "DeviceNotFound", "class": "DeviceNotFound",
"desc": "Device 'usb-host' not found" "desc": "Device 'usb-host' not found"
@ -19340,7 +19316,7 @@
"arguments": { "arguments": {
"typename": "vhost-user-fs-device" "typename": "vhost-user-fs-device"
}, },
"id": "libvirt-29" "id": "libvirt-28"
} }
{ {
@ -19416,7 +19392,7 @@
"type": "uint16" "type": "uint16"
} }
], ],
"id": "libvirt-29" "id": "libvirt-28"
} }
{ {
@ -19424,7 +19400,7 @@
"arguments": { "arguments": {
"typename": "virtio-iommu-pci" "typename": "virtio-iommu-pci"
}, },
"id": "libvirt-30" "id": "libvirt-29"
} }
{ {
@ -19435,7 +19411,7 @@
"type": "str" "type": "str"
} }
], ],
"id": "libvirt-30" "id": "libvirt-29"
} }
{ {
@ -19443,7 +19419,7 @@
"arguments": { "arguments": {
"typename": "memory-backend-file" "typename": "memory-backend-file"
}, },
"id": "libvirt-31" "id": "libvirt-30"
} }
{ {
@ -19513,7 +19489,7 @@
"type": "bool" "type": "bool"
} }
], ],
"id": "libvirt-31" "id": "libvirt-30"
} }
{ {
@ -19521,7 +19497,7 @@
"arguments": { "arguments": {
"typename": "memory-backend-memfd" "typename": "memory-backend-memfd"
}, },
"id": "libvirt-32" "id": "libvirt-31"
} }
{ {
@ -19590,12 +19566,12 @@
"type": "int" "type": "int"
} }
], ],
"id": "libvirt-32" "id": "libvirt-31"
} }
{ {
"execute": "query-machines", "execute": "query-machines",
"id": "libvirt-33" "id": "libvirt-32"
} }
{ {
@ -19764,7 +19740,7 @@
"default-ram-id": "s390.ram" "default-ram-id": "s390.ram"
} }
], ],
"id": "libvirt-33" "id": "libvirt-32"
} }
{ {
@ -19772,7 +19748,7 @@
"arguments": { "arguments": {
"typename": "none-machine" "typename": "none-machine"
}, },
"id": "libvirt-34" "id": "libvirt-33"
} }
{ {
@ -19857,12 +19833,12 @@
"type": "string" "type": "string"
} }
], ],
"id": "libvirt-34" "id": "libvirt-33"
} }
{ {
"execute": "query-cpu-definitions", "execute": "query-cpu-definitions",
"id": "libvirt-35" "id": "libvirt-34"
} }
{ {
@ -20543,34 +20519,34 @@
"deprecated": false "deprecated": false
} }
], ],
"id": "libvirt-35" "id": "libvirt-34"
} }
{ {
"execute": "query-tpm-models", "execute": "query-tpm-models",
"id": "libvirt-36" "id": "libvirt-35"
} }
{ {
"return": [ "return": [
], ],
"id": "libvirt-36" "id": "libvirt-35"
} }
{ {
"execute": "query-tpm-types", "execute": "query-tpm-types",
"id": "libvirt-37" "id": "libvirt-36"
} }
{ {
"return": [ "return": [
], ],
"id": "libvirt-37" "id": "libvirt-36"
} }
{ {
"execute": "query-command-line-options", "execute": "query-command-line-options",
"id": "libvirt-38" "id": "libvirt-37"
} }
{ {
@ -21726,12 +21702,12 @@
"option": "drive" "option": "drive"
} }
], ],
"id": "libvirt-38" "id": "libvirt-37"
} }
{ {
"execute": "query-migrate-capabilities", "execute": "query-migrate-capabilities",
"id": "libvirt-39" "id": "libvirt-38"
} }
{ {
@ -21809,7 +21785,7 @@
"capability": "validate-uuid" "capability": "validate-uuid"
} }
], ],
"id": "libvirt-39" "id": "libvirt-38"
} }
{ {
@ -21820,7 +21796,7 @@
"name": "host" "name": "host"
} }
}, },
"id": "libvirt-40" "id": "libvirt-39"
} }
{ {
@ -21876,7 +21852,7 @@
} }
} }
}, },
"id": "libvirt-40" "id": "libvirt-39"
} }
{ {

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

@ -60,7 +60,6 @@
<flag name='pr-manager-helper'/> <flag name='pr-manager-helper'/>
<flag name='qom-list-properties'/> <flag name='qom-list-properties'/>
<flag name='memory-backend-file.discard-data'/> <flag name='memory-backend-file.discard-data'/>
<flag name='virtual-css-bridge'/>
<flag name='vfio-ccw'/> <flag name='vfio-ccw'/>
<flag name='screendump_device'/> <flag name='screendump_device'/>
<flag name='vhost-vsock'/> <flag name='vhost-vsock'/>

76
tests/qemucapabilitiesdata/caps_6.0.0.s390x.replies
View File

@ -20929,40 +20929,16 @@
"id": "libvirt-26" "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", "execute": "device-list-properties",
"arguments": { "arguments": {
"typename": "usb-host" "typename": "usb-host"
}, },
"id": "libvirt-28" "id": "libvirt-27"
} }
{ {
"id": "libvirt-28", "id": "libvirt-27",
"error": { "error": {
"class": "DeviceNotFound", "class": "DeviceNotFound",
"desc": "Device 'usb-host' not found" "desc": "Device 'usb-host' not found"
@ -20974,7 +20950,7 @@
"arguments": { "arguments": {
"typename": "vhost-user-fs-device" "typename": "vhost-user-fs-device"
}, },
"id": "libvirt-29" "id": "libvirt-28"
} }
{ {
@ -21054,7 +21030,7 @@
"type": "int32" "type": "int32"
} }
], ],
"id": "libvirt-29" "id": "libvirt-28"
} }
{ {
@ -21062,7 +21038,7 @@
"arguments": { "arguments": {
"typename": "virtio-iommu-pci" "typename": "virtio-iommu-pci"
}, },
"id": "libvirt-30" "id": "libvirt-29"
} }
{ {
@ -21073,7 +21049,7 @@
"type": "str" "type": "str"
} }
], ],
"id": "libvirt-30" "id": "libvirt-29"
} }
{ {
@ -21081,7 +21057,7 @@
"arguments": { "arguments": {
"typename": "memory-backend-file" "typename": "memory-backend-file"
}, },
"id": "libvirt-31" "id": "libvirt-30"
} }
{ {
@ -21151,7 +21127,7 @@
"type": "bool" "type": "bool"
} }
], ],
"id": "libvirt-31" "id": "libvirt-30"
} }
{ {
@ -21159,7 +21135,7 @@
"arguments": { "arguments": {
"typename": "memory-backend-memfd" "typename": "memory-backend-memfd"
}, },
"id": "libvirt-32" "id": "libvirt-31"
} }
{ {
@ -21228,12 +21204,12 @@
"type": "int" "type": "int"
} }
], ],
"id": "libvirt-32" "id": "libvirt-31"
} }
{ {
"execute": "query-machines", "execute": "query-machines",
"id": "libvirt-33" "id": "libvirt-32"
} }
{ {
@ -21411,7 +21387,7 @@
"default-ram-id": "s390.ram" "default-ram-id": "s390.ram"
} }
], ],
"id": "libvirt-33" "id": "libvirt-32"
} }
{ {
@ -21419,7 +21395,7 @@
"arguments": { "arguments": {
"typename": "none-machine" "typename": "none-machine"
}, },
"id": "libvirt-34" "id": "libvirt-33"
} }
{ {
@ -21517,12 +21493,12 @@
"type": "child<container>" "type": "child<container>"
} }
], ],
"id": "libvirt-34" "id": "libvirt-33"
} }
{ {
"execute": "query-cpu-definitions", "execute": "query-cpu-definitions",
"id": "libvirt-35" "id": "libvirt-34"
} }
{ {
@ -22203,34 +22179,34 @@
"deprecated": false "deprecated": false
} }
], ],
"id": "libvirt-35" "id": "libvirt-34"
} }
{ {
"execute": "query-tpm-models", "execute": "query-tpm-models",
"id": "libvirt-36" "id": "libvirt-35"
} }
{ {
"return": [ "return": [
], ],
"id": "libvirt-36" "id": "libvirt-35"
} }
{ {
"execute": "query-tpm-types", "execute": "query-tpm-types",
"id": "libvirt-37" "id": "libvirt-36"
} }
{ {
"return": [ "return": [
], ],
"id": "libvirt-37" "id": "libvirt-36"
} }
{ {
"execute": "query-command-line-options", "execute": "query-command-line-options",
"id": "libvirt-38" "id": "libvirt-37"
} }
{ {
@ -23406,12 +23382,12 @@
"option": "drive" "option": "drive"
} }
], ],
"id": "libvirt-38" "id": "libvirt-37"
} }
{ {
"execute": "query-migrate-capabilities", "execute": "query-migrate-capabilities",
"id": "libvirt-39" "id": "libvirt-38"
} }
{ {
@ -23493,7 +23469,7 @@
"capability": "background-snapshot" "capability": "background-snapshot"
} }
], ],
"id": "libvirt-39" "id": "libvirt-38"
} }
{ {
@ -23504,7 +23480,7 @@
"name": "host" "name": "host"
} }
}, },
"id": "libvirt-40" "id": "libvirt-39"
} }
{ {
@ -23561,7 +23537,7 @@
} }
} }
}, },
"id": "libvirt-40" "id": "libvirt-39"
} }
{ {

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

@ -60,7 +60,6 @@
<flag name='pr-manager-helper'/> <flag name='pr-manager-helper'/>
<flag name='qom-list-properties'/> <flag name='qom-list-properties'/>
<flag name='memory-backend-file.discard-data'/> <flag name='memory-backend-file.discard-data'/>
<flag name='virtual-css-bridge'/>
<flag name='vfio-ccw'/> <flag name='vfio-ccw'/>
<flag name='screendump_device'/> <flag name='screendump_device'/>
<flag name='vhost-vsock'/> <flag name='vhost-vsock'/>