From nobody Thu May 15 07:25:59 2025
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 1527684166066303.6440325315365;
 Wed, 30 May 2018 05:42:46 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com
 [10.5.11.26])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 320FA30A5DB7;
	Wed, 30 May 2018 12:42:42 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id E78D23083326;
	Wed, 30 May 2018 12:42:41 +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 575BD180BA87;
	Wed, 30 May 2018 12:42:41 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com
	[10.11.54.6])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id w4UCfs9F027513 for <libvir-list@listman.util.phx.redhat.com>;
	Wed, 30 May 2018 08:41:55 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 4DB27217B40A; Wed, 30 May 2018 12:41:54 +0000 (UTC)
Received: from angien.brq.redhat.com (unknown [10.43.2.136])
	by smtp.corp.redhat.com (Postfix) with ESMTP id AB819217B409
	for <libvir-list@redhat.com>; Wed, 30 May 2018 12:41:53 +0000 (UTC)
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Date: Wed, 30 May 2018 14:41:07 +0200
Message-Id: 
 <29b25043f8627ed6ac10536028fcad8142986932.1527683836.git.pkrempa@redhat.com>
In-Reply-To: <cover.1527683835.git.pkrempa@redhat.com>
References: <cover.1527683835.git.pkrempa@redhat.com>
In-Reply-To: <cover.1527683835.git.pkrempa@redhat.com>
References: <cover.1527683835.git.pkrempa@redhat.com>
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 11/38] tests: qemustatusxml2xml: Add test data for
	re-generating LUKS/auth aliases
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>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.26
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]);
 Wed, 30 May 2018 12:42:44 +0000 (UTC)
X-ZohoMail: RSF_0  Z_629925259 SPT_0
Content-Type: text/plain; charset="utf-8"

Add tests for upcomming re-generation of aliases for the secret objects
used by qemu when upgrading libvirt.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=EF=BF=BDn Tomko <jtomko@redhat.com>
---
 .../disk-secinfo-upgrade-in.xml                    | 507 +++++++++++++++++=
++++
 .../disk-secinfo-upgrade-out.xml                   | 507 +++++++++++++++++=
++++
 tests/qemuxml2xmltest.c                            |   1 +
 3 files changed, 1015 insertions(+)
 create mode 100644 tests/qemustatusxml2xmldata/disk-secinfo-upgrade-in.xml
 create mode 100644 tests/qemustatusxml2xmldata/disk-secinfo-upgrade-out.xml

diff --git a/tests/qemustatusxml2xmldata/disk-secinfo-upgrade-in.xml b/test=
s/qemustatusxml2xmldata/disk-secinfo-upgrade-in.xml
new file mode 100644
index 0000000000..d364fc7644
--- /dev/null
+++ b/tests/qemustatusxml2xmldata/disk-secinfo-upgrade-in.xml
@@ -0,0 +1,507 @@
+<domstatus state=3D'running' reason=3D'booted' pid=3D'195139'>
+  <monitor path=3D'/var/lib/libvirt/qemu/domain-1-upstream/monitor.sock' j=
son=3D'1' type=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'/>
+  </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'/>
+  <chardevStdioLogd/>
+  <allowReboot value=3D'yes'/>
+  <blockjobs active=3D'no'/>
+  <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'/>
+        <source file=3D'/var/lib/libvirt/images/a.qcow2'/>
+        <backingStore/>
+        <target dev=3D'vda' bus=3D'virtio'/>
+        <alias name=3D'virtio-disk0'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0a'=
 function=3D'0x0'/>
+      </disk>
+      <disk type=3D'file' device=3D'disk'>
+        <driver name=3D'qemu' type=3D'qcow2'/>
+        <source file=3D'/var/lib/libvirt/images/b.qcow2'>
+          <encryption format=3D'luks'>
+            <secret type=3D'passphrase' uuid=3D'0a81f5b2-8403-7b23-c8d6-21=
ccc2f80d6f'/>
+          </encryption>
+        </source>
+        <backingStore/>
+        <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>
+      <disk type=3D'file' device=3D'disk'>
+        <driver name=3D'qemu' type=3D'qcow2'/>
+        <source file=3D'/var/lib/libvirt/images/c.qcow2'>
+          <encryption format=3D'luks'>
+            <secret type=3D'passphrase' uuid=3D'0a81f5b2-8403-7b23-c8d6-21=
ccc2f80d6f'/>
+          </encryption>
+          <privateData>
+            <objects>
+              <secret type=3D'encryption' alias=3D'c-test-encrypt-alias'/>
+            </objects>
+          </privateData>
+        </source>
+        <backingStore/>
+        <target dev=3D'vdc' bus=3D'virtio'/>
+        <alias name=3D'virtio-disk2'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0c'=
 function=3D'0x0'/>
+      </disk>
+      <disk type=3D'network' device=3D'disk'>
+        <driver name=3D'qemu' type=3D'raw'/>
+        <source protocol=3D'iscsi' name=3D'iqn.2016-09.com.example:iscsita=
rget/1' tlsFromConfig=3D'0'>
+          <host name=3D'example.org' port=3D'3260'/>
+          <auth username=3D'testuser-iscsi'>
+            <secret type=3D'iscsi' usage=3D'testuser-iscsi-secret'/>
+          </auth>
+          <encryption format=3D'luks'>
+            <secret type=3D'passphrase' uuid=3D'0a81f5b2-8403-7b23-c8d6-21=
ccc2f80d6f'/>
+          </encryption>
+        </source>
+        <backingStore/>
+        <target dev=3D'vdd' bus=3D'virtio'/>
+        <alias name=3D'virtio-disk3'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0d'=
 function=3D'0x0'/>
+      </disk>
+      <disk type=3D'network' device=3D'disk'>
+        <driver name=3D'qemu' type=3D'raw'/>
+        <source protocol=3D'iscsi' name=3D'iqn.2016-09.com.example:iscsita=
rget/2' tlsFromConfig=3D'0'>
+          <host name=3D'example.org' port=3D'3260'/>
+          <auth username=3D'testuser-iscsi'>
+            <secret type=3D'iscsi' usage=3D'testuser-iscsi-secret'/>
+          </auth>
+          <privateData>
+            <objects>
+              <secret type=3D'auth' alias=3D'e-test-auth-alias'/>
+            </objects>
+          </privateData>
+        </source>
+        <backingStore/>
+        <target dev=3D'vde' bus=3D'virtio'/>
+        <alias name=3D'virtio-disk4'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0e'=
 function=3D'0x0'/>
+      </disk>
+      <disk type=3D'network' device=3D'disk'>
+        <driver name=3D'qemu' type=3D'raw'/>
+        <source protocol=3D'rbd' name=3D'rbdpool/rbdimg' tlsFromConfig=3D'=
0'>
+          <host name=3D'example.org'/>
+          <auth username=3D'testuser-rbd'>
+            <secret type=3D'ceph' usage=3D'testuser-rbd-secret'/>
+          </auth>
+        </source>
+        <backingStore/>
+        <target dev=3D'vdf' bus=3D'virtio'/>
+        <alias name=3D'virtio-disk5'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0f'=
 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>
+      <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>
+      <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>
+      <redirdev bus=3D'usb' type=3D'spicevmc'>
+        <alias name=3D'redir0'/>
+        <address type=3D'usb' bus=3D'0' port=3D'2'/>
+      </redirdev>
+      <redirdev bus=3D'usb' type=3D'spicevmc'>
+        <alias name=3D'redir1'/>
+        <address type=3D'usb' bus=3D'0' port=3D'3'/>
+      </redirdev>
+      <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/disk-secinfo-upgrade-out.xml b/tes=
ts/qemustatusxml2xmldata/disk-secinfo-upgrade-out.xml
new file mode 100644
index 0000000000..d364fc7644
--- /dev/null
+++ b/tests/qemustatusxml2xmldata/disk-secinfo-upgrade-out.xml
@@ -0,0 +1,507 @@
+<domstatus state=3D'running' reason=3D'booted' pid=3D'195139'>
+  <monitor path=3D'/var/lib/libvirt/qemu/domain-1-upstream/monitor.sock' j=
son=3D'1' type=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'/>
+  </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'/>
+  <chardevStdioLogd/>
+  <allowReboot value=3D'yes'/>
+  <blockjobs active=3D'no'/>
+  <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'/>
+        <source file=3D'/var/lib/libvirt/images/a.qcow2'/>
+        <backingStore/>
+        <target dev=3D'vda' bus=3D'virtio'/>
+        <alias name=3D'virtio-disk0'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0a'=
 function=3D'0x0'/>
+      </disk>
+      <disk type=3D'file' device=3D'disk'>
+        <driver name=3D'qemu' type=3D'qcow2'/>
+        <source file=3D'/var/lib/libvirt/images/b.qcow2'>
+          <encryption format=3D'luks'>
+            <secret type=3D'passphrase' uuid=3D'0a81f5b2-8403-7b23-c8d6-21=
ccc2f80d6f'/>
+          </encryption>
+        </source>
+        <backingStore/>
+        <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>
+      <disk type=3D'file' device=3D'disk'>
+        <driver name=3D'qemu' type=3D'qcow2'/>
+        <source file=3D'/var/lib/libvirt/images/c.qcow2'>
+          <encryption format=3D'luks'>
+            <secret type=3D'passphrase' uuid=3D'0a81f5b2-8403-7b23-c8d6-21=
ccc2f80d6f'/>
+          </encryption>
+          <privateData>
+            <objects>
+              <secret type=3D'encryption' alias=3D'c-test-encrypt-alias'/>
+            </objects>
+          </privateData>
+        </source>
+        <backingStore/>
+        <target dev=3D'vdc' bus=3D'virtio'/>
+        <alias name=3D'virtio-disk2'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0c'=
 function=3D'0x0'/>
+      </disk>
+      <disk type=3D'network' device=3D'disk'>
+        <driver name=3D'qemu' type=3D'raw'/>
+        <source protocol=3D'iscsi' name=3D'iqn.2016-09.com.example:iscsita=
rget/1' tlsFromConfig=3D'0'>
+          <host name=3D'example.org' port=3D'3260'/>
+          <auth username=3D'testuser-iscsi'>
+            <secret type=3D'iscsi' usage=3D'testuser-iscsi-secret'/>
+          </auth>
+          <encryption format=3D'luks'>
+            <secret type=3D'passphrase' uuid=3D'0a81f5b2-8403-7b23-c8d6-21=
ccc2f80d6f'/>
+          </encryption>
+        </source>
+        <backingStore/>
+        <target dev=3D'vdd' bus=3D'virtio'/>
+        <alias name=3D'virtio-disk3'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0d'=
 function=3D'0x0'/>
+      </disk>
+      <disk type=3D'network' device=3D'disk'>
+        <driver name=3D'qemu' type=3D'raw'/>
+        <source protocol=3D'iscsi' name=3D'iqn.2016-09.com.example:iscsita=
rget/2' tlsFromConfig=3D'0'>
+          <host name=3D'example.org' port=3D'3260'/>
+          <auth username=3D'testuser-iscsi'>
+            <secret type=3D'iscsi' usage=3D'testuser-iscsi-secret'/>
+          </auth>
+          <privateData>
+            <objects>
+              <secret type=3D'auth' alias=3D'e-test-auth-alias'/>
+            </objects>
+          </privateData>
+        </source>
+        <backingStore/>
+        <target dev=3D'vde' bus=3D'virtio'/>
+        <alias name=3D'virtio-disk4'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0e'=
 function=3D'0x0'/>
+      </disk>
+      <disk type=3D'network' device=3D'disk'>
+        <driver name=3D'qemu' type=3D'raw'/>
+        <source protocol=3D'rbd' name=3D'rbdpool/rbdimg' tlsFromConfig=3D'=
0'>
+          <host name=3D'example.org'/>
+          <auth username=3D'testuser-rbd'>
+            <secret type=3D'ceph' usage=3D'testuser-rbd-secret'/>
+          </auth>
+        </source>
+        <backingStore/>
+        <target dev=3D'vdf' bus=3D'virtio'/>
+        <alias name=3D'virtio-disk5'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0f'=
 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>
+      <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>
+      <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>
+      <redirdev bus=3D'usb' type=3D'spicevmc'>
+        <alias name=3D'redir0'/>
+        <address type=3D'usb' bus=3D'0' port=3D'2'/>
+      </redirdev>
+      <redirdev bus=3D'usb' type=3D'spicevmc'>
+        <alias name=3D'redir1'/>
+        <address type=3D'usb' bus=3D'0' port=3D'3'/>
+      </redirdev>
+      <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/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 5671114de0..1c08724c25 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1211,6 +1211,7 @@ mymain(void)
     DO_TEST_STATUS("migration-in-params");
     DO_TEST_STATUS("migration-out-params");
     DO_TEST_STATUS("migration-out-nbd-tls");
+    DO_TEST_STATUS("disk-secinfo-upgrade");

     DO_TEST("vhost-vsock", NONE);
     DO_TEST("vhost-vsock-auto", NONE);
--=20
2.16.2

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