External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-31 10:05:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: capabilities: Retire QEMU_CAPS_(IDE|SCSI)_DRIVE_WWN

Browse Source 
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-07-18 15:54:38 +02:00
parent 37f20a9bdb
commit 294cf405d5
37 changed files with 4 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qemu/qemu_capabilities.c
View File

@ -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[] = {

4
src/qemu/qemu_capabilities.h
View File

@ -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 */

2
tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
View File

@ -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'/>

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

@ -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'/>

2
tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
View File

@ -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'/>

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

@ -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'/>

2
tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
View File

@ -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'/>

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

@ -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'/>

2
tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
View File

@ -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
tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
View File

@ -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
tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
View File

@ -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
tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
View File

@ -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
tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
View File

@ -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
tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
View File

@ -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
tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
View File

@ -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'/>