[libvirt] [PATCH 5/8] qemustatusxml2xmltests: remove deprecated qemu capabilities

Stop testing whether we format the deprecated capabilities back for the files where the input and output differ. Capabilities with separate output files are left alone, since we will still need to parse files contating them correctly, we just don't have to format them back. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- .../blockjob-mirror-in.xml | 1 - .../migration-in-params-in.xml | 53 ------------------- .../migration-out-nbd-tls-in.xml | 51 ------------------ .../migration-out-params-in.xml | 53 ------------------- tests/qemustatusxml2xmldata/modern-in.xml | 51 ------------------ .../qemustatusxml2xmldata/vcpus-multi-in.xml | 1 - 6 files changed, 210 deletions(-) diff --git a/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml b/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml index 32bde1ba66..6b522f5ae1 100644 --- a/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml +++ b/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml @@ -5,7 +5,6 @@ <vcpu id='0' pid='3803519'/> </vcpus> <qemuCaps> - <flag name='vnet-hdr'/> <flag name='qxl.vgamem_mb'/> <flag name='qxl-vga.vgamem_mb'/> <flag name='pc-dimm'/> diff --git a/tests/qemustatusxml2xmldata/migration-in-params-in.xml b/tests/qemustatusxml2xmldata/migration-in-params-in.xml index 03f18b4f3d..b3c6b0758b 100644 --- a/tests/qemustatusxml2xmldata/migration-in-params-in.xml +++ b/tests/qemustatusxml2xmldata/migration-in-params-in.xml @@ -11,37 +11,16 @@ </vcpus> <qemuCaps> <flag name='kvm'/> - <flag name='mem-path'/> - <flag name='drive-serial'/> - <flag name='monitor-json'/> - <flag name='sdl'/> - <flag name='netdev'/> - <flag name='rtc'/> - <flag name='vhost-net'/> <flag name='no-hpet'/> - <flag name='no-kvm-pit'/> - <flag name='pci-configfd'/> - <flag name='nodefconfig'/> - <flag name='boot-menu'/> - <flag name='fsdev'/> - <flag name='name-process'/> - <flag name='smbios-type'/> <flag name='spice'/> - <flag name='vga-none'/> - <flag name='boot-index'/> <flag name='hda-duplex'/> - <flag name='drive-aio'/> - <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> - <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='sga'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> - <flag name='cache-directsync'/> <flag name='piix3-usb-uhci'/> <flag name='piix4-usb-uhci'/> <flag name='usb-ehci'/> @@ -50,28 +29,16 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> - <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> - <flag name='fsdev-readonly'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> - <flag name='fsdev-writeout'/> - <flag name='drive-iotune'/> - <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> - <flag name='ide-cd'/> - <flag name='no-user-config'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> @@ -82,13 +49,9 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> - <flag name='usb-redir.bootindex'/> - <flag name='usb-host.bootindex'/> <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> @@ -96,30 +59,18 @@ <flag name='vmware-svga'/> <flag name='device-video-primary'/> <flag name='usb-serial'/> - <flag name='usb-net'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> <flag name='rng-egd'/> - <flag name='dtb'/> <flag name='megasas'/> - <flag name='ipv6-migration'/> - <flag name='machine-opt'/> - <flag name='machine-usb-opt'/> <flag name='tpm-passthrough'/> <flag name='tpm-tis'/> <flag name='pci-bridge'/> <flag name='vfio-pci'/> - <flag name='vfio-pci.bootindex'/> - <flag name='scsi-generic'/> - <flag name='scsi-generic.bootindex'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='vnc-share-policy'/> - <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='i440fx-pci-hole64-size'/> <flag name='q35-pci-hole64-size'/> @@ -131,9 +82,7 @@ <flag name='boot-strict'/> <flag name='pvpanic'/> <flag name='spice-file-xfer-disable'/> - <flag name='spiceport'/> <flag name='usb-kbd'/> - <flag name='host-pci-multidomain'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> <flag name='change-backing-file'/> @@ -184,7 +133,6 @@ <flag name='secret'/> <flag name='pxb'/> <flag name='pxb-pcie'/> - <flag name='device-tray-moved-event'/> <flag name='nec-usb-xhci-ports'/> <flag name='virtio-scsi-pci.iothread'/> <flag name='name-guest'/> @@ -192,7 +140,6 @@ <flag name='spice-unix'/> <flag name='drive-detect-zeroes'/> <flag name='tls-creds-x509'/> - <flag name='display'/> <flag name='intel-iommu'/> <flag name='smm'/> <flag name='virtio-pci-disable-legacy'/> diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-in.xml b/tests/qemustatusxml2xmldata/migration-out-nbd-tls-in.xml index be1dc7347e..25b5d62b3f 100644 --- a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-in.xml +++ b/tests/qemustatusxml2xmldata/migration-out-nbd-tls-in.xml @@ -10,35 +10,16 @@ </vcpus> <qemuCaps> <flag name='kvm'/> - <flag name='mem-path'/> - <flag name='drive-serial'/> - <flag name='monitor-json'/> - <flag name='sdl'/> - <flag name='netdev'/> - <flag name='rtc'/> - <flag name='vhost-net'/> <flag name='no-hpet'/> - <flag name='no-kvm-pit'/> - <flag name='nodefconfig'/> - <flag name='boot-menu'/> - <flag name='fsdev'/> - <flag name='name-process'/> - <flag name='smbios-type'/> <flag name='spice'/> - <flag name='vga-none'/> - <flag name='boot-index'/> <flag name='hda-duplex'/> - <flag name='drive-aio'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> - <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='sga'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> - <flag name='cache-directsync'/> <flag name='piix3-usb-uhci'/> <flag name='piix4-usb-uhci'/> <flag name='usb-ehci'/> @@ -47,28 +28,16 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> - <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> - <flag name='fsdev-readonly'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> - <flag name='fsdev-writeout'/> - <flag name='drive-iotune'/> - <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> - <flag name='ide-cd'/> - <flag name='no-user-config'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> @@ -79,13 +48,9 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> - <flag name='usb-redir.bootindex'/> - <flag name='usb-host.bootindex'/> <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> @@ -93,30 +58,18 @@ <flag name='vmware-svga'/> <flag name='device-video-primary'/> <flag name='usb-serial'/> - <flag name='usb-net'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> <flag name='rng-egd'/> - <flag name='dtb'/> <flag name='megasas'/> - <flag name='ipv6-migration'/> - <flag name='machine-opt'/> - <flag name='machine-usb-opt'/> <flag name='tpm-passthrough'/> <flag name='tpm-tis'/> <flag name='pci-bridge'/> <flag name='vfio-pci'/> - <flag name='vfio-pci.bootindex'/> - <flag name='scsi-generic'/> - <flag name='scsi-generic.bootindex'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='vnc-share-policy'/> - <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='i440fx-pci-hole64-size'/> <flag name='q35-pci-hole64-size'/> @@ -128,9 +81,7 @@ <flag name='boot-strict'/> <flag name='pvpanic'/> <flag name='spice-file-xfer-disable'/> - <flag name='spiceport'/> <flag name='usb-kbd'/> - <flag name='host-pci-multidomain'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> <flag name='change-backing-file'/> @@ -180,7 +131,6 @@ <flag name='secret'/> <flag name='pxb'/> <flag name='pxb-pcie'/> - <flag name='device-tray-moved-event'/> <flag name='nec-usb-xhci-ports'/> <flag name='virtio-scsi-pci.iothread'/> <flag name='name-guest'/> @@ -188,7 +138,6 @@ <flag name='spice-unix'/> <flag name='drive-detect-zeroes'/> <flag name='tls-creds-x509'/> - <flag name='display'/> <flag name='intel-iommu'/> <flag name='smm'/> <flag name='virtio-pci-disable-legacy'/> diff --git a/tests/qemustatusxml2xmldata/migration-out-params-in.xml b/tests/qemustatusxml2xmldata/migration-out-params-in.xml index ae2064830a..daa45e3f88 100644 --- a/tests/qemustatusxml2xmldata/migration-out-params-in.xml +++ b/tests/qemustatusxml2xmldata/migration-out-params-in.xml @@ -11,37 +11,16 @@ </vcpus> <qemuCaps> <flag name='kvm'/> - <flag name='mem-path'/> - <flag name='drive-serial'/> - <flag name='monitor-json'/> - <flag name='sdl'/> - <flag name='netdev'/> - <flag name='rtc'/> - <flag name='vhost-net'/> <flag name='no-hpet'/> - <flag name='no-kvm-pit'/> - <flag name='pci-configfd'/> - <flag name='nodefconfig'/> - <flag name='boot-menu'/> - <flag name='fsdev'/> - <flag name='name-process'/> - <flag name='smbios-type'/> <flag name='spice'/> - <flag name='vga-none'/> - <flag name='boot-index'/> <flag name='hda-duplex'/> - <flag name='drive-aio'/> - <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> - <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='sga'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> - <flag name='cache-directsync'/> <flag name='piix3-usb-uhci'/> <flag name='piix4-usb-uhci'/> <flag name='usb-ehci'/> @@ -50,28 +29,16 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> - <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> - <flag name='fsdev-readonly'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> - <flag name='fsdev-writeout'/> - <flag name='drive-iotune'/> - <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> - <flag name='ide-cd'/> - <flag name='no-user-config'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> @@ -82,13 +49,9 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> - <flag name='usb-redir.bootindex'/> - <flag name='usb-host.bootindex'/> <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> @@ -96,30 +59,18 @@ <flag name='vmware-svga'/> <flag name='device-video-primary'/> <flag name='usb-serial'/> - <flag name='usb-net'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> <flag name='rng-egd'/> - <flag name='dtb'/> <flag name='megasas'/> - <flag name='ipv6-migration'/> - <flag name='machine-opt'/> - <flag name='machine-usb-opt'/> <flag name='tpm-passthrough'/> <flag name='tpm-tis'/> <flag name='pci-bridge'/> <flag name='vfio-pci'/> - <flag name='vfio-pci.bootindex'/> - <flag name='scsi-generic'/> - <flag name='scsi-generic.bootindex'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='vnc-share-policy'/> - <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='i440fx-pci-hole64-size'/> <flag name='q35-pci-hole64-size'/> @@ -131,9 +82,7 @@ <flag name='boot-strict'/> <flag name='pvpanic'/> <flag name='spice-file-xfer-disable'/> - <flag name='spiceport'/> <flag name='usb-kbd'/> - <flag name='host-pci-multidomain'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> <flag name='change-backing-file'/> @@ -184,7 +133,6 @@ <flag name='secret'/> <flag name='pxb'/> <flag name='pxb-pcie'/> - <flag name='device-tray-moved-event'/> <flag name='nec-usb-xhci-ports'/> <flag name='virtio-scsi-pci.iothread'/> <flag name='name-guest'/> @@ -192,7 +140,6 @@ <flag name='spice-unix'/> <flag name='drive-detect-zeroes'/> <flag name='tls-creds-x509'/> - <flag name='display'/> <flag name='intel-iommu'/> <flag name='smm'/> <flag name='virtio-pci-disable-legacy'/> diff --git a/tests/qemustatusxml2xmldata/modern-in.xml b/tests/qemustatusxml2xmldata/modern-in.xml index 08f7f40761..78a91c745f 100644 --- a/tests/qemustatusxml2xmldata/modern-in.xml +++ b/tests/qemustatusxml2xmldata/modern-in.xml @@ -10,35 +10,16 @@ </vcpus> <qemuCaps> <flag name='kvm'/> - <flag name='mem-path'/> - <flag name='drive-serial'/> - <flag name='monitor-json'/> - <flag name='sdl'/> - <flag name='netdev'/> - <flag name='rtc'/> - <flag name='vhost-net'/> <flag name='no-hpet'/> - <flag name='no-kvm-pit'/> - <flag name='nodefconfig'/> - <flag name='boot-menu'/> - <flag name='fsdev'/> - <flag name='name-process'/> - <flag name='smbios-type'/> <flag name='spice'/> - <flag name='vga-none'/> - <flag name='boot-index'/> <flag name='hda-duplex'/> - <flag name='drive-aio'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> - <flag name='chardev-spicevmc'/> <flag name='virtio-tx-alg'/> - <flag name='pci-multifunction'/> <flag name='virtio-blk-pci.ioeventfd'/> <flag name='sga'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> - <flag name='cache-directsync'/> <flag name='piix3-usb-uhci'/> <flag name='piix4-usb-uhci'/> <flag name='usb-ehci'/> @@ -47,28 +28,16 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> - <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> - <flag name='fsdev-readonly'/> <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> - <flag name='fsdev-writeout'/> - <flag name='drive-iotune'/> - <flag name='system_wakeup'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='transaction'/> <flag name='block-job-async'/> - <flag name='scsi-cd'/> - <flag name='ide-cd'/> - <flag name='no-user-config'/> <flag name='hda-micro'/> <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> - <flag name='bridge'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> @@ -79,13 +48,9 @@ <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> - <flag name='seamless-migration'/> <flag name='block-commit'/> <flag name='vnc'/> <flag name='drive-mirror'/> - <flag name='usb-redir.bootindex'/> - <flag name='usb-host.bootindex'/> <flag name='blockdev-snapshot-sync'/> <flag name='qxl'/> <flag name='VGA'/> @@ -93,30 +58,18 @@ <flag name='vmware-svga'/> <flag name='device-video-primary'/> <flag name='usb-serial'/> - <flag name='usb-net'/> - <flag name='add-fd'/> <flag name='nbd-server'/> <flag name='virtio-rng'/> <flag name='rng-random'/> <flag name='rng-egd'/> - <flag name='dtb'/> <flag name='megasas'/> - <flag name='ipv6-migration'/> - <flag name='machine-opt'/> - <flag name='machine-usb-opt'/> <flag name='tpm-passthrough'/> <flag name='tpm-tis'/> <flag name='pci-bridge'/> <flag name='vfio-pci'/> - <flag name='vfio-pci.bootindex'/> - <flag name='scsi-generic'/> - <flag name='scsi-generic.bootindex'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> - <flag name='vnc-share-policy'/> - <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> <flag name='i440fx-pci-hole64-size'/> <flag name='q35-pci-hole64-size'/> @@ -128,9 +81,7 @@ <flag name='boot-strict'/> <flag name='pvpanic'/> <flag name='spice-file-xfer-disable'/> - <flag name='spiceport'/> <flag name='usb-kbd'/> - <flag name='host-pci-multidomain'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> <flag name='change-backing-file'/> @@ -180,7 +131,6 @@ <flag name='secret'/> <flag name='pxb'/> <flag name='pxb-pcie'/> - <flag name='device-tray-moved-event'/> <flag name='nec-usb-xhci-ports'/> <flag name='virtio-scsi-pci.iothread'/> <flag name='name-guest'/> @@ -188,7 +138,6 @@ <flag name='spice-unix'/> <flag name='drive-detect-zeroes'/> <flag name='tls-creds-x509'/> - <flag name='display'/> <flag name='intel-iommu'/> <flag name='smm'/> <flag name='virtio-pci-disable-legacy'/> diff --git a/tests/qemustatusxml2xmldata/vcpus-multi-in.xml b/tests/qemustatusxml2xmldata/vcpus-multi-in.xml index c99046ce8d..f9108a1e09 100644 --- a/tests/qemustatusxml2xmldata/vcpus-multi-in.xml +++ b/tests/qemustatusxml2xmldata/vcpus-multi-in.xml @@ -292,7 +292,6 @@ <vcpu id='287' pid='3803806'/> </vcpus> <qemuCaps> - <flag name='vnet-hdr'/> <flag name='qxl.vgamem_mb'/> <flag name='qxl-vga.vgamem_mb'/> <flag name='pc-dimm'/> -- 2.19.2