From nobody Sat Oct 24 20:21:00 2026
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates
 38.145.34.151 as permitted sender) client-ip=38.145.34.151;
 envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org;
Authentication-Results: mx.zohomail.com;
	dkim=fail;
	spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151
 as permitted sender)  smtp.mailfrom=devel-bounces@lists.libvirt.org;
	dmarc=pass(p=reject dis=none)  header.from=lists.libvirt.org
ARC-Seal: i=1; a=rsa-sha256; t=1791900194; cv=none;
	d=zohomail.com; s=zohoarc;
	b=HvhGuUMyyUc5flNWrTGEMxtQSofC31ChPI57EPvo+Bx6ZyXuPRLvTDr8Fa+8OW/4dCSr63/g3c2WUp75teTNkrUauZOqlAvmFFcNSpNwT5mTgeAltuxepPV8y6TkgArmwkKjVCkPSFcwuz+hJBCUOH84tFScvMhi/yKrzMT26Go=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1791900194;
 h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:Subject:Subject:To:To:Message-Id:Cc;
	bh=tvJ8UWQXbhu/iaJzjuanIcokCujIDVxB3ulXjBc8iGA=;
	b=lEApSuLYQUGtQBr/PtattPTbJjUOz+DSzPYZe4duQrC5GCKcTTdS+ROhfIGDEAEKyhibX7lOgiSQ38rOZNqGOomL45aDyVs018j0VBrzfX4kJrdbiIxfkookHlWNc2CVwXCdCwQ0NbO9cc93FW7QR6RqpVlgAogH/Q8Xrb9sRKo=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=fail;
	spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151
 as permitted sender)  smtp.mailfrom=devel-bounces@lists.libvirt.org;
	dmarc=pass header.from=<devel@lists.libvirt.org> (p=reject dis=none)
Return-Path: <devel-bounces@lists.libvirt.org>
Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by
 mx.zohomail.com
	with SMTPS id 1791900194072330.11766421307266;
 Tue, 13 Oct 2026 07:03:14 -0700 (PDT)
Received: by lists.libvirt.org (Postfix, from userid 993)
	id B5735418C2; Tue, 13 Oct 2026 10:03:12 -0400 (EDT)
Received: from [172.19.199.16] (unknown [10.16.107.18])
	by lists.libvirt.org (Postfix) with ESMTP id 4F6A141AE7;
	Tue, 13 Oct 2026 10:00:18 -0400 (EDT)
Received: by lists.libvirt.org (Postfix, from userid 993)
	id AA9893F35F; Tue, 13 Oct 2026 10:00:07 -0400 (EDT)
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.129.124])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest
 SHA256)
	(No client certificate requested)
	by lists.libvirt.org (Postfix) with ESMTPS id 4811F3F332
	for <devel@lists.libvirt.org>; Tue, 13 Oct 2026 10:00:05 -0400 (EDT)
Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com
 (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by
 relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,
 cipher=TLS_AES_256_GCM_SHA384) id us-mta-687-6BbhHb2xPRqSTwhZdvrD0Q-1; Tue,
 13 Oct 2026 14:00:03 +0000
Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com
 (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest
 SHA256)
	(No client certificate requested)
	by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS
 id 3B415185FCF7
	for <devel@lists.libvirt.org>; Tue, 13 Oct 2026 14:00:02 +0000 (UTC)
Received: from hjs (unknown [10.43.3.146])
	by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP
 id 9E4AC1956041
	for <devel@lists.libvirt.org>; Tue, 13 Oct 2026 14:00:01 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID,
	DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS
	autolearn=unavailable autolearn_force=no version=4.0.1
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1791900004;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding;
	bh=tvJ8UWQXbhu/iaJzjuanIcokCujIDVxB3ulXjBc8iGA=;
	b=OOL94TI6plaU1sXVDd/JUOmdNydeT2+y85IKEq09iMrsscMhcl1DPSc4XR+rnf1WiKIHxz
	kC1YHJ62mrQ9GdUWMNB9EnTOwE8E21w7uOVzIOhjwoLDqkPH9S1Huc3uGgAGUqsM/QR7Mq
	eE1jZIvH+nyIP2hzZ0nYSX2nG4ADKN8=
X-MC-Unique: 6BbhHb2xPRqSTwhZdvrD0Q-1
X-Mimecast-MFC-AGG-ID: 6BbhHb2xPRqSTwhZdvrD0Q_1791900002
To: devel@lists.libvirt.org
Subject: [libvirt PATCH] qemu: save virtiofs capabilities in status XML
Date: Tue, 13 Oct 2026 15:59:50 +0200
Message-ID: 
 <f250eae89ebf0fa9ac06b67f6051db9ae9399b19.1791899990.git.jtomko@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17
X-Mimecast-Spam-Score: 0
X-Mimecast-MFC-PROC-ID: wNpCYEHNBPTHANmOXginDbIgfb_SfJ7Ez53Hzpg1zaI_1791900002
X-Mimecast-Originator: redhat.com
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Message-ID-Hash: 4JFUSVZ454YSVEZ6PIBWY6KHQVNTSDCI
X-Message-ID-Hash: 4JFUSVZ454YSVEZ6PIBWY6KHQVNTSDCI
X-MailFrom: jtomko@redhat.com
X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop;
 banned-address; header-match-devel.lists.libvirt.org-0; emergency;
 member-moderation; nonmember-moderation; administrivia; implicit-dest;
 max-recipients; max-size; news-moderation; no-subject; digests;
 suspicious-header
X-Mailman-Version: 3.3.10
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <devel.lists.libvirt.org>
Archived-At: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/4JFUSVZ454YSVEZ6PIBWY6KHQVNTSDCI/>
List-Archive: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/>
List-Help: <mailto:devel-request@lists.libvirt.org?subject=help>
List-Owner: <mailto:devel-owner@lists.libvirt.org>
List-Post: <mailto:devel@lists.libvirt.org>
List-Subscribe: <mailto:devel-join@lists.libvirt.org>
List-Unsubscribe: <mailto:devel-leave@lists.libvirt.org>
From: =?utf-8?q?J=C3=A1n_Tomko_via_Devel?= <devel@lists.libvirt.org>
Reply-To: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
X-ZohoMail-DKIM: fail (Header signature does not verify)
X-ZM-MESSAGEID: 1791900196851158500

From: J=C3=A1n Tomko <jtomko@redhat.com>

Otherwise migration after daemon restart stops working.

https://redhat.atlassian.net/browse/RHEL-90387

Signed-off-by: J=C3=A1n Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/conf/domain_conf.c                       |   9 +
 tests/qemustatusxml2xmldata/virtiofs-in.xml  | 437 +++++++++++++++++++
 tests/qemustatusxml2xmldata/virtiofs-out.xml |   1 +
 tests/qemuxmlactivetest.c                    |   2 +
 4 files changed, 449 insertions(+)
 create mode 100644 tests/qemustatusxml2xmldata/virtiofs-in.xml
 create mode 120000 tests/qemustatusxml2xmldata/virtiofs-out.xml

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 94a1f8bd8e..69c2304f28 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -9564,6 +9564,7 @@ virDomainFSDefParseXML(virDomainXMLOption *xmlopt,
     if (def->fsdriver =3D=3D VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS) {
         g_autofree char *queue_size =3D virXPathString("string(./driver/@q=
ueue)", ctxt);
         g_autofree char *binary =3D virXPathString("string(./binary/@path)=
", ctxt);
+        g_autofree char *caps =3D virXPathString("string(./binary/@caps)",=
 ctxt);
         g_autofree char *thread_pool_size =3D virXPathString("string(./bin=
ary/thread_pool/@size)", ctxt);
         g_autofree char *openfiles =3D virXPathString("string(./binary/ope=
nfiles/@max)", ctxt);
         xmlNodePtr binary_node =3D virXPathNode("./binary", ctxt);
@@ -9600,6 +9601,9 @@ virDomainFSDefParseXML(virDomainXMLOption *xmlopt,
         if (binary)
             def->binary =3D virFileSanitizePath(binary);
=20
+        if (caps)
+            def->caps =3D virBitmapParseUnlimitedAllowEmpty(caps);
+
         if (virXMLPropTristateSwitch(binary_node, "xattr",
                                      VIR_XML_PROP_NONE,
                                      &def->xattr) < 0)
@@ -25222,6 +25226,11 @@ virDomainFSDefFormat(virBuffer *buf,
         g_auto(virBuffer) lockAttrBuf =3D VIR_BUFFER_INITIALIZER;
         virBufferEscapeString(&binaryAttrBuf, " path=3D'%s'", def->binary);
=20
+        if (flags & VIR_DOMAIN_DEF_FORMAT_STATUS) {
+            g_autofree char *capsBitmap =3D virBitmapFormat(def->caps);
+            virBufferAsprintf(&binaryAttrBuf, " caps=3D'%s'", capsBitmap);
+        }
+
         if (def->xattr !=3D VIR_TRISTATE_SWITCH_ABSENT) {
             virBufferAsprintf(&binaryAttrBuf, " xattr=3D'%s'",
                               virTristateSwitchTypeToString(def->xattr));
diff --git a/tests/qemustatusxml2xmldata/virtiofs-in.xml b/tests/qemustatus=
xml2xmldata/virtiofs-in.xml
new file mode 100644
index 0000000000..eeb40428bf
--- /dev/null
+++ b/tests/qemustatusxml2xmldata/virtiofs-in.xml
@@ -0,0 +1,437 @@
+<domstatus state=3D'running' reason=3D'booted' pid=3D'195139'>
+  <taint flag=3D'high-privileges'/>
+  <monitor path=3D'/var/lib/libvirt/qemu/domain-1-upstream/monitor.sock' t=
ype=3D'unix'/>
+  <namespaces>
+    <mount/>
+  </namespaces>
+  <vcpus>
+    <vcpu id=3D'0' pid=3D'195156'/>
+    <vcpu id=3D'1' pid=3D'195157'/>
+  </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'/>
+    <flag name=3D'ich9-usb-ehci1'/>
+    <flag name=3D'vt82c686b-usb-uhci'/>
+    <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'/>
+    <flag name=3D'disable-s3'/>
+    <flag name=3D'disable-s4'/>
+    <flag name=3D'usb-redir.filter'/>
+    <flag name=3D'ide-drive.wwn'/>
+    <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'/>
+    <flag name=3D'cirrus-vga'/>
+    <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'/>
+    <flag name=3D'usb-storage'/>
+    <flag name=3D'usb-storage.removable'/>
+    <flag name=3D'virtio-mmio'/>
+    <flag name=3D'ich9-intel-hda'/>
+    <flag name=3D'kvm-pit-lost-tick-policy'/>
+    <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'/>
+    <flag name=3D'memory-backend-ram'/>
+    <flag name=3D'numa'/>
+    <flag name=3D'memory-backend-file'/>
+    <flag name=3D'usb-audio'/>
+    <flag name=3D'rtc-reset-reinjection'/>
+    <flag name=3D'splash-timeout'/>
+    <flag name=3D'iothread'/>
+    <flag name=3D'migrate-rdma'/>
+    <flag name=3D'ivshmem'/>
+    <flag name=3D'drive-iotune-max'/>
+    <flag name=3D'VGA.vgamem_mb'/>
+    <flag name=3D'vmware-svga.vgamem_mb'/>
+    <flag name=3D'qxl.vgamem_mb'/>
+    <flag name=3D'pc-dimm'/>
+    <flag name=3D'machine-vmport-opt'/>
+    <flag name=3D'aes-key-wrap'/>
+    <flag name=3D'dea-key-wrap'/>
+    <flag name=3D'pci-serial'/>
+    <flag name=3D'vhost-user-multiqueue'/>
+    <flag name=3D'migration-event'/>
+    <flag name=3D'ioh3420'/>
+    <flag name=3D'x3130-upstream'/>
+    <flag name=3D'xio3130-downstream'/>
+    <flag name=3D'rtl8139'/>
+    <flag name=3D'e1000'/>
+    <flag name=3D'virtio-net'/>
+    <flag name=3D'gic-version'/>
+    <flag name=3D'incoming-defer'/>
+    <flag name=3D'virtio-gpu'/>
+    <flag name=3D'virtio-gpu.virgl'/>
+    <flag name=3D'virtio-keyboard'/>
+    <flag name=3D'virtio-mouse'/>
+    <flag name=3D'virtio-tablet'/>
+    <flag name=3D'virtio-input-host'/>
+    <flag name=3D'chardev-file-append'/>
+    <flag name=3D'ich9-disable-s3'/>
+    <flag name=3D'ich9-disable-s4'/>
+    <flag name=3D'vserport-change-event'/>
+    <flag name=3D'virtio-balloon-pci.deflate-on-oom'/>
+    <flag name=3D'mptsas1068'/>
+    <flag name=3D'qxl.vram64_size_mb'/>
+    <flag name=3D'chardev-logfile'/>
+    <flag name=3D'debug-threads'/>
+    <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'/>
+    <flag name=3D'qxl.max_outputs'/>
+    <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'/>
+    <flag name=3D'query-hotpluggable-cpus'/>
+    <flag name=3D'virtio-net.rx_queue_size'/>
+    <flag name=3D'virtio-vga'/>
+    <flag name=3D'drive-iotune-max-length'/>
+    <flag name=3D'ivshmem-plain'/>
+    <flag name=3D'ivshmem-doorbell'/>
+    <flag name=3D'query-qmp-schema'/>
+    <flag name=3D'gluster.debug_level'/>
+    <flag name=3D'vhost-scsi'/>
+    <flag name=3D'drive-iotune-group'/>
+    <flag name=3D'query-cpu-model-expansion'/>
+    <flag name=3D'virtio-net.host_mtu'/>
+    <flag name=3D'nvdimm'/>
+    <flag name=3D'pcie-root-port'/>
+    <flag name=3D'query-cpu-definitions'/>
+    <flag name=3D'block-write-threshold'/>
+    <flag name=3D'query-named-block-nodes'/>
+    <flag name=3D'cpu-cache'/>
+    <flag name=3D'qemu-xhci'/>
+    <flag name=3D'kernel-irqchip'/>
+    <flag name=3D'kernel-irqchip.split'/>
+    <flag name=3D'intel-iommu.intremap'/>
+    <flag name=3D'intel-iommu.caching-mode'/>
+    <flag name=3D'intel-iommu.eim'/>
+    <flag name=3D'intel-iommu.device-iotlb'/>
+    <flag name=3D'virtio.iommu_platform'/>
+    <flag name=3D'virtio.ats'/>
+    <flag name=3D'loadparm'/>
+    <flag name=3D'vnc-multi-servers'/>
+    <flag name=3D'virtio-net.tx_queue_size'/>
+    <flag name=3D'chardev-reconnect'/>
+    <flag name=3D'virtio-gpu.max_outputs'/>
+    <flag name=3D'vxhs'/>
+    <flag name=3D'virtio-blk.num-queues'/>
+    <flag name=3D'vmcoreinfo'/>
+    <flag name=3D'numa.dist'/>
+    <flag name=3D'disk-share-rw'/>
+    <flag name=3D'iscsi.password-secret'/>
+    <flag name=3D'isa-serial'/>
+    <flag name=3D'dump-completed'/>
+    <flag name=3D'hda-output'/>
+    <flag name=3D'blockdev'/>
+    <flag name=3D'blockdev-hostdev-scsi'/>
+  </qemuCaps>
+  <devices>
+    <device alias=3D'rng0'/>
+    <device alias=3D'sound0-codec0'/>
+    <device alias=3D'virtio-disk1'/>
+    <device alias=3D'virtio-serial0'/>
+    <device alias=3D'video0'/>
+    <device alias=3D'serial0'/>
+    <device alias=3D'sound0'/>
+    <device alias=3D'balloon0'/>
+    <device alias=3D'channel1'/>
+    <device alias=3D'channel0'/>
+    <device alias=3D'net0'/>
+    <device alias=3D'input0'/>
+    <device alias=3D'redir0'/>
+    <device alias=3D'redir1'/>
+    <device alias=3D'scsi0'/>
+    <device alias=3D'usb'/>
+    <device alias=3D'ide0-0-0'/>
+  </devices>
+  <numad nodeset=3D'6' cpuset=3D'0-7'/>
+  <libDir path=3D'/var/lib/libvirt/qemu/domain-1-upstream'/>
+  <channelTargetDir path=3D'/var/lib/libvirt/qemu/channel/target/domain-1-=
upstream'/>
+  <memoryBackingDir path=3D'/var/lib/libvirt/qemu/ram/1-upstream'/>
+  <chardevStdioLogd/>
+  <nodename index=3D'123'/>
+  <fdset index=3D'321'/>
+  <blockjobs active=3D'no'/>
+  <agentTimeout>-2</agentTimeout>
+  <domain type=3D'kvm' id=3D'1'>
+    <name>upstream</name>
+    <uuid>dcf47dbd-46d1-4d5b-b442-262a806a333a</uuid>
+    <memory unit=3D'KiB'>1024000</memory>
+    <currentMemory unit=3D'KiB'>1024000</currentMemory>
+    <memoryBacking>
+      <access mode=3D'shared'/>
+    </memoryBacking>
+    <vcpu placement=3D'auto' current=3D'2'>8</vcpu>
+    <numatune>
+      <memory mode=3D'strict' placement=3D'auto'/>
+    </numatune>
+    <resource>
+      <partition>/machine</partition>
+    </resource>
+    <os>
+      <type arch=3D'x86_64' machine=3D'pc-i440fx-2.9'>hvm</type>
+      <boot dev=3D'hd'/>
+      <bootmenu enable=3D'yes'/>
+    </os>
+    <features>
+      <acpi/>
+      <apic/>
+      <vmport state=3D'off'/>
+    </features>
+    <cpu>
+      <numa>
+        <cell id=3D'0' cpus=3D'0,2,4,6' memory=3D'512000' unit=3D'KiB'/>
+        <cell id=3D'1' cpus=3D'1,3,5,7' memory=3D'512000' unit=3D'KiB'/>
+      </numa>
+    </cpu>
+    <clock offset=3D'utc'>
+      <timer name=3D'rtc' tickpolicy=3D'catchup'/>
+      <timer name=3D'pit' tickpolicy=3D'delay'/>
+      <timer name=3D'hpet' present=3D'no'/>
+    </clock>
+    <on_poweroff>destroy</on_poweroff>
+    <on_reboot>restart</on_reboot>
+    <on_crash>restart</on_crash>
+    <pm>
+      <suspend-to-mem enabled=3D'no'/>
+      <suspend-to-disk enabled=3D'no'/>
+    </pm>
+    <devices>
+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
+      <disk type=3D'file' device=3D'disk'>
+        <driver name=3D'qemu' type=3D'qcow2' discard=3D'unmap' detect_zero=
es=3D'on'/>
+        <source file=3D'/var/lib/libvirt/images/a.qcow2'/>
+        <target dev=3D'vdb' bus=3D'virtio'/>
+        <alias name=3D'virtio-disk1'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0b'=
 function=3D'0x0'/>
+      </disk>
+      <controller type=3D'usb' index=3D'0' model=3D'ich9-ehci1'>
+        <alias name=3D'usb'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06'=
 function=3D'0x7'/>
+      </controller>
+      <controller type=3D'usb' index=3D'0' model=3D'ich9-uhci1'>
+        <alias name=3D'usb'/>
+        <master startport=3D'0'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06'=
 function=3D'0x0' multifunction=3D'on'/>
+      </controller>
+      <controller type=3D'usb' index=3D'0' model=3D'ich9-uhci2'>
+        <alias name=3D'usb'/>
+        <master startport=3D'2'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06'=
 function=3D'0x1'/>
+      </controller>
+      <controller type=3D'usb' index=3D'0' model=3D'ich9-uhci3'>
+        <alias name=3D'usb'/>
+        <master startport=3D'4'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06'=
 function=3D'0x2'/>
+      </controller>
+      <controller type=3D'pci' index=3D'0' model=3D'pci-root'>
+        <alias name=3D'pci.0'/>
+      </controller>
+      <controller type=3D'virtio-serial' index=3D'0'>
+        <alias name=3D'virtio-serial0'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05'=
 function=3D'0x0'/>
+      </controller>
+      <controller type=3D'ide' index=3D'0'>
+        <alias name=3D'ide'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01'=
 function=3D'0x1'/>
+      </controller>
+      <controller type=3D'scsi' index=3D'0' model=3D'lsilogic'>
+        <alias name=3D'scsi0'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x09'=
 function=3D'0x0'/>
+      </controller>
+      <controller type=3D'fdc' index=3D'0'>
+        <alias name=3D'fdc0'/>
+      </controller>
+      <filesystem type=3D'mount' accessmode=3D'passthrough'>
+        <driver type=3D'virtiofs'/>
+        <binary path=3D'/usr/libexec/virtiofsd' caps=3D'0-1'/>
+        <source dir=3D'/tmp/fs'/>
+        <target dir=3D'mount_tag'/>
+        <alias name=3D'fs0'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0a'=
 function=3D'0x0'/>
+      </filesystem>
+      <interface type=3D'network'>
+        <mac address=3D'52:54:00:36:bd:3b'/>
+        <source network=3D'default'/>
+        <actual type=3D'network'>
+          <source bridge=3D'virbr0'/>
+        </actual>
+        <target dev=3D'vnet0'/>
+        <model type=3D'virtio'/>
+        <alias name=3D'net0'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03'=
 function=3D'0x0'/>
+      </interface>
+      <serial type=3D'pty'>
+        <source path=3D'/dev/pts/67'/>
+        <target type=3D'isa-serial' port=3D'0'>
+          <model name=3D'isa-serial'/>
+        </target>
+        <alias name=3D'serial0'/>
+      </serial>
+      <console type=3D'pty' tty=3D'/dev/pts/67'>
+        <source path=3D'/dev/pts/67'/>
+        <target type=3D'serial' port=3D'0'/>
+        <alias name=3D'serial0'/>
+      </console>
+      <channel type=3D'unix'>
+        <source mode=3D'bind' path=3D'/var/lib/libvirt/qemu/channel/target=
/domain-1-upstream/org.qemu.guest_agent.0'/>
+        <target type=3D'virtio' name=3D'org.qemu.guest_agent.0' state=3D'd=
isconnected'/>
+        <alias name=3D'channel0'/>
+        <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D=
'1'/>
+      </channel>
+      <channel type=3D'spicevmc'>
+        <target type=3D'virtio' name=3D'com.redhat.spice.0' state=3D'disco=
nnected'/>
+        <alias name=3D'channel1'/>
+        <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D=
'2'/>
+      </channel>
+      <input type=3D'tablet' bus=3D'usb'>
+        <alias name=3D'input0'/>
+        <address type=3D'usb' bus=3D'0' port=3D'1'/>
+      </input>
+      <input type=3D'mouse' bus=3D'ps2'>
+        <alias name=3D'input1'/>
+      </input>
+      <input type=3D'keyboard' bus=3D'ps2'>
+        <alias name=3D'input2'/>
+      </input>
+      <graphics type=3D'spice' port=3D'5900' autoport=3D'yes' listen=3D'12=
7.0.0.1'>
+        <listen type=3D'address' address=3D'127.0.0.1' fromConfig=3D'1' au=
toGenerated=3D'no'/>
+        <image compression=3D'off'/>
+      </graphics>
+      <sound model=3D'ich6'>
+        <alias name=3D'sound0'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04'=
 function=3D'0x0'/>
+      </sound>
+      <audio id=3D'1' type=3D'spice'/>
+      <video>
+        <model type=3D'qxl' ram=3D'65536' vram=3D'65536' vgamem=3D'16384' =
heads=3D'1' primary=3D'yes'/>
+        <alias name=3D'video0'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02'=
 function=3D'0x0'/>
+      </video>
+      <memballoon model=3D'virtio'>
+        <alias name=3D'balloon0'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x08'=
 function=3D'0x0'/>
+      </memballoon>
+      <rng model=3D'virtio'>
+        <backend model=3D'random'>/dev/random</backend>
+        <alias name=3D'rng0'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x07'=
 function=3D'0x0'/>
+      </rng>
+    </devices>
+    <seclabel type=3D'dynamic' model=3D'dac' relabel=3D'yes'>
+      <label>+0:+0</label>
+      <imagelabel>+0:+0</imagelabel>
+    </seclabel>
+  </domain>
+</domstatus>
diff --git a/tests/qemustatusxml2xmldata/virtiofs-out.xml b/tests/qemustatu=
sxml2xmldata/virtiofs-out.xml
new file mode 120000
index 0000000000..dc4b4e0f5f
--- /dev/null
+++ b/tests/qemustatusxml2xmldata/virtiofs-out.xml
@@ -0,0 +1 @@
+virtiofs-in.xml
\ No newline at end of file
diff --git a/tests/qemuxmlactivetest.c b/tests/qemuxmlactivetest.c
index c3609e9459..2c12b9a379 100644
--- a/tests/qemuxmlactivetest.c
+++ b/tests/qemuxmlactivetest.c
@@ -278,6 +278,8 @@ mymain(void)
=20
     DO_TEST_STATUS("qcow2-data-file");
=20
+    DO_TEST_STATUS("virtiofs");
+
     /* These test cases capture situation where the 'device' attribute of a
      * virtio video device is missing and thus needs to be inferred from t=
he
      * available capabilities when an upgraded libvirt is started */
--=20
2.56.0