From nobody Mon Feb  9 12:11:21 2026
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1550763792357656.6868646070428;
 Thu, 21 Feb 2019 07:43:12 -0800 (PST)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
 [10.5.11.13])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 58CA6308213A;
	Thu, 21 Feb 2019 15:43:10 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 2551E22706;
	Thu, 21 Feb 2019 15:43:10 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id C4CC03FB13;
	Thu, 21 Feb 2019 15:43:09 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com
	[10.5.11.23])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x1LFgdif008332 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 21 Feb 2019 10:42:39 -0500
Received: by smtp.corp.redhat.com (Postfix)
	id 62C1D282C9; Thu, 21 Feb 2019 15:42:39 +0000 (UTC)
Received: from icr.brq.redhat.com (unknown [10.43.2.100])
	by smtp.corp.redhat.com (Postfix) with ESMTP id B8BC71A837
	for <libvir-list@redhat.com>; Thu, 21 Feb 2019 15:42:38 +0000 (UTC)
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
To: libvir-list@redhat.com
Date: Thu, 21 Feb 2019 16:42:27 +0100
Message-Id: 
 <1f4db2269c5e31f02a7081b633d323999411ac26.1550763719.git.jtomko@redhat.com>
In-Reply-To: <cover.1550763719.git.jtomko@redhat.com>
References: <cover.1550763719.git.jtomko@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 5/8] qemustatusxml2xmltests: remove deprecated
	qemu capabilities
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]);
 Thu, 21 Feb 2019 15:43:10 +0000 (UTC)

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=C3=A1n Tomko <jtomko@redhat.com>
---
 .../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/qem=
ustatusxml2xmldata/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=3D'0' pid=3D'3803519'/>
   </vcpus>
   <qemuCaps>
-    <flag name=3D'vnet-hdr'/>
     <flag name=3D'qxl.vgamem_mb'/>
     <flag name=3D'qxl-vga.vgamem_mb'/>
     <flag name=3D'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=3D'kvm'/>
-    <flag name=3D'mem-path'/>
-    <flag name=3D'drive-serial'/>
-    <flag name=3D'monitor-json'/>
-    <flag name=3D'sdl'/>
-    <flag name=3D'netdev'/>
-    <flag name=3D'rtc'/>
-    <flag name=3D'vhost-net'/>
     <flag name=3D'no-hpet'/>
-    <flag name=3D'no-kvm-pit'/>
-    <flag name=3D'pci-configfd'/>
-    <flag name=3D'nodefconfig'/>
-    <flag name=3D'boot-menu'/>
-    <flag name=3D'fsdev'/>
-    <flag name=3D'name-process'/>
-    <flag name=3D'smbios-type'/>
     <flag name=3D'spice'/>
-    <flag name=3D'vga-none'/>
-    <flag name=3D'boot-index'/>
     <flag name=3D'hda-duplex'/>
-    <flag name=3D'drive-aio'/>
-    <flag name=3D'pci-bootindex'/>
     <flag name=3D'ccid-emulated'/>
     <flag name=3D'ccid-passthru'/>
-    <flag name=3D'chardev-spicevmc'/>
     <flag name=3D'virtio-tx-alg'/>
-    <flag name=3D'pci-multifunction'/>
     <flag name=3D'virtio-blk-pci.ioeventfd'/>
     <flag name=3D'sga'/>
     <flag name=3D'virtio-blk-pci.event_idx'/>
     <flag name=3D'virtio-net-pci.event_idx'/>
-    <flag name=3D'cache-directsync'/>
     <flag name=3D'piix3-usb-uhci'/>
     <flag name=3D'piix4-usb-uhci'/>
     <flag name=3D'usb-ehci'/>
@@ -50,28 +29,16 @@
     <flag name=3D'pci-ohci'/>
     <flag name=3D'usb-redir'/>
     <flag name=3D'usb-hub'/>
-    <flag name=3D'no-shutdown'/>
-    <flag name=3D'cache-unsafe'/>
     <flag name=3D'ich9-ahci'/>
     <flag name=3D'no-acpi'/>
-    <flag name=3D'fsdev-readonly'/>
     <flag name=3D'virtio-blk-pci.scsi'/>
-    <flag name=3D'drive-copy-on-read'/>
-    <flag name=3D'fsdev-writeout'/>
-    <flag name=3D'drive-iotune'/>
-    <flag name=3D'system_wakeup'/>
     <flag name=3D'scsi-disk.channel'/>
     <flag name=3D'scsi-block'/>
     <flag name=3D'transaction'/>
     <flag name=3D'block-job-async'/>
-    <flag name=3D'scsi-cd'/>
-    <flag name=3D'ide-cd'/>
-    <flag name=3D'no-user-config'/>
     <flag name=3D'hda-micro'/>
     <flag name=3D'dump-guest-memory'/>
     <flag name=3D'nec-usb-xhci'/>
-    <flag name=3D'balloon-event'/>
-    <flag name=3D'bridge'/>
     <flag name=3D'lsi'/>
     <flag name=3D'virtio-scsi-pci'/>
     <flag name=3D'blockio'/>
@@ -82,13 +49,9 @@
     <flag name=3D'scsi-disk.wwn'/>
     <flag name=3D'seccomp-sandbox'/>
     <flag name=3D'reboot-timeout'/>
-    <flag name=3D'dump-guest-core'/>
-    <flag name=3D'seamless-migration'/>
     <flag name=3D'block-commit'/>
     <flag name=3D'vnc'/>
     <flag name=3D'drive-mirror'/>
-    <flag name=3D'usb-redir.bootindex'/>
-    <flag name=3D'usb-host.bootindex'/>
     <flag name=3D'blockdev-snapshot-sync'/>
     <flag name=3D'qxl'/>
     <flag name=3D'VGA'/>
@@ -96,30 +59,18 @@
     <flag name=3D'vmware-svga'/>
     <flag name=3D'device-video-primary'/>
     <flag name=3D'usb-serial'/>
-    <flag name=3D'usb-net'/>
-    <flag name=3D'add-fd'/>
     <flag name=3D'nbd-server'/>
     <flag name=3D'virtio-rng'/>
     <flag name=3D'rng-random'/>
     <flag name=3D'rng-egd'/>
-    <flag name=3D'dtb'/>
     <flag name=3D'megasas'/>
-    <flag name=3D'ipv6-migration'/>
-    <flag name=3D'machine-opt'/>
-    <flag name=3D'machine-usb-opt'/>
     <flag name=3D'tpm-passthrough'/>
     <flag name=3D'tpm-tis'/>
     <flag name=3D'pci-bridge'/>
     <flag name=3D'vfio-pci'/>
-    <flag name=3D'vfio-pci.bootindex'/>
-    <flag name=3D'scsi-generic'/>
-    <flag name=3D'scsi-generic.bootindex'/>
     <flag name=3D'mem-merge'/>
-    <flag name=3D'vnc-websocket'/>
     <flag name=3D'drive-discard'/>
     <flag name=3D'mlock'/>
-    <flag name=3D'vnc-share-policy'/>
-    <flag name=3D'device-del-event'/>
     <flag name=3D'dmi-to-pci-bridge'/>
     <flag name=3D'i440fx-pci-hole64-size'/>
     <flag name=3D'q35-pci-hole64-size'/>
@@ -131,9 +82,7 @@
     <flag name=3D'boot-strict'/>
     <flag name=3D'pvpanic'/>
     <flag name=3D'spice-file-xfer-disable'/>
-    <flag name=3D'spiceport'/>
     <flag name=3D'usb-kbd'/>
-    <flag name=3D'host-pci-multidomain'/>
     <flag name=3D'msg-timestamp'/>
     <flag name=3D'active-commit'/>
     <flag name=3D'change-backing-file'/>
@@ -184,7 +133,6 @@
     <flag name=3D'secret'/>
     <flag name=3D'pxb'/>
     <flag name=3D'pxb-pcie'/>
-    <flag name=3D'device-tray-moved-event'/>
     <flag name=3D'nec-usb-xhci-ports'/>
     <flag name=3D'virtio-scsi-pci.iothread'/>
     <flag name=3D'name-guest'/>
@@ -192,7 +140,6 @@
     <flag name=3D'spice-unix'/>
     <flag name=3D'drive-detect-zeroes'/>
     <flag name=3D'tls-creds-x509'/>
-    <flag name=3D'display'/>
     <flag name=3D'intel-iommu'/>
     <flag name=3D'smm'/>
     <flag name=3D'virtio-pci-disable-legacy'/>
diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-in.xml b/tes=
ts/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=3D'kvm'/>
-    <flag name=3D'mem-path'/>
-    <flag name=3D'drive-serial'/>
-    <flag name=3D'monitor-json'/>
-    <flag name=3D'sdl'/>
-    <flag name=3D'netdev'/>
-    <flag name=3D'rtc'/>
-    <flag name=3D'vhost-net'/>
     <flag name=3D'no-hpet'/>
-    <flag name=3D'no-kvm-pit'/>
-    <flag name=3D'nodefconfig'/>
-    <flag name=3D'boot-menu'/>
-    <flag name=3D'fsdev'/>
-    <flag name=3D'name-process'/>
-    <flag name=3D'smbios-type'/>
     <flag name=3D'spice'/>
-    <flag name=3D'vga-none'/>
-    <flag name=3D'boot-index'/>
     <flag name=3D'hda-duplex'/>
-    <flag name=3D'drive-aio'/>
     <flag name=3D'ccid-emulated'/>
     <flag name=3D'ccid-passthru'/>
-    <flag name=3D'chardev-spicevmc'/>
     <flag name=3D'virtio-tx-alg'/>
-    <flag name=3D'pci-multifunction'/>
     <flag name=3D'virtio-blk-pci.ioeventfd'/>
     <flag name=3D'sga'/>
     <flag name=3D'virtio-blk-pci.event_idx'/>
     <flag name=3D'virtio-net-pci.event_idx'/>
-    <flag name=3D'cache-directsync'/>
     <flag name=3D'piix3-usb-uhci'/>
     <flag name=3D'piix4-usb-uhci'/>
     <flag name=3D'usb-ehci'/>
@@ -47,28 +28,16 @@
     <flag name=3D'pci-ohci'/>
     <flag name=3D'usb-redir'/>
     <flag name=3D'usb-hub'/>
-    <flag name=3D'no-shutdown'/>
-    <flag name=3D'cache-unsafe'/>
     <flag name=3D'ich9-ahci'/>
     <flag name=3D'no-acpi'/>
-    <flag name=3D'fsdev-readonly'/>
     <flag name=3D'virtio-blk-pci.scsi'/>
-    <flag name=3D'drive-copy-on-read'/>
-    <flag name=3D'fsdev-writeout'/>
-    <flag name=3D'drive-iotune'/>
-    <flag name=3D'system_wakeup'/>
     <flag name=3D'scsi-disk.channel'/>
     <flag name=3D'scsi-block'/>
     <flag name=3D'transaction'/>
     <flag name=3D'block-job-async'/>
-    <flag name=3D'scsi-cd'/>
-    <flag name=3D'ide-cd'/>
-    <flag name=3D'no-user-config'/>
     <flag name=3D'hda-micro'/>
     <flag name=3D'dump-guest-memory'/>
     <flag name=3D'nec-usb-xhci'/>
-    <flag name=3D'balloon-event'/>
-    <flag name=3D'bridge'/>
     <flag name=3D'lsi'/>
     <flag name=3D'virtio-scsi-pci'/>
     <flag name=3D'blockio'/>
@@ -79,13 +48,9 @@
     <flag name=3D'scsi-disk.wwn'/>
     <flag name=3D'seccomp-sandbox'/>
     <flag name=3D'reboot-timeout'/>
-    <flag name=3D'dump-guest-core'/>
-    <flag name=3D'seamless-migration'/>
     <flag name=3D'block-commit'/>
     <flag name=3D'vnc'/>
     <flag name=3D'drive-mirror'/>
-    <flag name=3D'usb-redir.bootindex'/>
-    <flag name=3D'usb-host.bootindex'/>
     <flag name=3D'blockdev-snapshot-sync'/>
     <flag name=3D'qxl'/>
     <flag name=3D'VGA'/>
@@ -93,30 +58,18 @@
     <flag name=3D'vmware-svga'/>
     <flag name=3D'device-video-primary'/>
     <flag name=3D'usb-serial'/>
-    <flag name=3D'usb-net'/>
-    <flag name=3D'add-fd'/>
     <flag name=3D'nbd-server'/>
     <flag name=3D'virtio-rng'/>
     <flag name=3D'rng-random'/>
     <flag name=3D'rng-egd'/>
-    <flag name=3D'dtb'/>
     <flag name=3D'megasas'/>
-    <flag name=3D'ipv6-migration'/>
-    <flag name=3D'machine-opt'/>
-    <flag name=3D'machine-usb-opt'/>
     <flag name=3D'tpm-passthrough'/>
     <flag name=3D'tpm-tis'/>
     <flag name=3D'pci-bridge'/>
     <flag name=3D'vfio-pci'/>
-    <flag name=3D'vfio-pci.bootindex'/>
-    <flag name=3D'scsi-generic'/>
-    <flag name=3D'scsi-generic.bootindex'/>
     <flag name=3D'mem-merge'/>
-    <flag name=3D'vnc-websocket'/>
     <flag name=3D'drive-discard'/>
     <flag name=3D'mlock'/>
-    <flag name=3D'vnc-share-policy'/>
-    <flag name=3D'device-del-event'/>
     <flag name=3D'dmi-to-pci-bridge'/>
     <flag name=3D'i440fx-pci-hole64-size'/>
     <flag name=3D'q35-pci-hole64-size'/>
@@ -128,9 +81,7 @@
     <flag name=3D'boot-strict'/>
     <flag name=3D'pvpanic'/>
     <flag name=3D'spice-file-xfer-disable'/>
-    <flag name=3D'spiceport'/>
     <flag name=3D'usb-kbd'/>
-    <flag name=3D'host-pci-multidomain'/>
     <flag name=3D'msg-timestamp'/>
     <flag name=3D'active-commit'/>
     <flag name=3D'change-backing-file'/>
@@ -180,7 +131,6 @@
     <flag name=3D'secret'/>
     <flag name=3D'pxb'/>
     <flag name=3D'pxb-pcie'/>
-    <flag name=3D'device-tray-moved-event'/>
     <flag name=3D'nec-usb-xhci-ports'/>
     <flag name=3D'virtio-scsi-pci.iothread'/>
     <flag name=3D'name-guest'/>
@@ -188,7 +138,6 @@
     <flag name=3D'spice-unix'/>
     <flag name=3D'drive-detect-zeroes'/>
     <flag name=3D'tls-creds-x509'/>
-    <flag name=3D'display'/>
     <flag name=3D'intel-iommu'/>
     <flag name=3D'smm'/>
     <flag name=3D'virtio-pci-disable-legacy'/>
diff --git a/tests/qemustatusxml2xmldata/migration-out-params-in.xml b/test=
s/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=3D'kvm'/>
-    <flag name=3D'mem-path'/>
-    <flag name=3D'drive-serial'/>
-    <flag name=3D'monitor-json'/>
-    <flag name=3D'sdl'/>
-    <flag name=3D'netdev'/>
-    <flag name=3D'rtc'/>
-    <flag name=3D'vhost-net'/>
     <flag name=3D'no-hpet'/>
-    <flag name=3D'no-kvm-pit'/>
-    <flag name=3D'pci-configfd'/>
-    <flag name=3D'nodefconfig'/>
-    <flag name=3D'boot-menu'/>
-    <flag name=3D'fsdev'/>
-    <flag name=3D'name-process'/>
-    <flag name=3D'smbios-type'/>
     <flag name=3D'spice'/>
-    <flag name=3D'vga-none'/>
-    <flag name=3D'boot-index'/>
     <flag name=3D'hda-duplex'/>
-    <flag name=3D'drive-aio'/>
-    <flag name=3D'pci-bootindex'/>
     <flag name=3D'ccid-emulated'/>
     <flag name=3D'ccid-passthru'/>
-    <flag name=3D'chardev-spicevmc'/>
     <flag name=3D'virtio-tx-alg'/>
-    <flag name=3D'pci-multifunction'/>
     <flag name=3D'virtio-blk-pci.ioeventfd'/>
     <flag name=3D'sga'/>
     <flag name=3D'virtio-blk-pci.event_idx'/>
     <flag name=3D'virtio-net-pci.event_idx'/>
-    <flag name=3D'cache-directsync'/>
     <flag name=3D'piix3-usb-uhci'/>
     <flag name=3D'piix4-usb-uhci'/>
     <flag name=3D'usb-ehci'/>
@@ -50,28 +29,16 @@
     <flag name=3D'pci-ohci'/>
     <flag name=3D'usb-redir'/>
     <flag name=3D'usb-hub'/>
-    <flag name=3D'no-shutdown'/>
-    <flag name=3D'cache-unsafe'/>
     <flag name=3D'ich9-ahci'/>
     <flag name=3D'no-acpi'/>
-    <flag name=3D'fsdev-readonly'/>
     <flag name=3D'virtio-blk-pci.scsi'/>
-    <flag name=3D'drive-copy-on-read'/>
-    <flag name=3D'fsdev-writeout'/>
-    <flag name=3D'drive-iotune'/>
-    <flag name=3D'system_wakeup'/>
     <flag name=3D'scsi-disk.channel'/>
     <flag name=3D'scsi-block'/>
     <flag name=3D'transaction'/>
     <flag name=3D'block-job-async'/>
-    <flag name=3D'scsi-cd'/>
-    <flag name=3D'ide-cd'/>
-    <flag name=3D'no-user-config'/>
     <flag name=3D'hda-micro'/>
     <flag name=3D'dump-guest-memory'/>
     <flag name=3D'nec-usb-xhci'/>
-    <flag name=3D'balloon-event'/>
-    <flag name=3D'bridge'/>
     <flag name=3D'lsi'/>
     <flag name=3D'virtio-scsi-pci'/>
     <flag name=3D'blockio'/>
@@ -82,13 +49,9 @@
     <flag name=3D'scsi-disk.wwn'/>
     <flag name=3D'seccomp-sandbox'/>
     <flag name=3D'reboot-timeout'/>
-    <flag name=3D'dump-guest-core'/>
-    <flag name=3D'seamless-migration'/>
     <flag name=3D'block-commit'/>
     <flag name=3D'vnc'/>
     <flag name=3D'drive-mirror'/>
-    <flag name=3D'usb-redir.bootindex'/>
-    <flag name=3D'usb-host.bootindex'/>
     <flag name=3D'blockdev-snapshot-sync'/>
     <flag name=3D'qxl'/>
     <flag name=3D'VGA'/>
@@ -96,30 +59,18 @@
     <flag name=3D'vmware-svga'/>
     <flag name=3D'device-video-primary'/>
     <flag name=3D'usb-serial'/>
-    <flag name=3D'usb-net'/>
-    <flag name=3D'add-fd'/>
     <flag name=3D'nbd-server'/>
     <flag name=3D'virtio-rng'/>
     <flag name=3D'rng-random'/>
     <flag name=3D'rng-egd'/>
-    <flag name=3D'dtb'/>
     <flag name=3D'megasas'/>
-    <flag name=3D'ipv6-migration'/>
-    <flag name=3D'machine-opt'/>
-    <flag name=3D'machine-usb-opt'/>
     <flag name=3D'tpm-passthrough'/>
     <flag name=3D'tpm-tis'/>
     <flag name=3D'pci-bridge'/>
     <flag name=3D'vfio-pci'/>
-    <flag name=3D'vfio-pci.bootindex'/>
-    <flag name=3D'scsi-generic'/>
-    <flag name=3D'scsi-generic.bootindex'/>
     <flag name=3D'mem-merge'/>
-    <flag name=3D'vnc-websocket'/>
     <flag name=3D'drive-discard'/>
     <flag name=3D'mlock'/>
-    <flag name=3D'vnc-share-policy'/>
-    <flag name=3D'device-del-event'/>
     <flag name=3D'dmi-to-pci-bridge'/>
     <flag name=3D'i440fx-pci-hole64-size'/>
     <flag name=3D'q35-pci-hole64-size'/>
@@ -131,9 +82,7 @@
     <flag name=3D'boot-strict'/>
     <flag name=3D'pvpanic'/>
     <flag name=3D'spice-file-xfer-disable'/>
-    <flag name=3D'spiceport'/>
     <flag name=3D'usb-kbd'/>
-    <flag name=3D'host-pci-multidomain'/>
     <flag name=3D'msg-timestamp'/>
     <flag name=3D'active-commit'/>
     <flag name=3D'change-backing-file'/>
@@ -184,7 +133,6 @@
     <flag name=3D'secret'/>
     <flag name=3D'pxb'/>
     <flag name=3D'pxb-pcie'/>
-    <flag name=3D'device-tray-moved-event'/>
     <flag name=3D'nec-usb-xhci-ports'/>
     <flag name=3D'virtio-scsi-pci.iothread'/>
     <flag name=3D'name-guest'/>
@@ -192,7 +140,6 @@
     <flag name=3D'spice-unix'/>
     <flag name=3D'drive-detect-zeroes'/>
     <flag name=3D'tls-creds-x509'/>
-    <flag name=3D'display'/>
     <flag name=3D'intel-iommu'/>
     <flag name=3D'smm'/>
     <flag name=3D'virtio-pci-disable-legacy'/>
diff --git a/tests/qemustatusxml2xmldata/modern-in.xml b/tests/qemustatusxm=
l2xmldata/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=3D'kvm'/>
-    <flag name=3D'mem-path'/>
-    <flag name=3D'drive-serial'/>
-    <flag name=3D'monitor-json'/>
-    <flag name=3D'sdl'/>
-    <flag name=3D'netdev'/>
-    <flag name=3D'rtc'/>
-    <flag name=3D'vhost-net'/>
     <flag name=3D'no-hpet'/>
-    <flag name=3D'no-kvm-pit'/>
-    <flag name=3D'nodefconfig'/>
-    <flag name=3D'boot-menu'/>
-    <flag name=3D'fsdev'/>
-    <flag name=3D'name-process'/>
-    <flag name=3D'smbios-type'/>
     <flag name=3D'spice'/>
-    <flag name=3D'vga-none'/>
-    <flag name=3D'boot-index'/>
     <flag name=3D'hda-duplex'/>
-    <flag name=3D'drive-aio'/>
     <flag name=3D'ccid-emulated'/>
     <flag name=3D'ccid-passthru'/>
-    <flag name=3D'chardev-spicevmc'/>
     <flag name=3D'virtio-tx-alg'/>
-    <flag name=3D'pci-multifunction'/>
     <flag name=3D'virtio-blk-pci.ioeventfd'/>
     <flag name=3D'sga'/>
     <flag name=3D'virtio-blk-pci.event_idx'/>
     <flag name=3D'virtio-net-pci.event_idx'/>
-    <flag name=3D'cache-directsync'/>
     <flag name=3D'piix3-usb-uhci'/>
     <flag name=3D'piix4-usb-uhci'/>
     <flag name=3D'usb-ehci'/>
@@ -47,28 +28,16 @@
     <flag name=3D'pci-ohci'/>
     <flag name=3D'usb-redir'/>
     <flag name=3D'usb-hub'/>
-    <flag name=3D'no-shutdown'/>
-    <flag name=3D'cache-unsafe'/>
     <flag name=3D'ich9-ahci'/>
     <flag name=3D'no-acpi'/>
-    <flag name=3D'fsdev-readonly'/>
     <flag name=3D'virtio-blk-pci.scsi'/>
-    <flag name=3D'drive-copy-on-read'/>
-    <flag name=3D'fsdev-writeout'/>
-    <flag name=3D'drive-iotune'/>
-    <flag name=3D'system_wakeup'/>
     <flag name=3D'scsi-disk.channel'/>
     <flag name=3D'scsi-block'/>
     <flag name=3D'transaction'/>
     <flag name=3D'block-job-async'/>
-    <flag name=3D'scsi-cd'/>
-    <flag name=3D'ide-cd'/>
-    <flag name=3D'no-user-config'/>
     <flag name=3D'hda-micro'/>
     <flag name=3D'dump-guest-memory'/>
     <flag name=3D'nec-usb-xhci'/>
-    <flag name=3D'balloon-event'/>
-    <flag name=3D'bridge'/>
     <flag name=3D'lsi'/>
     <flag name=3D'virtio-scsi-pci'/>
     <flag name=3D'blockio'/>
@@ -79,13 +48,9 @@
     <flag name=3D'scsi-disk.wwn'/>
     <flag name=3D'seccomp-sandbox'/>
     <flag name=3D'reboot-timeout'/>
-    <flag name=3D'dump-guest-core'/>
-    <flag name=3D'seamless-migration'/>
     <flag name=3D'block-commit'/>
     <flag name=3D'vnc'/>
     <flag name=3D'drive-mirror'/>
-    <flag name=3D'usb-redir.bootindex'/>
-    <flag name=3D'usb-host.bootindex'/>
     <flag name=3D'blockdev-snapshot-sync'/>
     <flag name=3D'qxl'/>
     <flag name=3D'VGA'/>
@@ -93,30 +58,18 @@
     <flag name=3D'vmware-svga'/>
     <flag name=3D'device-video-primary'/>
     <flag name=3D'usb-serial'/>
-    <flag name=3D'usb-net'/>
-    <flag name=3D'add-fd'/>
     <flag name=3D'nbd-server'/>
     <flag name=3D'virtio-rng'/>
     <flag name=3D'rng-random'/>
     <flag name=3D'rng-egd'/>
-    <flag name=3D'dtb'/>
     <flag name=3D'megasas'/>
-    <flag name=3D'ipv6-migration'/>
-    <flag name=3D'machine-opt'/>
-    <flag name=3D'machine-usb-opt'/>
     <flag name=3D'tpm-passthrough'/>
     <flag name=3D'tpm-tis'/>
     <flag name=3D'pci-bridge'/>
     <flag name=3D'vfio-pci'/>
-    <flag name=3D'vfio-pci.bootindex'/>
-    <flag name=3D'scsi-generic'/>
-    <flag name=3D'scsi-generic.bootindex'/>
     <flag name=3D'mem-merge'/>
-    <flag name=3D'vnc-websocket'/>
     <flag name=3D'drive-discard'/>
     <flag name=3D'mlock'/>
-    <flag name=3D'vnc-share-policy'/>
-    <flag name=3D'device-del-event'/>
     <flag name=3D'dmi-to-pci-bridge'/>
     <flag name=3D'i440fx-pci-hole64-size'/>
     <flag name=3D'q35-pci-hole64-size'/>
@@ -128,9 +81,7 @@
     <flag name=3D'boot-strict'/>
     <flag name=3D'pvpanic'/>
     <flag name=3D'spice-file-xfer-disable'/>
-    <flag name=3D'spiceport'/>
     <flag name=3D'usb-kbd'/>
-    <flag name=3D'host-pci-multidomain'/>
     <flag name=3D'msg-timestamp'/>
     <flag name=3D'active-commit'/>
     <flag name=3D'change-backing-file'/>
@@ -180,7 +131,6 @@
     <flag name=3D'secret'/>
     <flag name=3D'pxb'/>
     <flag name=3D'pxb-pcie'/>
-    <flag name=3D'device-tray-moved-event'/>
     <flag name=3D'nec-usb-xhci-ports'/>
     <flag name=3D'virtio-scsi-pci.iothread'/>
     <flag name=3D'name-guest'/>
@@ -188,7 +138,6 @@
     <flag name=3D'spice-unix'/>
     <flag name=3D'drive-detect-zeroes'/>
     <flag name=3D'tls-creds-x509'/>
-    <flag name=3D'display'/>
     <flag name=3D'intel-iommu'/>
     <flag name=3D'smm'/>
     <flag name=3D'virtio-pci-disable-legacy'/>
diff --git a/tests/qemustatusxml2xmldata/vcpus-multi-in.xml b/tests/qemusta=
tusxml2xmldata/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=3D'287' pid=3D'3803806'/>
   </vcpus>
   <qemuCaps>
-    <flag name=3D'vnet-hdr'/>
     <flag name=3D'qxl.vgamem_mb'/>
     <flag name=3D'qxl-vga.vgamem_mb'/>
     <flag name=3D'pc-dimm'/>
--=20
2.19.2

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list