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

qemu: capabilities: Retire QEMU_CAPS_REBOOT_TIMEOUT

Browse Source 
The code assumes that the feature tracked by this capability always
exists.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-08-09 13:00:22 +02:00
parent 2b928f1c2d
commit 81469b3d51
41 changed files with 2 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qemu/qemu_capabilities.c
View File

@ -217,7 +217,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
"ide-drive.wwn", /* QEMU_CAPS_IDE_DRIVE_WWN */
"scsi-disk.wwn", /* QEMU_CAPS_SCSI_DISK_WWN */
"seccomp-sandbox", /* QEMU_CAPS_SECCOMP_SANDBOX */
"reboot-timeout", /* QEMU_CAPS_REBOOT_TIMEOUT */
"reboot-timeout", /* X_QEMU_CAPS_REBOOT_TIMEOUT */
"dump-guest-core", /* X_QEMU_CAPS_DUMP_GUEST_CORE */
/* 110 */
@ -3205,7 +3205,6 @@ struct virQEMUCapsCommandLineProps {
* in qemu and thus isn't being properly extended. Other means to detect
* features should be used if possible. */
static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
{ "boot-opts", "reboot-timeout", QEMU_CAPS_REBOOT_TIMEOUT },
{ "boot-opts", "splash-time", QEMU_CAPS_SPLASH_TIMEOUT },
{ "chardev", "fd", QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE },
{ "fsdev", "multidevs", QEMU_CAPS_FSDEV_MULTIDEVS },

2
src/qemu/qemu_capabilities.h
View File

@ -196,7 +196,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
QEMU_CAPS_IDE_DRIVE_WWN, /* Is ide-drive.wwn available? */
QEMU_CAPS_SCSI_DISK_WWN, /* Is scsi-disk.wwn available? */
QEMU_CAPS_SECCOMP_SANDBOX, /* -sandbox */
QEMU_CAPS_REBOOT_TIMEOUT, /* -boot reboot-timeout */
X_QEMU_CAPS_REBOOT_TIMEOUT, /* -boot reboot-timeout */
X_QEMU_CAPS_DUMP_GUEST_CORE, /* dump-guest-core-parameter */
/* 110 */

1
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
View File

@ -17,7 +17,6 @@
<flag name='blockio'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='s390-sclp'/>
<flag name='nbd-server'/>

1
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
View File

@ -39,7 +39,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='qxl'/>
<flag name='VGA'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
View File

@ -31,7 +31,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='VGA'/>
<flag name='usb-serial'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
View File

@ -30,7 +30,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='VGA'/>
<flag name='usb-serial'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
View File

@ -17,7 +17,6 @@
<flag name='blockio'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='s390-sclp'/>
<flag name='nbd-server'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
View File

@ -39,7 +39,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='qxl'/>
<flag name='VGA'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
View File

@ -30,7 +30,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='VGA'/>
<flag name='usb-serial'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
View File

@ -10,7 +10,6 @@
<flag name='virtio-scsi-pci'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
View File

@ -10,7 +10,6 @@
<flag name='virtio-scsi-pci'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='nbd-server'/>
<flag name='virtio-rng'/>

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

@ -19,7 +19,6 @@
<flag name='usb-redir.filter'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='s390-sclp'/>
<flag name='nbd-server'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
View File

@ -39,7 +39,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='qxl'/>
<flag name='VGA'/>

1
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
View File

@ -30,7 +30,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='VGA'/>
<flag name='cirrus-vga'/>

1
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
View File

@ -39,7 +39,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='qxl'/>
<flag name='VGA'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
View File

@ -31,7 +31,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='VGA'/>
<flag name='cirrus-vga'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
View File

@ -30,7 +30,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='VGA'/>
<flag name='cirrus-vga'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
View File

@ -34,7 +34,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='VGA'/>
<flag name='cirrus-vga'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
View File

@ -34,7 +34,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='VGA'/>
<flag name='cirrus-vga'/>

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

@ -19,7 +19,6 @@
<flag name='usb-redir.filter'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='s390-sclp'/>
<flag name='nbd-server'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
View File

@ -39,7 +39,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='qxl'/>
<flag name='VGA'/>

1
tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
View File

@ -39,7 +39,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='qxl'/>
<flag name='VGA'/>

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

@ -31,7 +31,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='VGA'/>
<flag name='cirrus-vga'/>

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

@ -30,7 +30,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='VGA'/>
<flag name='cirrus-vga'/>

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

@ -19,7 +19,6 @@
<flag name='usb-redir.filter'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='s390-sclp'/>
<flag name='nbd-server'/>

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

@ -39,7 +39,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='qxl'/>
<flag name='VGA'/>

1
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
View File

@ -31,7 +31,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='VGA'/>
<flag name='cirrus-vga'/>

1
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
View File

@ -30,7 +30,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='VGA'/>
<flag name='cirrus-vga'/>

1
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
View File

@ -34,7 +34,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='VGA'/>
<flag name='cirrus-vga'/>

1
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
View File

@ -39,7 +39,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='qxl'/>
<flag name='VGA'/>

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

@ -12,7 +12,6 @@
<flag name='usb-redir.filter'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='nbd-server'/>
<flag name='rng-random'/>

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

@ -39,7 +39,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='qxl'/>
<flag name='VGA'/>

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

@ -31,7 +31,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='VGA'/>
<flag name='cirrus-vga'/>

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

@ -30,7 +30,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='VGA'/>
<flag name='cirrus-vga'/>

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

@ -34,7 +34,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='VGA'/>
<flag name='cirrus-vga'/>

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

@ -19,7 +19,6 @@
<flag name='usb-redir.filter'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='s390-sclp'/>
<flag name='nbd-server'/>

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

@ -39,7 +39,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='qxl'/>
<flag name='VGA'/>

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

@ -30,7 +30,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='VGA'/>
<flag name='cirrus-vga'/>

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

@ -19,7 +19,6 @@
<flag name='usb-redir.filter'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='s390-sclp'/>
<flag name='nbd-server'/>

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

@ -38,7 +38,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='qxl'/>
<flag name='VGA'/>

1
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
View File

@ -38,7 +38,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='vnc'/>
<flag name='qxl'/>
<flag name='VGA'/>