[PATCH 0/3] qemu: capabilities: Retire QEMU_CAPS_SCSI_DISK_WWN and QEMU_CAPS_IDE_DRIVE_WWN
Peter Krempa (3): qemu: Always assume support for QEMU_CAPS_SCSI_DISK_WWN qemu: Always assume support for QEMU_CAPS_IDE_DRIVE_WWN qemu: capabilities: Retire QEMU_CAPS_(IDE|SCSI)_DRIVE_WWN src/qemu/qemu_capabilities.c | 6 ++--- src/qemu/qemu_capabilities.h | 4 +-- src/qemu/qemu_validate.c | 26 ------------------- .../caps_4.2.0_aarch64.xml | 2 -- .../qemucapabilitiesdata/caps_4.2.0_ppc64.xml | 2 -- .../qemucapabilitiesdata/caps_4.2.0_s390x.xml | 1 - .../caps_4.2.0_x86_64.xml | 2 -- .../caps_5.0.0_aarch64.xml | 2 -- .../qemucapabilitiesdata/caps_5.0.0_ppc64.xml | 2 -- .../caps_5.0.0_riscv64.xml | 2 -- .../caps_5.0.0_x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_5.1.0_sparc.xml | 1 - .../caps_5.1.0_x86_64.xml | 2 -- .../caps_5.2.0_aarch64.xml | 2 -- .../qemucapabilitiesdata/caps_5.2.0_ppc64.xml | 2 -- .../caps_5.2.0_riscv64.xml | 2 -- .../qemucapabilitiesdata/caps_5.2.0_s390x.xml | 1 - .../caps_5.2.0_x86_64.xml | 2 -- .../caps_6.0.0_aarch64.xml | 2 -- .../qemucapabilitiesdata/caps_6.0.0_s390x.xml | 1 - .../caps_6.0.0_x86_64.xml | 2 -- .../caps_6.1.0_x86_64.xml | 2 -- .../caps_6.2.0_aarch64.xml | 2 -- .../qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 2 -- .../caps_6.2.0_x86_64.xml | 2 -- .../caps_7.0.0_aarch64+hvf.xml | 2 -- .../caps_7.0.0_aarch64.xml | 2 -- .../qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 2 -- .../caps_7.0.0_x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 2 -- .../caps_7.1.0_x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 2 -- .../caps_7.2.0_x86_64+hvf.xml | 2 -- .../caps_7.2.0_x86_64.xml | 2 -- .../caps_8.0.0_riscv64.xml | 2 -- .../caps_8.0.0_x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 - .../caps_8.1.0_x86_64.xml | 2 -- tests/qemuxml2xmltest.c | 2 +- 39 files changed, 5 insertions(+), 98 deletions(-) -- 2.41.0
The support for configuring the 'wwn' of a SCSI disk was added in qemu commit 27395add759ff4caeb0 (v1.0-3326-g27395add75) and can't be compiled out. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_validate.c | 18 ------------------ tests/qemuxml2xmltest.c | 2 +- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 7e09e2c52f..56fd562b70 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2860,14 +2860,6 @@ qemuValidateDomainDeviceDefDiskFrontend(const virDomainDiskDef *disk, "by this QEMU")); return -1; } - - if (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_DISK_WWN)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting wwn for scsi disk is not supported " - "by this QEMU")); - return -1; - } } if (disk->vendor || disk->product) { @@ -2876,16 +2868,6 @@ qemuValidateDomainDeviceDefDiskFrontend(const virDomainDiskDef *disk, _("Only scsi disk supports vendor and product")); return -1; } - - /* Properties wwn, vendor and product were introduced in the - * same QEMU release (1.2.0). - */ - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_DISK_WWN)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting vendor or product for scsi disk is not " - "supported by this QEMU")); - return -1; - } } if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index b66274beb8..5d5ab4cabe 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -593,7 +593,7 @@ mymain(void) DO_TEST_NOCAPS("numad-static-vcpu-no-numatune"); DO_TEST("disk-scsi-disk-vpd", - QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_DISK_WWN); + QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI); DO_TEST_NOCAPS("disk-source-pool"); DO_TEST_NOCAPS("disk-source-pool-mode"); -- 2.41.0
The support for configuring the 'wwn' of a IDE disk was added in qemu commit 95ebda85e09 (v1.0-1869-g95ebda85e0) and can't be compiled out. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_validate.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 56fd562b70..03a35bbef6 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2852,14 +2852,6 @@ qemuValidateDomainDeviceDefDiskFrontend(const virDomainDiskDef *disk, _("Only ide and scsi disk support wwn")); return -1; } - - if (disk->bus == VIR_DOMAIN_DISK_BUS_IDE && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_IDE_DRIVE_WWN)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting wwn for ide disk is not supported " - "by this QEMU")); - return -1; - } } if (disk->vendor || disk->product) { -- 2.41.0
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_capabilities.c | 6 ++---- src/qemu/qemu_capabilities.h | 4 ++-- tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml | 2 -- tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml | 2 -- tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml | 2 -- tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml | 2 -- tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml | 2 -- tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml | 2 -- tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml | 2 -- tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml | 2 -- tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml | 2 -- tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 2 -- tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 2 -- tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml | 2 -- tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 2 -- tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 2 -- 37 files changed, 4 insertions(+), 71 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 338608f0a2..84ced8661c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -213,8 +213,8 @@ VIR_ENUM_IMPL(virQEMUCaps, "usb-redir.filter", /* QEMU_CAPS_USB_REDIR_FILTER */ /* 105 */ - "ide-drive.wwn", /* QEMU_CAPS_IDE_DRIVE_WWN */ - "scsi-disk.wwn", /* QEMU_CAPS_SCSI_DISK_WWN */ + "ide-drive.wwn", /* X_QEMU_CAPS_IDE_DRIVE_WWN */ + "scsi-disk.wwn", /* X_QEMU_CAPS_SCSI_DISK_WWN */ "seccomp-sandbox", /* QEMU_CAPS_SECCOMP_SANDBOX */ "reboot-timeout", /* X_QEMU_CAPS_REBOOT_TIMEOUT */ "dump-guest-core", /* X_QEMU_CAPS_DUMP_GUEST_CORE */ @@ -1452,12 +1452,10 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVfioPCI[] = { static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsSCSIDisk[] = { { "channel", QEMU_CAPS_SCSI_DISK_CHANNEL, NULL }, - { "wwn", QEMU_CAPS_SCSI_DISK_WWN, NULL }, { "rotation_rate", QEMU_CAPS_ROTATION_RATE, NULL }, }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsIDEDrive[] = { - { "wwn", QEMU_CAPS_IDE_DRIVE_WWN, NULL }, }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsPiix4PM[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 2460fa7fa0..dc48ad9ae9 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -191,8 +191,8 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_USB_REDIR_FILTER, /* usb-redir.filter */ /* 105 */ - QEMU_CAPS_IDE_DRIVE_WWN, /* Is ide-drive.wwn available? */ - QEMU_CAPS_SCSI_DISK_WWN, /* Is scsi-disk.wwn available? */ + X_QEMU_CAPS_IDE_DRIVE_WWN, /* Is ide-drive.wwn available? */ + X_QEMU_CAPS_SCSI_DISK_WWN, /* Is scsi-disk.wwn available? */ QEMU_CAPS_SECCOMP_SANDBOX, /* -sandbox */ X_QEMU_CAPS_REBOOT_TIMEOUT, /* -boot reboot-timeout */ X_QEMU_CAPS_DUMP_GUEST_CORE, /* dump-guest-core-parameter */ diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml index 6a7f33e3c6..7a27cae27f 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml @@ -21,8 +21,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='VGA'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml index 2064f07c9c..a8f2d91c10 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml @@ -21,8 +21,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='VGA'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml index b440d9d538..8ee177f860 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml @@ -11,7 +11,6 @@ <flag name='scsi-block'/> <flag name='virtio-scsi-pci'/> <flag name='usb-redir.filter'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='s390-sclp'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml index b45d4a6293..055b326f80 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml @@ -28,8 +28,6 @@ <flag name='disable-s3'/> <flag name='disable-s4'/> <flag name='usb-redir.filter'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='qxl'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml index a2b7214b8a..43dbb9473e 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml @@ -21,8 +21,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='VGA'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml index 16333ba499..83a077f3d2 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml @@ -21,8 +21,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='VGA'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml index 09a71875ef..addf67987b 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml @@ -25,8 +25,6 @@ <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='usb-redir.filter'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='VGA'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml index 5331cf0113..c32d027ba1 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml @@ -28,8 +28,6 @@ <flag name='disable-s3'/> <flag name='disable-s4'/> <flag name='usb-redir.filter'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='qxl'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml index bc5b3e6fac..1d51c2856a 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml @@ -9,7 +9,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='usb-redir.filter'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='rng-random'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml index 1c3d3ea2a9..0b234fc158 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml @@ -28,8 +28,6 @@ <flag name='disable-s3'/> <flag name='disable-s4'/> <flag name='usb-redir.filter'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='qxl'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml index b1c5c21abb..2b9b795f98 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml @@ -21,8 +21,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='VGA'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml index 9db85dafef..f47f526a2d 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml @@ -21,8 +21,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='VGA'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml index 4d03004fa1..746ae74ff7 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml @@ -25,8 +25,6 @@ <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='usb-redir.filter'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='VGA'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml index 38a3f70a5e..1ae0e4cefe 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml @@ -11,7 +11,6 @@ <flag name='scsi-block'/> <flag name='virtio-scsi-pci'/> <flag name='usb-redir.filter'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='s390-sclp'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml index 654fec58fe..0444eaf556 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml @@ -28,8 +28,6 @@ <flag name='disable-s3'/> <flag name='disable-s4'/> <flag name='usb-redir.filter'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='qxl'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml index 6faf407a97..c80b4d8d60 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml @@ -20,8 +20,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='VGA'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml index a63263e7e5..a97519f2ff 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml @@ -11,7 +11,6 @@ <flag name='scsi-block'/> <flag name='virtio-scsi-pci'/> <flag name='usb-redir.filter'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='s390-sclp'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml index b1bf3caecf..19bf0f3a24 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml @@ -27,8 +27,6 @@ <flag name='disable-s3'/> <flag name='disable-s4'/> <flag name='usb-redir.filter'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='qxl'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml index 13d909e382..d1c33788d2 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml @@ -27,8 +27,6 @@ <flag name='disable-s3'/> <flag name='disable-s4'/> <flag name='usb-redir.filter'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='qxl'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml index e312801b89..096412a7e2 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml @@ -25,8 +25,6 @@ <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='usb-redir.filter'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='VGA'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml index e6b0bc03f4..11e3eebc2b 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml @@ -22,8 +22,6 @@ <flag name='virtio-scsi-pci'/> <flag name='disable-s3'/> <flag name='disable-s4'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> <flag name='vnc'/> <flag name='VGA'/> <flag name='cirrus-vga'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml index e1758396b0..997ab321d3 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml @@ -27,8 +27,6 @@ <flag name='disable-s3'/> <flag name='disable-s4'/> <flag name='usb-redir.filter'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='qxl'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml index 3517e81d15..fc0207db47 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml @@ -24,8 +24,6 @@ <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='usb-redir.filter'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='VGA'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml index 58db75d1d7..030eccf1b5 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml @@ -25,8 +25,6 @@ <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='usb-redir.filter'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='VGA'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml index 40130f180f..fc9e50bcc0 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml @@ -27,8 +27,6 @@ <flag name='disable-s3'/> <flag name='disable-s4'/> <flag name='usb-redir.filter'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='VGA'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml index b7446435a6..14bd25ce2a 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml @@ -27,8 +27,6 @@ <flag name='disable-s3'/> <flag name='disable-s4'/> <flag name='usb-redir.filter'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='qxl'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml index 6bc39b85f7..3b4dde0953 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml @@ -26,8 +26,6 @@ <flag name='disable-s3'/> <flag name='disable-s4'/> <flag name='usb-redir.filter'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='VGA'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml index 6492695705..10b6a97075 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml @@ -27,8 +27,6 @@ <flag name='disable-s3'/> <flag name='disable-s4'/> <flag name='usb-redir.filter'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='qxl'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml index f190be552a..28c77e6df3 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml @@ -27,8 +27,6 @@ <flag name='disable-s3'/> <flag name='disable-s4'/> <flag name='usb-redir.filter'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='VGA'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml index c08a99e734..66805f8671 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml @@ -26,8 +26,6 @@ <flag name='disable-s3'/> <flag name='disable-s4'/> <flag name='usb-redir.filter'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='qxl'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml index 37933c0848..e8bb732a88 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml @@ -27,8 +27,6 @@ <flag name='disable-s3'/> <flag name='disable-s4'/> <flag name='usb-redir.filter'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='qxl'/> diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml index 4c5e72ba56..a78b576df3 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml @@ -19,8 +19,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='VGA'/> diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml index cd5341f4fa..d9739f9d3b 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml @@ -27,8 +27,6 @@ <flag name='disable-s3'/> <flag name='disable-s4'/> <flag name='usb-redir.filter'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='qxl'/> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml index 88c7ac89db..35751ed441 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml @@ -9,7 +9,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='virtio-scsi-pci'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='s390-sclp'/> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml index 475496a8c8..c15b0afa2e 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml @@ -27,8 +27,6 @@ <flag name='disable-s3'/> <flag name='disable-s4'/> <flag name='usb-redir.filter'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='vnc'/> <flag name='qxl'/> -- 2.41.0
On a Tuesday in 2023, Peter Krempa wrote:
Peter Krempa (3): qemu: Always assume support for QEMU_CAPS_SCSI_DISK_WWN qemu: Always assume support for QEMU_CAPS_IDE_DRIVE_WWN qemu: capabilities: Retire QEMU_CAPS_(IDE|SCSI)_DRIVE_WWN
src/qemu/qemu_capabilities.c | 6 ++--- src/qemu/qemu_capabilities.h | 4 +-- src/qemu/qemu_validate.c | 26 -------------------
tests/qemuxml2xmltest.c | 2 +- 39 files changed, 5 insertions(+), 98 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
participants (2)
-
Ján Tomko -
Peter Krempa