From nobody Wed Jan 15 09:29:05 2025
Delivered-To: importer@patchew.org
Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied
 by domain of lists.libvirt.org) client-ip=8.43.85.245;
 envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org;
Authentication-Results: mx.zohomail.com;
	spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain
 of lists.libvirt.org)  smtp.mailfrom=devel-bounces@lists.libvirt.org;
	dmarc=fail(p=none dis=none)  header.from=redhat.com
Return-Path: <devel-bounces@lists.libvirt.org>
Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by
 mx.zohomail.com
	with SMTPS id 170473222817055.736696964460066;
 Mon, 8 Jan 2024 08:43:48 -0800 (PST)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id 5E3E61A9C; Mon,  8 Jan 2024 11:43:46 -0500 (EST)
Received: from lists.libvirt.org (localhost [IPv6:::1])
	by lists.libvirt.org (Postfix) with ESMTP id 3EF311A09;
	Mon,  8 Jan 2024 11:08:05 -0500 (EST)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id 913B31A4B; Mon,  8 Jan 2024 11:07:02 -0500 (EST)
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.133.124])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by lists.libvirt.org (Postfix) with ESMTPS id EC9CD19B6
	for <devel@lists.libvirt.org>; Mon,  8 Jan 2024 11:06:22 -0500 (EST)
Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73])
 by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,
 cipher=TLS_AES_256_GCM_SHA384) id us-mta-80-9SWog7D5MaGiGxkbsxBuaw-1; Mon,
 08 Jan 2024 11:06:18 -0500
Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com
 [10.11.54.8])
	(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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id B8C563C100AB
	for <devel@lists.libvirt.org>; Mon,  8 Jan 2024 16:06:17 +0000 (UTC)
Received: from speedmetal.lan (unknown [10.45.242.9])
	by smtp.corp.redhat.com (Postfix) with ESMTP id C45AFC15968
	for <devel@lists.libvirt.org>; Mon,  8 Jan 2024 16:06:15 +0000 (UTC)
X-MC-Unique: 9SWog7D5MaGiGxkbsxBuaw-1
From: Peter Krempa <pkrempa@redhat.com>
To: devel@lists.libvirt.org
Subject: [PATCH 21/23] qemuxml2argvtest: Populate all outstanding def->xml
 cases
Date: Mon,  8 Jan 2024 17:05:51 +0100
Message-ID: 
 <e25768cbd99ffebf954c435512a8ef4a68d699f3.1704729291.git.pkrempa@redhat.com>
In-Reply-To: <cover.1704729291.git.pkrempa@redhat.com>
References: <cover.1704729291.git.pkrempa@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Message-ID-Hash: UFR7PNZQH5RYBW6LDKHGAVX4QZV2DLRJ
X-Message-ID-Hash: UFR7PNZQH5RYBW6LDKHGAVX4QZV2DLRJ
X-MailFrom: pkrempa@redhat.com
X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency;
 loop; banned-address; member-moderation; header-match-config-1;
 header-match-config-2; header-match-config-3;
 header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia;
 implicit-dest; max-recipients; max-size; news-moderation; no-subject;
 suspicious-header
X-Mailman-Version: 3.2.2
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/UFR7PNZQH5RYBW6LDKHGAVX4QZV2DLRJ/>
List-Archive: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/>
List-Help: <mailto:devel-request@lists.libvirt.org?subject=help>
List-Post: <mailto:devel@lists.libvirt.org>
List-Subscribe: <mailto:devel-join@lists.libvirt.org>
List-Unsubscribe: <mailto:devel-leave@lists.libvirt.org>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
X-ZM-MESSAGEID: 1704732230199100001

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 tests/qemuxml2argvtest.c                      |   4 -
 ...aarch64-cpu-passthrough.aarch64-latest.xml |  42 +++++
 .../aarch64-features-wrong.aarch64-latest.xml |  28 ++++
 .../aarch64-gic-default.aarch64-4.2.0.xml     |  26 +++
 .../aarch64-gic-none.aarch64-4.2.0.xml        |  26 +++
 .../aarch64-kvm-32-on-64.aarch64-latest.xml   |  64 +++++++
 ...arch64-virt-default-nic.aarch64-latest.xml |  44 +++++
 ...arch64-virt-virtio-MMIO.aarch64.latest.xml |  63 +++++++
 .../aarch64-virt-virtio.aarch64-4.2.0.xml     |  94 +++++++++++
 .../aarch64-virt-virtio.aarch64-latest.xml    |  94 +++++++++++
 ...rch64-virtio-pci-default.aarch64-4.2.0.xml |  94 +++++++++++
 .../arm-vexpressa9-basic.aarch64-latest.xml   |  46 +++++
 .../arm-vexpressa9-nodevs.aarch64-latest.xml  |  31 ++++
 .../arm-vexpressa9-virtio.aarch64-latest.xml  |  61 +++++++
 .../arm-virt-virtio.aarch64-latest.xml        |  95 +++++++++++
 .../audio-default-sdl.x86_64-4.2.0.xml        |  44 +++++
 .../audio-default-spice.x86_64-4.2.0.xml      |  46 +++++
 .../audio-default-vnc.x86_64-4.2.0.xml        |  46 +++++
 .../audio-jack-minimal.x86_64-latest.xml      |  39 +++++
 .../balloon-ccw-deflate.s390x-latest.xml      |  27 +++
 ...lloon-device-deflate-off.x86_64-latest.xml |  40 +++++
 .../balloon-device-deflate.x86_64-latest.xml  |  40 +++++
 .../balloon-device.x86_64-latest.xml          |  40 +++++
 .../balloon-mmio-deflate.aarch64-latest.xml   |  34 ++++
 .../boot-complex.x86_64-latest.xml            |  89 ++++++++++
 .../boot-menu-disable-drive.x86_64-latest.xml |  42 +++++
 .../boot-menu-enable.x86_64-latest.xml        |  42 +++++
 .../channel-spicevmc.x86_64-latest.xml        |  55 ++++++
 .../channel-unix-guestfwd.x86_64-latest.xml   |  42 +++++
 .../channel-virtio-autoadd.x86_64-latest.xml  |  70 ++++++++
 ...hannel-virtio-autoassign.x86_64-latest.xml |  70 ++++++++
 .../channel-virtio-default.x86_64-latest.xml  |  61 +++++++
 .../channel-virtio-unix.x86_64-latest.xml     |  60 +++++++
 .../chardev-reconnect.x86_64-latest.xml       |  72 ++++++++
 .../clock-france.x86_64-latest.xml            |  40 +++++
 .../clock-hpet-off.x86_64-7.2.0.xml           |  44 +++++
 .../clock-hpet-off.x86_64-latest.xml          |  44 +++++
 ...ocaltime-basis-localtime.x86_64-latest.xml |  40 +++++
 .../clock-variable.x86_64-latest.xml          |  40 +++++
 .../console-compat-chardev.x86_64-latest.xml  |  48 ++++++
 .../console-sclp.s390x-latest.xml             |  36 ++++
 .../console-virtio-ccw.s390x-latest.xml       |  39 +++++
 .../console-virtio-unix.x86_64-latest.xml     |  45 +++++
 .../controller-order.x86_64-latest.xml        |  98 +++++++++++
 .../cpu-Haswell-noTSX.x86_64-latest.xml       |  31 ++++
 .../cpu-Haswell.x86_64-latest.xml             |  31 ++++
 .../cpu-Haswell2.x86_64-latest.xml            |  33 ++++
 .../cpu-Haswell3.x86_64-latest.xml            |  33 ++++
 .../cpu-cache-disable.x86_64-latest.xml       |  31 ++++
 .../cpu-cache-disable3.x86_64-latest.xml      |  31 ++++
 .../cpu-cache-emulate-l3.x86_64-latest.xml    |  31 ++++
 .../cpu-cache-passthrough.x86_64-latest.xml   |  31 ++++
 .../cpu-exact1.x86_64-latest.xml              |  38 +++++
 .../cpu-exact2-nofallback.x86_64-latest.xml   |  45 +++++
 .../cpu-exact2.x86_64-latest.xml              |  45 +++++
 .../cpu-fallback.x86_64-5.2.0.xml             |  40 +++++
 .../cpu-fallback.x86_64-8.0.0.xml             |  40 +++++
 .../cpu-host-model-cmt.x86_64-latest.xml      |  29 ++++
 ...u-host-model-fallback-kvm.x86_64-4.2.0.xml |  29 ++++
 ...u-host-model-fallback-kvm.x86_64-5.0.0.xml |  29 ++++
 ...u-host-model-fallback-kvm.x86_64-5.1.0.xml |  29 ++++
 ...u-host-model-fallback-kvm.x86_64-5.2.0.xml |  29 ++++
 ...u-host-model-fallback-kvm.x86_64-6.0.0.xml |  29 ++++
 ...u-host-model-fallback-kvm.x86_64-6.1.0.xml |  29 ++++
 ...u-host-model-fallback-kvm.x86_64-6.2.0.xml |  29 ++++
 ...u-host-model-fallback-kvm.x86_64-7.0.0.xml |  29 ++++
 ...u-host-model-fallback-kvm.x86_64-7.1.0.xml |  29 ++++
 ...u-host-model-fallback-kvm.x86_64-7.2.0.xml |  29 ++++
 ...u-host-model-fallback-kvm.x86_64-8.0.0.xml |  29 ++++
 ...u-host-model-fallback-kvm.x86_64-8.1.0.xml |  29 ++++
 ...-host-model-fallback-kvm.x86_64-latest.xml |  29 ++++
 ...u-host-model-fallback-tcg.x86_64-4.2.0.xml |  29 ++++
 ...u-host-model-fallback-tcg.x86_64-5.0.0.xml |  29 ++++
 ...u-host-model-fallback-tcg.x86_64-5.1.0.xml |  29 ++++
 ...u-host-model-fallback-tcg.x86_64-5.2.0.xml |  29 ++++
 ...u-host-model-fallback-tcg.x86_64-6.0.0.xml |  29 ++++
 ...u-host-model-fallback-tcg.x86_64-6.1.0.xml |  29 ++++
 ...u-host-model-fallback-tcg.x86_64-6.2.0.xml |  29 ++++
 ...u-host-model-fallback-tcg.x86_64-7.0.0.xml |  29 ++++
 ...u-host-model-fallback-tcg.x86_64-7.1.0.xml |  29 ++++
 ...u-host-model-fallback-tcg.x86_64-7.2.0.xml |  29 ++++
 ...u-host-model-fallback-tcg.x86_64-8.0.0.xml |  29 ++++
 ...u-host-model-fallback-tcg.x86_64-8.1.0.xml |  29 ++++
 ...-host-model-fallback-tcg.x86_64-latest.xml |  29 ++++
 .../cpu-host-model-kvm.x86_64-4.2.0.xml       |  48 ++++++
 .../cpu-host-model-kvm.x86_64-5.0.0.xml       |  48 ++++++
 .../cpu-host-model-kvm.x86_64-5.1.0.xml       |  48 ++++++
 .../cpu-host-model-kvm.x86_64-5.2.0.xml       |  48 ++++++
 .../cpu-host-model-kvm.x86_64-6.0.0.xml       |  48 ++++++
 .../cpu-host-model-kvm.x86_64-6.1.0.xml       |  48 ++++++
 .../cpu-host-model-kvm.x86_64-6.2.0.xml       |  48 ++++++
 .../cpu-host-model-kvm.x86_64-7.0.0.xml       |  48 ++++++
 .../cpu-host-model-kvm.x86_64-7.1.0.xml       |  48 ++++++
 .../cpu-host-model-kvm.x86_64-7.2.0.xml       |  48 ++++++
 .../cpu-host-model-kvm.x86_64-8.0.0.xml       |  48 ++++++
 .../cpu-host-model-kvm.x86_64-8.1.0.xml       |  48 ++++++
 .../cpu-host-model-kvm.x86_64-latest.xml      |  48 ++++++
 ...host-model-nofallback-kvm.x86_64-4.2.0.xml |  29 ++++
 ...host-model-nofallback-kvm.x86_64-5.0.0.xml |  29 ++++
 ...host-model-nofallback-kvm.x86_64-5.1.0.xml |  29 ++++
 ...host-model-nofallback-kvm.x86_64-5.2.0.xml |  29 ++++
 ...host-model-nofallback-kvm.x86_64-6.0.0.xml |  29 ++++
 ...host-model-nofallback-kvm.x86_64-6.1.0.xml |  29 ++++
 ...host-model-nofallback-kvm.x86_64-6.2.0.xml |  29 ++++
 ...host-model-nofallback-kvm.x86_64-7.0.0.xml |  29 ++++
 ...host-model-nofallback-kvm.x86_64-7.1.0.xml |  29 ++++
 ...host-model-nofallback-kvm.x86_64-7.2.0.xml |  29 ++++
 ...host-model-nofallback-kvm.x86_64-8.0.0.xml |  29 ++++
 ...host-model-nofallback-kvm.x86_64-8.1.0.xml |  29 ++++
 ...ost-model-nofallback-kvm.x86_64-latest.xml |  29 ++++
 ...host-model-nofallback-tcg.x86_64-4.2.0.xml |  29 ++++
 ...host-model-nofallback-tcg.x86_64-5.0.0.xml |  29 ++++
 ...host-model-nofallback-tcg.x86_64-5.1.0.xml |  29 ++++
 ...host-model-nofallback-tcg.x86_64-5.2.0.xml |  29 ++++
 ...host-model-nofallback-tcg.x86_64-6.0.0.xml |  29 ++++
 ...host-model-nofallback-tcg.x86_64-6.1.0.xml |  29 ++++
 ...host-model-nofallback-tcg.x86_64-6.2.0.xml |  29 ++++
 ...host-model-nofallback-tcg.x86_64-7.0.0.xml |  29 ++++
 ...host-model-nofallback-tcg.x86_64-7.1.0.xml |  29 ++++
 ...host-model-nofallback-tcg.x86_64-7.2.0.xml |  29 ++++
 ...host-model-nofallback-tcg.x86_64-8.0.0.xml |  29 ++++
 ...host-model-nofallback-tcg.x86_64-8.1.0.xml |  29 ++++
 ...ost-model-nofallback-tcg.x86_64-latest.xml |  29 ++++
 .../cpu-host-model-tcg.x86_64-4.2.0.xml       |  48 ++++++
 .../cpu-host-model-tcg.x86_64-5.0.0.xml       |  48 ++++++
 .../cpu-host-model-tcg.x86_64-5.1.0.xml       |  48 ++++++
 .../cpu-host-model-tcg.x86_64-5.2.0.xml       |  48 ++++++
 .../cpu-host-model-tcg.x86_64-6.0.0.xml       |  48 ++++++
 .../cpu-host-model-tcg.x86_64-6.1.0.xml       |  48 ++++++
 .../cpu-host-model-tcg.x86_64-6.2.0.xml       |  48 ++++++
 .../cpu-host-model-tcg.x86_64-7.0.0.xml       |  48 ++++++
 .../cpu-host-model-tcg.x86_64-7.1.0.xml       |  48 ++++++
 .../cpu-host-model-tcg.x86_64-7.2.0.xml       |  48 ++++++
 .../cpu-host-model-tcg.x86_64-8.0.0.xml       |  48 ++++++
 .../cpu-host-model-tcg.x86_64-8.1.0.xml       |  48 ++++++
 .../cpu-host-model-tcg.x86_64-latest.xml      |  48 ++++++
 .../cpu-host-passthrough.x86_64-latest.xml    |  29 ++++
 .../cpu-hotplug-startup.x86_64-latest.xml     |  40 +++++
 .../cpu-minimum1.x86_64-latest.xml            |  31 ++++
 .../cpu-minimum2.x86_64-latest.xml            |  35 ++++
 .../cpu-no-removed-features.x86_64-latest.xml |  33 ++++
 .../cpu-nofallback.x86_64-5.2.0.xml           |  40 +++++
 .../cpu-nofallback.x86_64-8.0.0.xml           |  40 +++++
 .../cpu-phys-bits-emulate.x86_64-latest.xml   |  31 ++++
 .../cpu-phys-bits-emulate2.x86_64-latest.xml  |  31 ++++
 ...pu-phys-bits-passthrough.x86_64-latest.xml |  31 ++++
 ...pu-qemu-host-passthrough.x86_64-latest.xml |  29 ++++
 .../cpu-s390-features.s390x-latest.xml        |  27 +++
 .../cpu-s390-zEC12.s390x-latest.xml           |  25 +++
 .../cpu-strict1.x86_64-latest.xml             |  58 +++++++
 .../cpu-topology1.x86_64-latest.xml           |  32 ++++
 .../cpu-topology2.x86_64-latest.xml           |  32 ++++
 .../cpu-topology3.x86_64-latest.xml           |  32 ++++
 .../cpu-topology4.x86_64-latest.xml           |  32 ++++
 .../cpu-translation.x86_64-latest.xml         |  44 +++++
 .../cpu-tsc-frequency.x86_64-latest.xml       |  41 +++++
 ...isk-cdrom-network-nbdkit.x86_64-latest.xml |  72 ++++++++
 .../disk-cdrom-tray.x86_64-latest.xml         |  56 +++++++
 .../disk-device-removable.x86_64-latest.xml   |  54 ++++++
 .../disk-error-policy-s390x.s390x-latest.xml  |  43 +++++
 .../disk-floppy-pseries.ppc64-latest.xml      |  44 +++++
 .../disk-floppy-q35.x86_64-latest.xml         |  56 +++++++
 .../disk-floppy-tray.x86_64-latest.xml        |  53 ++++++
 .../disk-geometry.x86_64-latest.xml           |  41 +++++
 .../disk-ide-split.x86_64-latest.xml          |  47 ++++++
 .../disk-ide-wwn.x86_64-latest.xml            |  42 +++++
 .../disk-ioeventfd.x86_64-latest.xml          |  58 +++++++
 ...disk-network-http-nbdkit.x86_64-latest.xml |  72 ++++++++
 ...isk-network-rbd-no-colon.x86_64-latest.xml |  50 ++++++
 .../disk-network-sheepdog.x86_64-6.0.0.xml    |  46 +++++
 ...urce-curl-nbdkit-backing.x86_64-latest.xml |  52 ++++++
 ...twork-source-curl-nbdkit.x86_64-latest.xml |  96 +++++++++++
 ...disk-network-source-curl.x86_64-latest.xml |  96 +++++++++++
 .../disk-network-ssh-key.x86_64-latest.xml    |  49 ++++++
 .../disk-network-ssh-nbdkit.x86_64-latest.xml |  38 +++++
 ...isk-network-ssh-password.x86_64-latest.xml |  41 +++++
 .../disk-network-ssh.x86_64-latest.xml        |  38 +++++
 .../disk-network-tlsx509-nbd.x86_64-5.2.0.xml |  37 ++++
 .../disk-no-boot.x86_64-latest.xml            |  54 ++++++
 .../disk-order.x86_64-latest.xml              |  59 +++++++
 .../disk-readonly-disk.x86_64-latest.xml      |  47 ++++++
 .../disk-scsi-disk-split.x86_64-latest.xml    |  69 ++++++++
 .../disk-scsi-disk-wwn.x86_64-latest.xml      |  53 ++++++
 ...isk-scsi-lun-passthrough.x86_64-latest.xml |  49 ++++++
 .../disk-shared.x86_64-latest.xml             |  66 ++++++++
 .../disk-snapshot.x86_64-latest.xml           |  53 ++++++
 .../disk-vhostuser-numa.x86_64-4.2.0.xml      |  48 ++++++
 .../disk-vhostuser-numa.x86_64-latest.xml     |  48 ++++++
 .../disk-vhostvdpa.x86_64-latest.xml          |  40 +++++
 .../disk-virtio-ccw-many.s390x-latest.xml     |  51 ++++++
 .../disk-virtio-ccw.s390x-latest.xml          |  39 +++++
 ...-virtio-scsi-reservations.x86_64-5.2.0.xml |  53 ++++++
 .../fips-enabled.x86_64-5.1.0.xml             |  40 +++++
 .../fips-enabled.x86_64-latest.xml            |  40 +++++
 .../fs9p-ccw.s390x-latest.xml                 |  50 ++++++
 .../qemuxml2xmloutdata/fs9p.x86_64-latest.xml |  44 +++++
 .../graphics-dbus-usbredir.x86_64-latest.xml  |  42 +++++
 .../graphics-egl-headless.x86_64-latest.xml   |  42 +++++
 ...cs-spice-agent-file-xfer.x86_64-latest.xml |  48 ++++++
 ...raphics-spice-agentmouse.x86_64-latest.xml |  50 ++++++
 ...spice-gl-auto-rendernode.x86_64-latest.xml |  39 +++++
 .../graphics-spice-no-args.x86_64-latest.xml  |  38 +++++
 .../graphics-spice-sasl.x86_64-latest.xml     |  41 +++++
 ...graphics-spice-usb-redir.x86_64-latest.xml |  66 ++++++++
 .../graphics-vnc-none.x86_64-latest.xml       |  39 +++++
 .../graphics-vnc-policy.x86_64-latest.xml     |  45 +++++
 .../graphics-vnc-power.x86_64-latest.xml      |  45 +++++
 ...s-vnc-socket-new-cmdline.x86_64-latest.xml |  36 ++++
 .../graphics-vnc-tls-secret.x86_64-5.2.0.xml  |  39 +++++
 .../graphics-vnc-tls-secret.x86_64-latest.xml |  39 +++++
 ...splay-spice-egl-headless.x86_64-latest.xml |  46 +++++
 ...dev-display-spice-opengl.x86_64-latest.xml |  46 +++++
 ...display-vnc-egl-headless.x86_64-latest.xml |  46 +++++
 ...hostdev-mdev-display-vnc.x86_64-latest.xml |  45 +++++
 ...stdev-pci-address-device.x86_64-latest.xml |  46 +++++
 ...tdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.xml |  45 +++++
 ...-usb-address-device-boot.x86_64-latest.xml |  45 +++++
 ...stdev-usb-address-device.x86_64-latest.xml |  45 +++++
 ...hostdev-vfio-multidomain.x86_64-latest.xml |  46 +++++
 .../hotplug-base.x86_64-latest.xml            |  44 +++++
 .../hugepages-default-5M.x86_64-latest.xml    |  41 +++++
 .../hugepages-numa-default.x86_64-latest.xml  |  35 ++++
 .../hyperv-passthrough.x86_64-6.1.0.xml       |  34 ++++
 .../input-usbmouse-addr.x86_64-latest.xml     |  43 +++++
 .../iothreads-disk-virtio-ccw.s390x-4.2.0.xml |  41 +++++
 ...iothreads-virtio-scsi-pci.x86_64-5.2.0.xml |  49 ++++++
 .../kvm-pit-delay.x86_64-latest.xml           |  42 +++++
 .../kvm-pit-discard.x86_64-latest.xml         |  42 +++++
 .../kvmclock+eoi-disabled.x86_64-latest.xml   |  38 +++++
 .../launch-security-s390-pv.s390x-latest.xml  |  32 ++++
 ...unch-security-sev-direct.x86_64-latest.xml |  48 ++++++
 ...sev-missing-platform-info.x86_64-6.0.0.xml |  43 +++++
 .../launch-security-sev.x86_64-6.0.0.xml      |  45 +++++
 .../luks-disks-source-qcow2.x86_64-5.2.0.xml  | 107 ++++++++++++
 ...achine-aeskeywrap-off-cap.s390x-latest.xml |  34 ++++
 ...chine-aeskeywrap-off-caps.s390x-latest.xml |  34 ++++
 ...machine-aeskeywrap-on-cap.s390x-latest.xml |  34 ++++
 ...achine-aeskeywrap-on-caps.s390x-latest.xml |  34 ++++
 .../machine-aliases1.x86_64-latest.xml        |  40 +++++
 .../machine-aliases2.x86_64-latest.xml        |  40 +++++
 ...achine-deakeywrap-off-cap.s390x-latest.xml |  34 ++++
 ...chine-deakeywrap-off-caps.s390x-latest.xml |  34 ++++
 ...machine-deakeywrap-on-cap.s390x-latest.xml |  34 ++++
 ...achine-deakeywrap-on-caps.s390x-latest.xml |  34 ++++
 ...machine-keywrap-none-caps.s390x-latest.xml |  31 ++++
 .../machine-keywrap-none.s390x-latest.xml     |  31 ++++
 ...machine-loadparm-net-s390.s390x-latest.xml |  32 ++++
 .../machine-loadparm-s390.s390x-latest.xml    |  33 ++++
 .../machine-vmport-opt.x86_64-latest.xml      |  43 +++++
 .../memory-align-fail.x86_64-latest.xml       |  39 +++++
 ...mory-hotplug-nvdimm-align.x86_64-5.2.0.xml |  60 +++++++
 ...mory-hotplug-nvdimm-label.x86_64-5.2.0.xml |  62 +++++++
 ...emory-hotplug-nvdimm-pmem.x86_64-5.2.0.xml |  60 +++++++
 ...y-hotplug-nvdimm-readonly.x86_64-5.2.0.xml |  60 +++++++
 ...emory-hotplug-virtio-pmem.x86_64-5.2.0.xml |  55 ++++++
 .../migrate-numa-unaligned.x86_64-latest.xml  |  41 +++++
 .../misc-no-reboot.x86_64-5.2.0.xml           |  38 +++++
 .../mlock-off.x86_64-latest.xml               |  29 ++++
 .../mlock-on.x86_64-latest.xml                |  32 ++++
 ...multifunction-pci-device.x86_64-latest.xml |  64 +++++++
 .../name-escape.x86_64-latest.xml             |  95 +++++++++++
 .../net-client.x86_64-latest.xml              |  46 +++++
 .../net-eth-names.x86_64-latest.xml           |  52 ++++++
 .../net-hostdev-fail.x86_64-latest.xml        |  49 ++++++
 .../net-hostdev-multidomain.x86_64-latest.xml |  54 ++++++
 ...hostdev-vfio-multidomain.x86_64-latest.xml |  54 ++++++
 .../net-mcast.x86_64-latest.xml               |  46 +++++
 .../net-user-passt.x86_64-7.2.0.xml           |  61 +++++++
 .../net-vhostuser-fail.x86_64-latest.xml      |  46 +++++
 .../net-vhostuser-multiq.x86_64-latest.xml    |  73 ++++++++
 .../net-virtio-ccw.s390x-latest.xml           |  37 ++++
 .../net-virtio-netdev.x86_64-latest.xml       |  45 +++++
 ...uto-vcpu-static-numatune.x86_64-latest.xml |  44 +++++
 ...-static-memory-auto-vcpu.x86_64-latest.xml |  44 +++++
 .../numad.x86_64-latest.xml                   |  44 +++++
 ...-unavailable-restrictive.x86_64-latest.xml |  30 ++++
 ...mnode-unavailable-strict.x86_64-latest.xml |  30 ++++
 .../numatune-memnode.x86_64-5.2.0.xml         |  41 +++++
 ...-nodeset-exceed-hostnode.x86_64-latest.xml |  48 ++++++
 .../numatune-system-memory.x86_64-latest.xml  |  32 ++++
 ...parallel-parport-chardev.x86_64-latest.xml |  44 +++++
 .../parallel-tcp-chardev.x86_64-latest.xml    |  45 +++++
 .../parallel-unix-chardev.x86_64-latest.xml   |  42 +++++
 .../qemuxml2xmloutdata/ppc-dtb.ppc-latest.xml |  36 ++++
 ...-usb-controller-qemu-xhci.ppc64-latest.xml |  38 +++++
 .../ppce500-serial.ppc-latest.xml             |  35 ++++
 .../pseries-basic.ppc64-latest.xml            |  41 +++++
 .../pseries-cpu-le.ppc64-latest.xml           |  41 +++++
 .../pseries-features.ppc64-4.2.0.xml          |  40 +++++
 .../pseries-usb-default.ppc64-latest.xml      |  41 +++++
 .../pseries-usb-kbd.ppc64-latest.xml          |  42 +++++
 .../pseries-usb-multi.ppc64-latest.xml        |  44 +++++
 ...pseries-vio-user-assigned.ppc64-latest.xml |  59 +++++++
 .../pseries-vio.ppc64-latest.xml              |  59 +++++++
 .../q35-default-devices-only.x86_64-4.2.0.xml |  50 ++++++
 .../q35-multifunction.x86_64-4.2.0.xml        | 125 ++++++++++++++
 .../q35-pcie-autoadd.x86_64-4.2.0.xml         | 154 +++++++++++++++++
 .../q35-pcie.x86_64-4.2.0.xml                 | 158 ++++++++++++++++++
 .../q35-virt-manager-basic.x86_64-4.2.0.xml   | 128 ++++++++++++++
 .../qemu-ns-alt.x86_64-latest.xml             |  46 +++++
 .../qemu-ns-commandline-ns0.x86_64-latest.xml |  43 +++++
 .../qemu-ns-commandline-ns1.x86_64-latest.xml |  43 +++++
 .../qemu-ns-commandline.x86_64-latest.xml     |  43 +++++
 ...s-domain-commandline-ns0.x86_64-latest.xml |  43 +++++
 ...mu-ns-domain-commandline.x86_64-latest.xml |  43 +++++
 .../qemu-ns-domain-ns0.x86_64-latest.xml      |  43 +++++
 .../restore-v2-fd.x86_64-latest.xml           |  40 +++++
 ...llow-bogus-usb-controller.s390x-latest.xml |  48 ++++++
 ...s390-allow-bogus-usb-none.s390x-latest.xml |  44 +++++
 .../seclabel-dynamic.x86_64-latest.xml        |  41 +++++
 .../seclabel-static-relabel.x86_64-latest.xml |  43 +++++
 ...erial-dev-chardev-iobase.x86_64-latest.xml |  52 ++++++
 .../serial-dev-chardev.x86_64-latest.xml      |  50 ++++++
 .../serial-file-chardev.x86_64-latest.xml     |  50 ++++++
 .../serial-file-log.x86_64-latest.xml         |  50 ++++++
 .../serial-many-chardev.x86_64-latest.xml     |  54 ++++++
 .../serial-pty-chardev.x86_64-latest.xml      |  48 ++++++
 .../serial-tcp-chardev.x86_64-latest.xml      |  52 ++++++
 ...erial-tcp-telnet-chardev.x86_64-latest.xml |  52 ++++++
 ...p-tlsx509-chardev-verify.x86_64-latest.xml |  59 +++++++
 ...p-tlsx509-secret-chardev.x86_64-latest.xml |  59 +++++++
 .../serial-udp-chardev.x86_64-latest.xml      |  58 +++++++
 .../serial-unix-chardev.x86_64-latest.xml     |  50 ++++++
 .../serial-vc-chardev.x86_64-latest.xml       |  48 ++++++
 .../shmem-invalid-address.x86_64-latest.xml   |  34 ++++
 .../shmem-invalid-size.x86_64-latest.xml      |  34 ++++
 .../shmem-small-size.x86_64-latest.xml        |  34 ++++
 ...artcard-passthrough-unix.x86_64-latest.xml |  36 ++++
 .../sound-device.x86_64-4.2.0.xml             |  61 +++++++
 .../sparc-minimal.sparc-latest.xml            |  33 ++++
 .../usb-bus-missing.x86_64-latest.xml         |  37 ++++
 ...-default-unavailable-q35.x86_64-latest.xml |  33 ++++
 ...ntroller-ich9-autoassign.x86_64-latest.xml |  48 ++++++
 ...ontroller-ich9-companion.x86_64-latest.xml |  43 +++++
 ...ler-nec-xhci-unavailable.x86_64-latest.xml |  33 ++++
 ...ller-nex-xhci-autoassign.x86_64-latest.xml |  34 ++++
 ...usb-controller-qemu-xhci.x86_64-latest.xml |  29 ++++
 .../usb-hub-autoadd-deluxe.x86_64-latest.xml  |  47 ++++++
 .../usb-hub-autoadd.x86_64-latest.xml         |  35 ++++
 .../usb-hub.x86_64-latest.xml                 |  34 ++++
 .../usb-long-port-path.x86_64-latest.xml      |  43 +++++
 .../usb-port-autoassign.x86_64-latest.xml     |  38 +++++
 .../usb-ports.x86_64-latest.xml               |  46 +++++
 .../usb-redir-boot.x86_64-latest.xml          |  58 +++++++
 .../usb-redir-unix.x86_64-latest.xml          |  49 ++++++
 .../usb1-usb2.x86_64-latest.xml               |  79 +++++++++
 .../user-aliases-usb.x86_64-latest.xml        |  88 ++++++++++
 .../user-aliases2.x86_64-latest.xml           |  52 ++++++
 ...vhost-user-gpu-secondary.x86_64-latest.xml |  57 +++++++
 .../vhost-user-vga.x86_64-latest.xml          |  52 ++++++
 ...deo-bochs-display-device.x86_64-latest.xml |  44 +++++
 .../video-qxl-device-vgamem.x86_64-latest.xml |  44 +++++
 .../video-qxl-device-vram64.x86_64-latest.xml |  38 +++++
 .../video-qxl-device.x86_64-latest.xml        |  44 +++++
 ...eo-qxl-sec-device-vgamem.x86_64-latest.xml |  48 ++++++
 ...eo-qxl-sec-device-vram64.x86_64-latest.xml |  42 +++++
 .../video-qxl-sec-device.x86_64-latest.xml    |  48 ++++++
 ...deo-ramfb-display-device.x86_64-latest.xml |  43 +++++
 .../video-vga-device-vgamem.x86_64-latest.xml |  44 +++++
 .../video-vga-device.x86_64-latest.xml        |  44 +++++
 .../video-vga-qxl-heads.x86_64-latest.xml     |  52 ++++++
 .../video-virtio-vga.x86_64-latest.xml        |  44 +++++
 ...o-options-controller-ats.x86_64-latest.xml |  47 ++++++
 ...options-controller-iommu.x86_64-latest.xml |  47 ++++++
 ...ptions-controller-packed.x86_64-latest.xml |  47 ++++++
 .../virtio-options-disk-ats.x86_64-latest.xml |  43 +++++
 ...irtio-options-disk-iommu.x86_64-latest.xml |  43 +++++
 ...rtio-options-disk-packed.x86_64-latest.xml |  43 +++++
 .../virtio-options-fs-ats.x86_64-latest.xml   |  43 +++++
 .../virtio-options-fs-iommu.x86_64-latest.xml |  43 +++++
 ...virtio-options-fs-packed.x86_64-latest.xml |  43 +++++
 ...virtio-options-input-ats.x86_64-latest.xml |  39 +++++
 ...rtio-options-input-iommu.x86_64-latest.xml |  39 +++++
 ...tio-options-input-packed.x86_64-latest.xml |  39 +++++
 ...o-options-memballoon-ats.x86_64-latest.xml |  32 ++++
 ...lloon-freepage-reporting.x86_64-latest.xml |  31 ++++
 ...options-memballoon-iommu.x86_64-latest.xml |  32 ++++
 ...ptions-memballoon-packed.x86_64-latest.xml |  32 ++++
 .../virtio-options-net-ats.x86_64-latest.xml  |  43 +++++
 ...virtio-options-net-iommu.x86_64-latest.xml |  43 +++++
 ...irtio-options-net-packed.x86_64-latest.xml |  43 +++++
 .../virtio-options-rng-ats.x86_64-latest.xml  |  41 +++++
 ...virtio-options-rng-iommu.x86_64-latest.xml |  41 +++++
 ...irtio-options-rng-packed.x86_64-latest.xml |  41 +++++
 ...virtio-options-video-ats.x86_64-latest.xml |  45 +++++
 ...rtio-options-video-iommu.x86_64-latest.xml |  45 +++++
 ...tio-options-video-packed.x86_64-latest.xml |  45 +++++
 .../virtio-rng-builtin.x86_64-5.2.0.xml       |  35 ++++
 .../virtio-rng-ccw.s390x-latest.xml           |  43 +++++
 .../virtio-rng-default.x86_64-latest.xml      |  35 ++++
 .../virtio-rng-egd-unix.x86_64-5.2.0.xml      |  37 ++++
 .../virtio-rng-egd-unix.x86_64-latest.xml     |  37 ++++
 .../virtio-rng-multiple.x86_64-latest.xml     |  42 +++++
 .../watchdog-device.x86_64-latest.xml         |  43 +++++
 .../watchdog-diag288.s390x-latest.xml         |  34 ++++
 .../watchdog-dump.x86_64-latest.xml           |  41 +++++
 .../watchdog-injectnmi.x86_64-latest.xml      |  41 +++++
 397 files changed, 17543 insertions(+), 4 deletions(-)
 create mode 100644 tests/qemuxml2xmloutdata/aarch64-cpu-passthrough.aarch6=
4-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/aarch64-features-wrong.aarch64=
-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/aarch64-gic-default.aarch64-4.=
2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/aarch64-gic-none.aarch64-4.2.0=
.xml
 create mode 100644 tests/qemuxml2xmloutdata/aarch64-kvm-32-on-64.aarch64-l=
atest.xml
 create mode 100644 tests/qemuxml2xmloutdata/aarch64-virt-default-nic.aarch=
64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/aarch64-virt-virtio-MMIO.aarch=
64.latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/aarch64-virt-virtio.aarch64-4.=
2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/aarch64-virt-virtio.aarch64-la=
test.xml
 create mode 100644 tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.aar=
ch64-4.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/arm-vexpressa9-basic.aarch64-l=
atest.xml
 create mode 100644 tests/qemuxml2xmloutdata/arm-vexpressa9-nodevs.aarch64-=
latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/arm-vexpressa9-virtio.aarch64-=
latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/arm-virt-virtio.aarch64-latest=
.xml
 create mode 100644 tests/qemuxml2xmloutdata/audio-default-sdl.x86_64-4.2.0=
.xml
 create mode 100644 tests/qemuxml2xmloutdata/audio-default-spice.x86_64-4.2=
.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/audio-default-vnc.x86_64-4.2.0=
.xml
 create mode 100644 tests/qemuxml2xmloutdata/audio-jack-minimal.x86_64-late=
st.xml
 create mode 100644 tests/qemuxml2xmloutdata/balloon-ccw-deflate.s390x-late=
st.xml
 create mode 100644 tests/qemuxml2xmloutdata/balloon-device-deflate-off.x86=
_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/balloon-device-deflate.x86_64-=
latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/balloon-device.x86_64-latest.x=
ml
 create mode 100644 tests/qemuxml2xmloutdata/balloon-mmio-deflate.aarch64-l=
atest.xml
 create mode 100644 tests/qemuxml2xmloutdata/boot-complex.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/boot-menu-disable-drive.x86_64=
-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/boot-menu-enable.x86_64-latest=
.xml
 create mode 100644 tests/qemuxml2xmloutdata/channel-spicevmc.x86_64-latest=
.xml
 create mode 100644 tests/qemuxml2xmloutdata/channel-unix-guestfwd.x86_64-l=
atest.xml
 create mode 100644 tests/qemuxml2xmloutdata/channel-virtio-autoadd.x86_64-=
latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/channel-virtio-autoassign.x86_=
64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/channel-virtio-default.x86_64-=
latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/channel-virtio-unix.x86_64-lat=
est.xml
 create mode 100644 tests/qemuxml2xmloutdata/chardev-reconnect.x86_64-lates=
t.xml
 create mode 100644 tests/qemuxml2xmloutdata/clock-france.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/clock-hpet-off.x86_64-7.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/clock-hpet-off.x86_64-latest.x=
ml
 create mode 100644 tests/qemuxml2xmloutdata/clock-localtime-basis-localtim=
e.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/clock-variable.x86_64-latest.x=
ml
 create mode 100644 tests/qemuxml2xmloutdata/console-compat-chardev.x86_64-=
latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/console-sclp.s390x-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/console-virtio-ccw.s390x-lates=
t.xml
 create mode 100644 tests/qemuxml2xmloutdata/console-virtio-unix.x86_64-lat=
est.xml
 create mode 100644 tests/qemuxml2xmloutdata/controller-order.x86_64-latest=
.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-Haswell-noTSX.x86_64-lates=
t.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-Haswell.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-Haswell2.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-Haswell3.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-cache-disable.x86_64-lates=
t.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-cache-disable3.x86_64-late=
st.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-cache-emulate-l3.x86_64-la=
test.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-cache-passthrough.x86_64-l=
atest.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-exact1.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-exact2-nofallback.x86_64-l=
atest.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-exact2.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-fallback.x86_64-5.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-fallback.x86_64-8.0.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-cmt.x86_64-late=
st.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x8=
6_64-4.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x8=
6_64-5.0.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x8=
6_64-5.1.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x8=
6_64-5.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x8=
6_64-6.0.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x8=
6_64-6.1.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x8=
6_64-6.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x8=
6_64-7.0.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x8=
6_64-7.1.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x8=
6_64-7.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x8=
6_64-8.0.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x8=
6_64-8.1.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x8=
6_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x8=
6_64-4.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x8=
6_64-5.0.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x8=
6_64-5.1.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x8=
6_64-5.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x8=
6_64-6.0.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x8=
6_64-6.1.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x8=
6_64-6.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x8=
6_64-7.0.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x8=
6_64-7.1.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x8=
6_64-7.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x8=
6_64-8.0.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x8=
6_64-8.1.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x8=
6_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-4.2.=
0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-5.0.=
0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-5.1.=
0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-5.2.=
0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-6.0.=
0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-6.1.=
0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-6.2.=
0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-7.0.=
0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-7.1.=
0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-7.2.=
0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-8.0.=
0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-8.1.=
0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-late=
st.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.=
x86_64-4.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.=
x86_64-5.0.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.=
x86_64-5.1.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.=
x86_64-5.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.=
x86_64-6.0.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.=
x86_64-6.1.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.=
x86_64-6.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.=
x86_64-7.0.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.=
x86_64-7.1.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.=
x86_64-7.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.=
x86_64-8.0.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.=
x86_64-8.1.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.=
x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.=
x86_64-4.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.=
x86_64-5.0.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.=
x86_64-5.1.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.=
x86_64-5.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.=
x86_64-6.0.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.=
x86_64-6.1.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.=
x86_64-6.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.=
x86_64-7.0.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.=
x86_64-7.1.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.=
x86_64-7.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.=
x86_64-8.0.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.=
x86_64-8.1.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.=
x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-4.2.=
0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-5.0.=
0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-5.1.=
0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-5.2.=
0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-6.0.=
0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-6.1.=
0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-6.2.=
0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-7.0.=
0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-7.1.=
0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-7.2.=
0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-8.0.=
0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-8.1.=
0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-late=
st.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-host-passthrough.x86_64-la=
test.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-hotplug-startup.x86_64-lat=
est.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-minimum1.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-minimum2.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-no-removed-features.x86_64=
-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-nofallback.x86_64-5.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-nofallback.x86_64-8.0.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-phys-bits-emulate.x86_64-l=
atest.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-phys-bits-emulate2.x86_64-=
latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-phys-bits-passthrough.x86_=
64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-qemu-host-passthrough.x86_=
64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-s390-features.s390x-latest=
.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-s390-zEC12.s390x-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-strict1.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-topology1.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-topology2.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-topology3.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-topology4.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-translation.x86_64-latest.=
xml
 create mode 100644 tests/qemuxml2xmloutdata/cpu-tsc-frequency.x86_64-lates=
t.xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-cdrom-network-nbdkit.x86_=
64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-cdrom-tray.x86_64-latest.=
xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-device-removable.x86_64-l=
atest.xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-error-policy-s390x.s390x-=
latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-floppy-pseries.ppc64-late=
st.xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-floppy-q35.x86_64-latest.=
xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-floppy-tray.x86_64-latest=
.xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-geometry.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-ide-split.x86_64-latest.x=
ml
 create mode 100644 tests/qemuxml2xmloutdata/disk-ide-wwn.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-ioeventfd.x86_64-latest.x=
ml
 create mode 100644 tests/qemuxml2xmloutdata/disk-network-http-nbdkit.x86_6=
4-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-network-rbd-no-colon.x86_=
64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-network-sheepdog.x86_64-6=
.0.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-network-source-curl-nbdki=
t-backing.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-network-source-curl-nbdki=
t.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-network-source-curl.x86_6=
4-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-network-ssh-key.x86_64-la=
test.xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-network-ssh-nbdkit.x86_64=
-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-network-ssh-password.x86_=
64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-network-ssh.x86_64-latest=
.xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd.x86_6=
4-5.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-no-boot.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-order.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-readonly-disk.x86_64-late=
st.xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-scsi-disk-split.x86_64-la=
test.xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-scsi-disk-wwn.x86_64-late=
st.xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough.x86_=
64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-shared.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-snapshot.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-vhostuser-numa.x86_64-4.2=
.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-vhostuser-numa.x86_64-lat=
est.xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-vhostvdpa.x86_64-latest.x=
ml
 create mode 100644 tests/qemuxml2xmloutdata/disk-virtio-ccw-many.s390x-lat=
est.xml
 create mode 100644 tests/qemuxml2xmloutdata/disk-virtio-ccw.s390x-latest.x=
ml
 create mode 100644 tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations.=
x86_64-5.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/fips-enabled.x86_64-5.1.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/fips-enabled.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/fs9p-ccw.s390x-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/fs9p.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/graphics-dbus-usbredir.x86_64-=
latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/graphics-egl-headless.x86_64-l=
atest.xml
 create mode 100644 tests/qemuxml2xmloutdata/graphics-spice-agent-file-xfer=
.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/graphics-spice-agentmouse.x86_=
64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/graphics-spice-gl-auto-rendern=
ode.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/graphics-spice-no-args.x86_64-=
latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/graphics-spice-sasl.x86_64-lat=
est.xml
 create mode 100644 tests/qemuxml2xmloutdata/graphics-spice-usb-redir.x86_6=
4-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/graphics-vnc-none.x86_64-lates=
t.xml
 create mode 100644 tests/qemuxml2xmloutdata/graphics-vnc-policy.x86_64-lat=
est.xml
 create mode 100644 tests/qemuxml2xmloutdata/graphics-vnc-power.x86_64-late=
st.xml
 create mode 100644 tests/qemuxml2xmloutdata/graphics-vnc-socket-new-cmdlin=
e.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/graphics-vnc-tls-secret.x86_64=
-5.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/graphics-vnc-tls-secret.x86_64=
-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/hostdev-mdev-display-spice-egl=
-headless.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/hostdev-mdev-display-spice-ope=
ngl.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/hostdev-mdev-display-vnc-egl-h=
eadless.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/hostdev-mdev-display-vnc.x86_6=
4-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/hostdev-pci-address-device.x86=
_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.x=
86_64-4.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/hostdev-usb-address-device-boo=
t.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/hostdev-usb-address-device.x86=
_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-multidomain.x86_6=
4-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/hotplug-base.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/hugepages-default-5M.x86_64-la=
test.xml
 create mode 100644 tests/qemuxml2xmloutdata/hugepages-numa-default.x86_64-=
latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/hyperv-passthrough.x86_64-6.1.=
0.xml
 create mode 100644 tests/qemuxml2xmloutdata/input-usbmouse-addr.x86_64-lat=
est.xml
 create mode 100644 tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.s390=
x-4.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.x86_=
64-5.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/kvm-pit-delay.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/kvm-pit-discard.x86_64-latest.=
xml
 create mode 100644 tests/qemuxml2xmloutdata/kvmclock+eoi-disabled.x86_64-l=
atest.xml
 create mode 100644 tests/qemuxml2xmloutdata/launch-security-s390-pv.s390x-=
latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/launch-security-sev-direct.x86=
_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/launch-security-sev-missing-pl=
atform-info.x86_64-6.0.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/launch-security-sev.x86_64-6.0=
.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/luks-disks-source-qcow2.x86_64=
-5.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/machine-aeskeywrap-off-cap.s39=
0x-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/machine-aeskeywrap-off-caps.s3=
90x-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/machine-aeskeywrap-on-cap.s390=
x-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/machine-aeskeywrap-on-caps.s39=
0x-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/machine-aliases1.x86_64-latest=
.xml
 create mode 100644 tests/qemuxml2xmloutdata/machine-aliases2.x86_64-latest=
.xml
 create mode 100644 tests/qemuxml2xmloutdata/machine-deakeywrap-off-cap.s39=
0x-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/machine-deakeywrap-off-caps.s3=
90x-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/machine-deakeywrap-on-cap.s390=
x-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/machine-deakeywrap-on-caps.s39=
0x-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/machine-keywrap-none-caps.s390=
x-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/machine-keywrap-none.s390x-lat=
est.xml
 create mode 100644 tests/qemuxml2xmloutdata/machine-loadparm-net-s390.s390=
x-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/machine-loadparm-s390.s390x-la=
test.xml
 create mode 100644 tests/qemuxml2xmloutdata/machine-vmport-opt.x86_64-late=
st.xml
 create mode 100644 tests/qemuxml2xmloutdata/memory-align-fail.x86_64-lates=
t.xml
 create mode 100644 tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-align.x8=
6_64-5.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-label.x8=
6_64-5.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-pmem.x86=
_64-5.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-readonly=
.x86_64-5.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/memory-hotplug-virtio-pmem.x86=
_64-5.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/migrate-numa-unaligned.x86_64-=
latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/misc-no-reboot.x86_64-5.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/mlock-off.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/mlock-on.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/multifunction-pci-device.x86_6=
4-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/name-escape.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/net-client.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/net-eth-names.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/net-hostdev-fail.x86_64-latest=
.xml
 create mode 100644 tests/qemuxml2xmloutdata/net-hostdev-multidomain.x86_64=
-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/net-hostdev-vfio-multidomain.x=
86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/net-mcast.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/net-user-passt.x86_64-7.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/net-vhostuser-fail.x86_64-late=
st.xml
 create mode 100644 tests/qemuxml2xmloutdata/net-vhostuser-multiq.x86_64-la=
test.xml
 create mode 100644 tests/qemuxml2xmloutdata/net-virtio-ccw.s390x-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/net-virtio-netdev.x86_64-lates=
t.xml
 create mode 100644 tests/qemuxml2xmloutdata/numad-auto-vcpu-static-numatun=
e.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/numad-static-memory-auto-vcpu.=
x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/numad.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/numatune-memnode-unavailable-r=
estrictive.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/numatune-memnode-unavailable-s=
trict.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/numatune-memnode.x86_64-5.2.0.=
xml
 create mode 100644 tests/qemuxml2xmloutdata/numatune-static-nodeset-exceed=
-hostnode.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/numatune-system-memory.x86_64-=
latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/parallel-parport-chardev.x86_6=
4-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/parallel-tcp-chardev.x86_64-la=
test.xml
 create mode 100644 tests/qemuxml2xmloutdata/parallel-unix-chardev.x86_64-l=
atest.xml
 create mode 100644 tests/qemuxml2xmloutdata/ppc-dtb.ppc-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/ppc64-usb-controller-qemu-xhci=
.ppc64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/ppce500-serial.ppc-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/pseries-basic.ppc64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/pseries-cpu-le.ppc64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/pseries-features.ppc64-4.2.0.x=
ml
 create mode 100644 tests/qemuxml2xmloutdata/pseries-usb-default.ppc64-late=
st.xml
 create mode 100644 tests/qemuxml2xmloutdata/pseries-usb-kbd.ppc64-latest.x=
ml
 create mode 100644 tests/qemuxml2xmloutdata/pseries-usb-multi.ppc64-latest=
.xml
 create mode 100644 tests/qemuxml2xmloutdata/pseries-vio-user-assigned.ppc6=
4-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/pseries-vio.ppc64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/q35-default-devices-only.x86_6=
4-4.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/q35-multifunction.x86_64-4.2.0=
.xml
 create mode 100644 tests/qemuxml2xmloutdata/q35-pcie-autoadd.x86_64-4.2.0.=
xml
 create mode 100644 tests/qemuxml2xmloutdata/q35-pcie.x86_64-4.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/q35-virt-manager-basic.x86_64-=
4.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/qemu-ns-alt.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/qemu-ns-commandline-ns0.x86_64=
-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/qemu-ns-commandline-ns1.x86_64=
-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/qemu-ns-commandline.x86_64-lat=
est.xml
 create mode 100644 tests/qemuxml2xmloutdata/qemu-ns-domain-commandline-ns0=
.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/qemu-ns-domain-commandline.x86=
_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/qemu-ns-domain-ns0.x86_64-late=
st.xml
 create mode 100644 tests/qemuxml2xmloutdata/restore-v2-fd.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/s390-allow-bogus-usb-controlle=
r.s390x-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/s390-allow-bogus-usb-none.s390=
x-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/seclabel-dynamic.x86_64-latest=
.xml
 create mode 100644 tests/qemuxml2xmloutdata/seclabel-static-relabel.x86_64=
-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/serial-dev-chardev-iobase.x86_=
64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/serial-dev-chardev.x86_64-late=
st.xml
 create mode 100644 tests/qemuxml2xmloutdata/serial-file-chardev.x86_64-lat=
est.xml
 create mode 100644 tests/qemuxml2xmloutdata/serial-file-log.x86_64-latest.=
xml
 create mode 100644 tests/qemuxml2xmloutdata/serial-many-chardev.x86_64-lat=
est.xml
 create mode 100644 tests/qemuxml2xmloutdata/serial-pty-chardev.x86_64-late=
st.xml
 create mode 100644 tests/qemuxml2xmloutdata/serial-tcp-chardev.x86_64-late=
st.xml
 create mode 100644 tests/qemuxml2xmloutdata/serial-tcp-telnet-chardev.x86_=
64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev-ver=
ify.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/serial-tcp-tlsx509-secret-char=
dev.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/serial-udp-chardev.x86_64-late=
st.xml
 create mode 100644 tests/qemuxml2xmloutdata/serial-unix-chardev.x86_64-lat=
est.xml
 create mode 100644 tests/qemuxml2xmloutdata/serial-vc-chardev.x86_64-lates=
t.xml
 create mode 100644 tests/qemuxml2xmloutdata/shmem-invalid-address.x86_64-l=
atest.xml
 create mode 100644 tests/qemuxml2xmloutdata/shmem-invalid-size.x86_64-late=
st.xml
 create mode 100644 tests/qemuxml2xmloutdata/shmem-small-size.x86_64-latest=
.xml
 create mode 100644 tests/qemuxml2xmloutdata/smartcard-passthrough-unix.x86=
_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/sound-device.x86_64-4.2.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/sparc-minimal.sparc-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/usb-bus-missing.x86_64-latest.=
xml
 create mode 100644 tests/qemuxml2xmloutdata/usb-controller-default-unavail=
able-q35.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/usb-controller-ich9-autoassign=
.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/usb-controller-ich9-companion.=
x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/usb-controller-nec-xhci-unavai=
lable.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/usb-controller-nex-xhci-autoas=
sign.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/usb-controller-qemu-xhci.x86_6=
4-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/usb-hub-autoadd-deluxe.x86_64-=
latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/usb-hub-autoadd.x86_64-latest.=
xml
 create mode 100644 tests/qemuxml2xmloutdata/usb-hub.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/usb-long-port-path.x86_64-late=
st.xml
 create mode 100644 tests/qemuxml2xmloutdata/usb-port-autoassign.x86_64-lat=
est.xml
 create mode 100644 tests/qemuxml2xmloutdata/usb-ports.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/usb-redir-boot.x86_64-latest.x=
ml
 create mode 100644 tests/qemuxml2xmloutdata/usb-redir-unix.x86_64-latest.x=
ml
 create mode 100644 tests/qemuxml2xmloutdata/usb1-usb2.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/user-aliases-usb.x86_64-latest=
.xml
 create mode 100644 tests/qemuxml2xmloutdata/user-aliases2.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/vhost-user-gpu-secondary.x86_6=
4-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/vhost-user-vga.x86_64-latest.x=
ml
 create mode 100644 tests/qemuxml2xmloutdata/video-bochs-display-device.x86=
_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/video-qxl-device-vgamem.x86_64=
-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/video-qxl-device-vram64.x86_64=
-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/video-qxl-device.x86_64-latest=
.xml
 create mode 100644 tests/qemuxml2xmloutdata/video-qxl-sec-device-vgamem.x8=
6_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/video-qxl-sec-device-vram64.x8=
6_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/video-qxl-sec-device.x86_64-la=
test.xml
 create mode 100644 tests/qemuxml2xmloutdata/video-ramfb-display-device.x86=
_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/video-vga-device-vgamem.x86_64=
-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/video-vga-device.x86_64-latest=
.xml
 create mode 100644 tests/qemuxml2xmloutdata/video-vga-qxl-heads.x86_64-lat=
est.xml
 create mode 100644 tests/qemuxml2xmloutdata/video-virtio-vga.x86_64-latest=
.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-options-controller-ats.=
x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-options-controller-iomm=
u.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-options-controller-pack=
ed.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-options-disk-ats.x86_64=
-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-options-disk-iommu.x86_=
64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-options-disk-packed.x86=
_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-options-fs-ats.x86_64-l=
atest.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-options-fs-iommu.x86_64=
-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-options-fs-packed.x86_6=
4-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-options-input-ats.x86_6=
4-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-options-input-iommu.x86=
_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-options-input-packed.x8=
6_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-options-memballoon-ats.=
x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-options-memballoon-free=
page-reporting.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-options-memballoon-iomm=
u.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-options-memballoon-pack=
ed.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-options-net-ats.x86_64-=
latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-options-net-iommu.x86_6=
4-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-options-net-packed.x86_=
64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-options-rng-ats.x86_64-=
latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-options-rng-iommu.x86_6=
4-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-options-rng-packed.x86_=
64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-options-video-ats.x86_6=
4-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-options-video-iommu.x86=
_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-options-video-packed.x8=
6_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-rng-builtin.x86_64-5.2.=
0.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-rng-ccw.s390x-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-rng-default.x86_64-late=
st.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-rng-egd-unix.x86_64-5.2=
.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-rng-egd-unix.x86_64-lat=
est.xml
 create mode 100644 tests/qemuxml2xmloutdata/virtio-rng-multiple.x86_64-lat=
est.xml
 create mode 100644 tests/qemuxml2xmloutdata/watchdog-device.x86_64-latest.=
xml
 create mode 100644 tests/qemuxml2xmloutdata/watchdog-diag288.s390x-latest.=
xml
 create mode 100644 tests/qemuxml2xmloutdata/watchdog-dump.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/watchdog-injectnmi.x86_64-late=
st.xml

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 4433b75d61..267e4e579e 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -743,10 +743,6 @@ testCompareDef2XML(const void *data)
     if (!testQemuConfXMLCommon(info, &rc))
         return rc;

-    /* skip tests without output file for now */
-    if (!virTestGetRegenerate() && !virFileExists(info->out_xml_inactive))
-        return EXIT_AM_SKIP;
-
     /* we deliberately format the XML as live to catch potential test regr=
essions
      * as virDomainDefFormatInternalSetRootName implies _INACTIVE if 'def-=
>id'
      * is -1, thus VM is inactive. */
diff --git a/tests/qemuxml2xmloutdata/aarch64-cpu-passthrough.aarch64-lates=
t.xml b/tests/qemuxml2xmloutdata/aarch64-cpu-passthrough.aarch64-latest.xml
new file mode 100644
index 0000000000..58d5f9b154
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/aarch64-cpu-passthrough.aarch64-latest.xml
@@ -0,0 +1,42 @@
+<domain type=3D'kvm'>
+  <name>aarch64test</name>
+  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'aarch64' machine=3D'virt'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <features>
+    <apic/>
+    <pae/>
+    <gic version=3D'3'/>
+  </features>
+  <cpu mode=3D'host-passthrough' check=3D'none'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/aarch64.raw'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <audio id=3D'1' type=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/aarch64-features-wrong.aarch64-latest=
.xml b/tests/qemuxml2xmloutdata/aarch64-features-wrong.aarch64-latest.xml
new file mode 100644
index 0000000000..0bd98393c1
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/aarch64-features-wrong.aarch64-latest.xml
@@ -0,0 +1,28 @@
+<domain type=3D'kvm'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'aarch64' machine=3D'virt'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <features>
+    <gic version=3D'3'/>
+  </features>
+  <cpu mode=3D'host-passthrough' check=3D'none'>
+    <feature policy=3D'disable' name=3D'vmx'/>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'none'/>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-default.aarch64-4.2.0.xml=
 b/tests/qemuxml2xmloutdata/aarch64-gic-default.aarch64-4.2.0.xml
new file mode 100644
index 0000000000..ebaddc66f2
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/aarch64-gic-default.aarch64-4.2.0.xml
@@ -0,0 +1,26 @@
+<domain type=3D'kvm'>
+  <name>aarch64test</name>
+  <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'aarch64' machine=3D'virt-4.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <features>
+    <gic version=3D'3'/>
+  </features>
+  <cpu mode=3D'host-passthrough' check=3D'none'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'none'/>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-none.aarch64-4.2.0.xml b/=
tests/qemuxml2xmloutdata/aarch64-gic-none.aarch64-4.2.0.xml
new file mode 100644
index 0000000000..ebaddc66f2
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/aarch64-gic-none.aarch64-4.2.0.xml
@@ -0,0 +1,26 @@
+<domain type=3D'kvm'>
+  <name>aarch64test</name>
+  <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'aarch64' machine=3D'virt-4.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <features>
+    <gic version=3D'3'/>
+  </features>
+  <cpu mode=3D'host-passthrough' check=3D'none'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'none'/>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/aarch64-kvm-32-on-64.aarch64-latest.x=
ml b/tests/qemuxml2xmloutdata/aarch64-kvm-32-on-64.aarch64-latest.xml
new file mode 100644
index 0000000000..ae52ab34bd
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/aarch64-kvm-32-on-64.aarch64-latest.xml
@@ -0,0 +1,64 @@
+<domain type=3D'kvm'>
+  <name>armtest</name>
+  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e6a</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'armv7l' machine=3D'virt'>hvm</type>
+    <kernel>/arm.kernel</kernel>
+    <initrd>/arm.initrd</initrd>
+    <cmdline>console=3DttyAMA0,115200n8 rw root=3D/dev/vda rootwait physma=
p.enabled=3D0</cmdline>
+    <boot dev=3D'hd'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+    <gic version=3D'3'/>
+  </features>
+  <cpu mode=3D'host-passthrough' check=3D'none'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/arm.raw'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:00:09:a4:37'/>
+      <model type=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </interface>
+    <serial type=3D'pty'>
+      <target type=3D'system-serial' port=3D'0'>
+        <model name=3D'pl011'/>
+      </target>
+    </serial>
+    <console type=3D'pty'>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <audio id=3D'1' type=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-default-nic.aarch64-late=
st.xml b/tests/qemuxml2xmloutdata/aarch64-virt-default-nic.aarch64-latest.x=
ml
new file mode 100644
index 0000000000..45f2464735
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/aarch64-virt-default-nic.aarch64-latest.xml
@@ -0,0 +1,44 @@
+<domain type=3D'qemu'>
+  <name>aarch64-virt-default-nic</name>
+  <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'aarch64' machine=3D'virt'>hvm</type>
+    <kernel>/aarch64.kernel</kernel>
+    <initrd>/aarch64.initrd</initrd>
+    <cmdline>console=3DttyAMA0</cmdline>
+    <boot dev=3D'hd'/>
+  </os>
+  <features>
+    <gic version=3D'2'/>
+  </features>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'allow'>cortex-a53</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:00:09:a4:37'/>
+      <model type=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </interface>
+    <audio id=3D'1' type=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-virtio-MMIO.aarch64.late=
st.xml b/tests/qemuxml2xmloutdata/aarch64-virt-virtio-MMIO.aarch64.latest.x=
ml
new file mode 100644
index 0000000000..c7d74309f9
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/aarch64-virt-virtio-MMIO.aarch64.latest.xml
@@ -0,0 +1,63 @@
+<domain type=3D'qemu'>
+  <name>aarch64test</name>
+  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'aarch64' machine=3D'virt'>hvm</type>
+    <kernel>/aarch64.kernel</kernel>
+    <initrd>/aarch64.initrd</initrd>
+    <cmdline>earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda roo=
twait</cmdline>
+    <dtb>/aarch64.dtb</dtb>
+    <boot dev=3D'hd'/>
+  </os>
+  <features>
+    <apic/>
+    <pae/>
+    <gic version=3D'2'/>
+  </features>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'allow'>cortex-a53</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/aarch64.raw'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'virtio-mmio'/>
+    </disk>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <address type=3D'virtio-mmio'/>
+    </controller>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:00:09:a4:37'/>
+      <model type=3D'virtio'/>
+      <address type=3D'virtio-mmio'/>
+    </interface>
+    <serial type=3D'pty'>
+      <target type=3D'system-serial' port=3D'0'>
+        <model name=3D'pl011'/>
+      </target>
+    </serial>
+    <console type=3D'pty'>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <console type=3D'pty'>
+      <target type=3D'virtio' port=3D'1'/>
+    </console>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'virtio-mmio'/>
+    </memballoon>
+    <rng model=3D'virtio'>
+      <backend model=3D'random'>/dev/random</backend>
+      <address type=3D'virtio-mmio'/>
+    </rng>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-virtio.aarch64-4.2.0.xml=
 b/tests/qemuxml2xmloutdata/aarch64-virt-virtio.aarch64-4.2.0.xml
new file mode 100644
index 0000000000..41091952e2
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/aarch64-virt-virtio.aarch64-4.2.0.xml
@@ -0,0 +1,94 @@
+<domain type=3D'qemu'>
+  <name>aarch64test</name>
+  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'aarch64' machine=3D'virt-4.2'>hvm</type>
+    <kernel>/aarch64.kernel</kernel>
+    <initrd>/aarch64.initrd</initrd>
+    <cmdline>earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda roo=
twait</cmdline>
+    <dtb>/aarch64.dtb</dtb>
+    <boot dev=3D'hd'/>
+  </os>
+  <features>
+    <apic/>
+    <pae/>
+    <gic version=3D'2'/>
+  </features>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'allow'>cortex-a53</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/aarch64.raw'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'4' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'4' port=3D'0xb'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x3'/>
+    </controller>
+    <controller type=3D'pci' index=3D'5' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'5' port=3D'0xc'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x4'/>
+    </controller>
+    <controller type=3D'pci' index=3D'6' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'6' port=3D'0xd'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x5'/>
+    </controller>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:00:09:a4:37'/>
+      <model type=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </interface>
+    <serial type=3D'pty'>
+      <target type=3D'system-serial' port=3D'0'>
+        <model name=3D'pl011'/>
+      </target>
+    </serial>
+    <console type=3D'pty'>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <console type=3D'pty'>
+      <target type=3D'virtio' port=3D'1'/>
+    </console>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x04' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+    <rng model=3D'virtio'>
+      <backend model=3D'random'>/dev/random</backend>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </rng>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-virtio.aarch64-latest.xm=
l b/tests/qemuxml2xmloutdata/aarch64-virt-virtio.aarch64-latest.xml
new file mode 100644
index 0000000000..1ea25a01f5
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/aarch64-virt-virtio.aarch64-latest.xml
@@ -0,0 +1,94 @@
+<domain type=3D'qemu'>
+  <name>aarch64test</name>
+  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'aarch64' machine=3D'virt'>hvm</type>
+    <kernel>/aarch64.kernel</kernel>
+    <initrd>/aarch64.initrd</initrd>
+    <cmdline>earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda roo=
twait</cmdline>
+    <dtb>/aarch64.dtb</dtb>
+    <boot dev=3D'hd'/>
+  </os>
+  <features>
+    <apic/>
+    <pae/>
+    <gic version=3D'2'/>
+  </features>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'allow'>cortex-a53</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/aarch64.raw'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'4' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'4' port=3D'0xb'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x3'/>
+    </controller>
+    <controller type=3D'pci' index=3D'5' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'5' port=3D'0xc'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x4'/>
+    </controller>
+    <controller type=3D'pci' index=3D'6' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'6' port=3D'0xd'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x5'/>
+    </controller>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:00:09:a4:37'/>
+      <model type=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </interface>
+    <serial type=3D'pty'>
+      <target type=3D'system-serial' port=3D'0'>
+        <model name=3D'pl011'/>
+      </target>
+    </serial>
+    <console type=3D'pty'>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <console type=3D'pty'>
+      <target type=3D'virtio' port=3D'1'/>
+    </console>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x04' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+    <rng model=3D'virtio'>
+      <backend model=3D'random'>/dev/random</backend>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </rng>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.aarch64-4.=
2.0.xml b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.aarch64-4.2.0=
.xml
new file mode 100644
index 0000000000..41091952e2
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.aarch64-4.2.0.xml
@@ -0,0 +1,94 @@
+<domain type=3D'qemu'>
+  <name>aarch64test</name>
+  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'aarch64' machine=3D'virt-4.2'>hvm</type>
+    <kernel>/aarch64.kernel</kernel>
+    <initrd>/aarch64.initrd</initrd>
+    <cmdline>earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda roo=
twait</cmdline>
+    <dtb>/aarch64.dtb</dtb>
+    <boot dev=3D'hd'/>
+  </os>
+  <features>
+    <apic/>
+    <pae/>
+    <gic version=3D'2'/>
+  </features>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'allow'>cortex-a53</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/aarch64.raw'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'4' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'4' port=3D'0xb'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x3'/>
+    </controller>
+    <controller type=3D'pci' index=3D'5' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'5' port=3D'0xc'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x4'/>
+    </controller>
+    <controller type=3D'pci' index=3D'6' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'6' port=3D'0xd'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x5'/>
+    </controller>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:00:09:a4:37'/>
+      <model type=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </interface>
+    <serial type=3D'pty'>
+      <target type=3D'system-serial' port=3D'0'>
+        <model name=3D'pl011'/>
+      </target>
+    </serial>
+    <console type=3D'pty'>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <console type=3D'pty'>
+      <target type=3D'virtio' port=3D'1'/>
+    </console>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x04' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+    <rng model=3D'virtio'>
+      <backend model=3D'random'>/dev/random</backend>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </rng>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/arm-vexpressa9-basic.aarch64-latest.x=
ml b/tests/qemuxml2xmloutdata/arm-vexpressa9-basic.aarch64-latest.xml
new file mode 100644
index 0000000000..65d9829adf
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/arm-vexpressa9-basic.aarch64-latest.xml
@@ -0,0 +1,46 @@
+<domain type=3D'qemu'>
+  <name>armtest</name>
+  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e6a</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'armv7l' machine=3D'vexpress-a9'>hvm</type>
+    <kernel>/arm.kernel</kernel>
+    <initrd>/arm.initrd</initrd>
+    <cmdline>console=3DttyAMA0,115200n8 rw root=3D/dev/mmcblk0p3 rootwait =
physmap.enabled=3D0</cmdline>
+    <dtb>/arm.dtb</dtb>
+    <boot dev=3D'hd'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>cortex-a9</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/arm.raw'/>
+      <target dev=3D'sda' bus=3D'sd'/>
+    </disk>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:00:09:a4:37'/>
+      <model type=3D'lan9118'/>
+    </interface>
+    <serial type=3D'pty'>
+      <target port=3D'0'/>
+    </serial>
+    <console type=3D'pty'>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <audio id=3D'1' type=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/arm-vexpressa9-nodevs.aarch64-latest.=
xml b/tests/qemuxml2xmloutdata/arm-vexpressa9-nodevs.aarch64-latest.xml
new file mode 100644
index 0000000000..b2166429ae
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/arm-vexpressa9-nodevs.aarch64-latest.xml
@@ -0,0 +1,31 @@
+<domain type=3D'qemu'>
+  <name>armtest</name>
+  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e6a</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'armv7l' machine=3D'vexpress-a9'>hvm</type>
+    <kernel>/arm.kernel</kernel>
+    <initrd>/arm.initrd</initrd>
+    <cmdline>console=3DttyAMA0,115200n8</cmdline>
+    <dtb>/arm.dtb</dtb>
+    <boot dev=3D'hd'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>cortex-a9</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <audio id=3D'1' type=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/arm-vexpressa9-virtio.aarch64-latest.=
xml b/tests/qemuxml2xmloutdata/arm-vexpressa9-virtio.aarch64-latest.xml
new file mode 100644
index 0000000000..41b7e2b660
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/arm-vexpressa9-virtio.aarch64-latest.xml
@@ -0,0 +1,61 @@
+<domain type=3D'qemu'>
+  <name>armtest</name>
+  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e6a</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'armv7l' machine=3D'vexpress-a9'>hvm</type>
+    <kernel>/arm.kernel</kernel>
+    <initrd>/arm.initrd</initrd>
+    <cmdline>console=3DttyAMA0,115200n8 rw root=3D/dev/vda3 rootwait physm=
ap.enabled=3D0</cmdline>
+    <dtb>/arm.dtb</dtb>
+    <boot dev=3D'hd'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>cortex-a9</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/arm.raw'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'virtio-mmio'/>
+    </disk>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <address type=3D'virtio-mmio'/>
+    </controller>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:00:09:a4:37'/>
+      <model type=3D'virtio'/>
+      <address type=3D'virtio-mmio'/>
+    </interface>
+    <serial type=3D'pty'>
+      <target port=3D'0'/>
+    </serial>
+    <console type=3D'pty'>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <console type=3D'pty'>
+      <target type=3D'virtio' port=3D'1'/>
+    </console>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'virtio-mmio'/>
+    </memballoon>
+    <rng model=3D'virtio'>
+      <backend model=3D'random'>/dev/random</backend>
+      <address type=3D'virtio-mmio'/>
+    </rng>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/arm-virt-virtio.aarch64-latest.xml b/=
tests/qemuxml2xmloutdata/arm-virt-virtio.aarch64-latest.xml
new file mode 100644
index 0000000000..ffe1e4d8b0
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/arm-virt-virtio.aarch64-latest.xml
@@ -0,0 +1,95 @@
+<domain type=3D'qemu'>
+  <name>armtest</name>
+  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e6a</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'armv7l' machine=3D'virt'>hvm</type>
+    <kernel>/arm.kernel</kernel>
+    <initrd>/arm.initrd</initrd>
+    <cmdline>console=3DttyAMA0,115200n8 rw root=3D/dev/vda rootwait physma=
p.enabled=3D0</cmdline>
+    <dtb>/arm.dtb</dtb>
+    <boot dev=3D'hd'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+    <gic version=3D'2'/>
+  </features>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>cortex-a15</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/arm.raw'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'4' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'4' port=3D'0xb'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x3'/>
+    </controller>
+    <controller type=3D'pci' index=3D'5' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'5' port=3D'0xc'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x4'/>
+    </controller>
+    <controller type=3D'pci' index=3D'6' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'6' port=3D'0xd'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x5'/>
+    </controller>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:00:09:a4:37'/>
+      <model type=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </interface>
+    <serial type=3D'pty'>
+      <target type=3D'system-serial' port=3D'0'>
+        <model name=3D'pl011'/>
+      </target>
+    </serial>
+    <console type=3D'pty'>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <console type=3D'pty'>
+      <target type=3D'virtio' port=3D'1'/>
+    </console>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x04' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+    <rng model=3D'virtio'>
+      <backend model=3D'random'>/dev/random</backend>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </rng>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/audio-default-sdl.x86_64-4.2.0.xml b/=
tests/qemuxml2xmloutdata/audio-default-sdl.x86_64-4.2.0.xml
new file mode 100644
index 0000000000..ebd69b43c8
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-default-sdl.x86_64-4.2.0.xml
@@ -0,0 +1,44 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-4.2'>hvm</type>
+    <boot dev=3D'cdrom'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'cdrom'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/cdrom'/>
+      <target dev=3D'hdc' bus=3D'ide'/>
+      <readonly/>
+      <address type=3D'drive' controller=3D'0' bus=3D'1' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <graphics type=3D'sdl'/>
+    <audio id=3D'1' type=3D'sdl' driver=3D'esd'/>
+    <video>
+      <model type=3D'cirrus' vram=3D'16384' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/audio-default-spice.x86_64-4.2.0.xml =
b/tests/qemuxml2xmloutdata/audio-default-spice.x86_64-4.2.0.xml
new file mode 100644
index 0000000000..70f1658cd4
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-default-spice.x86_64-4.2.0.xml
@@ -0,0 +1,46 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-4.2'>hvm</type>
+    <boot dev=3D'cdrom'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'cdrom'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/cdrom'/>
+      <target dev=3D'hdc' bus=3D'ide'/>
+      <readonly/>
+      <address type=3D'drive' controller=3D'0' bus=3D'1' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <graphics type=3D'spice'>
+      <listen type=3D'none'/>
+    </graphics>
+    <audio id=3D'1' type=3D'spice'/>
+    <video>
+      <model type=3D'cirrus' vram=3D'16384' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/audio-default-vnc.x86_64-4.2.0.xml b/=
tests/qemuxml2xmloutdata/audio-default-vnc.x86_64-4.2.0.xml
new file mode 100644
index 0000000000..613fd40ea1
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-default-vnc.x86_64-4.2.0.xml
@@ -0,0 +1,46 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-4.2'>hvm</type>
+    <boot dev=3D'cdrom'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'cdrom'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/cdrom'/>
+      <target dev=3D'hdc' bus=3D'ide'/>
+      <readonly/>
+      <address type=3D'drive' controller=3D'0' bus=3D'1' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <graphics type=3D'vnc' port=3D'-1' autoport=3D'yes'>
+      <listen type=3D'address'/>
+    </graphics>
+    <audio id=3D'1' type=3D'alsa'/>
+    <video>
+      <model type=3D'cirrus' vram=3D'16384' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/audio-jack-minimal.x86_64-latest.xml =
b/tests/qemuxml2xmloutdata/audio-jack-minimal.x86_64-latest.xml
new file mode 100644
index 0000000000..4ef46d2f79
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-jack-minimal.x86_64-latest.xml
@@ -0,0 +1,39 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'cdrom'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'cdrom'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/cdrom'/>
+      <target dev=3D'hdc' bus=3D'ide'/>
+      <readonly/>
+      <address type=3D'drive' controller=3D'0' bus=3D'1' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'jack'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/balloon-ccw-deflate.s390x-latest.xml =
b/tests/qemuxml2xmloutdata/balloon-ccw-deflate.s390x-latest.xml
new file mode 100644
index 0000000000..8c63852850
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/balloon-ccw-deflate.s390x-latest.xml
@@ -0,0 +1,27 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D's390x' machine=3D's390-ccw-virtio'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio' autodeflate=3D'on'>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x000a'/>
+    </memballoon>
+    <panic model=3D's390'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/balloon-device-deflate-off.x86_64-lat=
est.xml b/tests/qemuxml2xmloutdata/balloon-device-deflate-off.x86_64-latest=
.xml
new file mode 100644
index 0000000000..c550c6df1c
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/balloon-device-deflate-off.x86_64-latest.xml
@@ -0,0 +1,40 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio' autodeflate=3D'off'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x12' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/balloon-device-deflate.x86_64-latest.=
xml b/tests/qemuxml2xmloutdata/balloon-device-deflate.x86_64-latest.xml
new file mode 100644
index 0000000000..dbac7de252
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/balloon-device-deflate.x86_64-latest.xml
@@ -0,0 +1,40 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio' autodeflate=3D'on'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x12' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/balloon-device.x86_64-latest.xml b/te=
sts/qemuxml2xmloutdata/balloon-device.x86_64-latest.xml
new file mode 100644
index 0000000000..34cc9e1d41
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/balloon-device.x86_64-latest.xml
@@ -0,0 +1,40 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x12' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/balloon-mmio-deflate.aarch64-latest.x=
ml b/tests/qemuxml2xmloutdata/balloon-mmio-deflate.aarch64-latest.xml
new file mode 100644
index 0000000000..90ca28ae88
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/balloon-mmio-deflate.aarch64-latest.xml
@@ -0,0 +1,34 @@
+<domain type=3D'qemu'>
+  <name>aarch64test</name>
+  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'aarch64' machine=3D'virt'>hvm</type>
+    <kernel>/aarch64.kernel</kernel>
+    <initrd>/aarch64.initrd</initrd>
+    <cmdline>earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda roo=
twait</cmdline>
+    <dtb>/aarch64.dtb</dtb>
+    <boot dev=3D'hd'/>
+  </os>
+  <features>
+    <apic/>
+    <pae/>
+    <gic version=3D'2'/>
+  </features>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'allow'>cortex-a53</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio' autodeflate=3D'on'>
+      <address type=3D'virtio-mmio'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/boot-complex.x86_64-latest.xml b/test=
s/qemuxml2xmloutdata/boot-complex.x86_64-latest.xml
new file mode 100644
index 0000000000..58793252e1
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/boot-complex.x86_64-latest.xml
@@ -0,0 +1,89 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'cdrom'/>
+    <boot dev=3D'network'/>
+    <boot dev=3D'hd'/>
+    <boot dev=3D'fd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/tmp/vda.img'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/tmp/vdb.img'/>
+      <target dev=3D'vdb' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/hda'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/hdb'/>
+      <target dev=3D'hdb' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'1'/>
+    </disk>
+    <disk type=3D'block' device=3D'cdrom'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/hdc'/>
+      <target dev=3D'hdc' bus=3D'ide'/>
+      <readonly/>
+      <address type=3D'drive' controller=3D'0' bus=3D'1' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'block' device=3D'floppy'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/fd0'/>
+      <target dev=3D'fda' bus=3D'fdc'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'block' device=3D'floppy'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/fd1'/>
+      <target dev=3D'fdb' bus=3D'fdc'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'1'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'fdc' index=3D'0'/>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <interface type=3D'user'>
+      <mac address=3D'00:11:22:33:44:11'/>
+      <model type=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </interface>
+    <interface type=3D'user'>
+      <mac address=3D'00:11:22:33:44:22'/>
+      <model type=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </interface>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/boot-menu-disable-drive.x86_64-latest=
.xml b/tests/qemuxml2xmloutdata/boot-menu-disable-drive.x86_64-latest.xml
new file mode 100644
index 0000000000..62549d7ea0
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/boot-menu-disable-drive.x86_64-latest.xml
@@ -0,0 +1,42 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'cdrom'/>
+    <bootmenu enable=3D'no'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'cdrom'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/cdrom'/>
+      <target dev=3D'hdc' bus=3D'ide'/>
+      <readonly/>
+      <address type=3D'drive' controller=3D'0' bus=3D'1' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/boot-menu-enable.x86_64-latest.xml b/=
tests/qemuxml2xmloutdata/boot-menu-enable.x86_64-latest.xml
new file mode 100644
index 0000000000..17c46f8ddf
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/boot-menu-enable.x86_64-latest.xml
@@ -0,0 +1,42 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'cdrom'/>
+    <bootmenu enable=3D'yes'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'cdrom'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/cdrom'/>
+      <target dev=3D'hdc' bus=3D'ide'/>
+      <readonly/>
+      <address type=3D'drive' controller=3D'0' bus=3D'1' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/channel-spicevmc.x86_64-latest.xml b/=
tests/qemuxml2xmloutdata/channel-spicevmc.x86_64-latest.xml
new file mode 100644
index 0000000000..1add4804a9
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/channel-spicevmc.x86_64-latest.xml
@@ -0,0 +1,55 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static' cpuset=3D'1-4,8-20,525'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'virtio-serial' index=3D'1'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0a' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <channel type=3D'spicevmc'>
+      <target type=3D'virtio' name=3D'com.redhat.spice.0'/>
+      <address type=3D'virtio-serial' controller=3D'1' bus=3D'0' port=3D'3=
'/>
+    </channel>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <graphics type=3D'spice' port=3D'5903' tlsPort=3D'5904' autoport=3D'no=
' listen=3D'127.0.0.1'>
+      <listen type=3D'address' address=3D'127.0.0.1'/>
+      <channel name=3D'main' mode=3D'secure'/>
+    </graphics>
+    <audio id=3D'1' type=3D'spice'/>
+    <video>
+      <model type=3D'cirrus' vram=3D'16384' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/channel-unix-guestfwd.x86_64-latest.x=
ml b/tests/qemuxml2xmloutdata/channel-unix-guestfwd.x86_64-latest.xml
new file mode 100644
index 0000000000..87c41bc2fa
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/channel-unix-guestfwd.x86_64-latest.xml
@@ -0,0 +1,42 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <channel type=3D'unix'>
+      <source mode=3D'bind' path=3D'/tmp/guestfwd-listen.socket'/>
+      <target type=3D'guestfwd' address=3D'10.0.2.1' port=3D'4600'/>
+    </channel>
+    <channel type=3D'unix'>
+      <source mode=3D'connect' path=3D'/tmp/guestfwd-connect.socket'/>
+      <target type=3D'guestfwd' address=3D'10.0.2.1' port=3D'4601'/>
+    </channel>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-autoadd.x86_64-latest.=
xml b/tests/qemuxml2xmloutdata/channel-virtio-autoadd.x86_64-latest.xml
new file mode 100644
index 0000000000..06a9a06705
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/channel-virtio-autoadd.x86_64-latest.xml
@@ -0,0 +1,70 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static' cpuset=3D'1-4,8-20,525'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'virtio-serial' index=3D'0' ports=3D'4' vectors=3D'=
4'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'virtio-serial' index=3D'1'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </controller>
+    <channel type=3D'pty'>
+      <target type=3D'virtio' name=3D'org.linux-kvm.port.0'/>
+      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'1=
'/>
+    </channel>
+    <channel type=3D'pty'>
+      <target type=3D'virtio' name=3D'org.linux-kvm.port.foo'/>
+      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'2=
'/>
+    </channel>
+    <channel type=3D'pty'>
+      <target type=3D'virtio' name=3D'org.linux-kvm.port.bar'/>
+      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'3=
'/>
+    </channel>
+    <channel type=3D'pty'>
+      <target type=3D'virtio' name=3D'org.linux-kvm.port.wizz'/>
+      <address type=3D'virtio-serial' controller=3D'1' bus=3D'0' port=3D'1=
'/>
+    </channel>
+    <channel type=3D'pty'>
+      <target type=3D'virtio' name=3D'org.linux-kvm.port.ooh'/>
+      <address type=3D'virtio-serial' controller=3D'1' bus=3D'0' port=3D'2=
'/>
+    </channel>
+    <channel type=3D'pty'>
+      <target type=3D'virtio' name=3D'org.linux-kvm.port.lla'/>
+      <address type=3D'virtio-serial' controller=3D'1' bus=3D'0' port=3D'3=
'/>
+    </channel>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-autoassign.x86_64-late=
st.xml b/tests/qemuxml2xmloutdata/channel-virtio-autoassign.x86_64-latest.x=
ml
new file mode 100644
index 0000000000..569b97a0db
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/channel-virtio-autoassign.x86_64-latest.xml
@@ -0,0 +1,70 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static' cpuset=3D'1-4,8-20,525'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'virtio-serial' index=3D'0' ports=3D'4' vectors=3D'=
4'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'virtio-serial' index=3D'1'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0a' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <channel type=3D'pty'>
+      <target type=3D'virtio' name=3D'org.linux-kvm.port.0'/>
+      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'2=
'/>
+    </channel>
+    <channel type=3D'pty'>
+      <target type=3D'virtio' name=3D'org.linux-kvm.port.foo'/>
+      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'3=
'/>
+    </channel>
+    <channel type=3D'pty'>
+      <target type=3D'virtio' name=3D'org.linux-kvm.port.bar'/>
+      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'1=
'/>
+    </channel>
+    <channel type=3D'pty'>
+      <target type=3D'virtio' name=3D'org.linux-kvm.port.wizz'/>
+      <address type=3D'virtio-serial' controller=3D'1' bus=3D'0' port=3D'1=
'/>
+    </channel>
+    <channel type=3D'pty'>
+      <target type=3D'virtio' name=3D'org.linux-kvm.port.ooh'/>
+      <address type=3D'virtio-serial' controller=3D'1' bus=3D'0' port=3D'2=
'/>
+    </channel>
+    <channel type=3D'pty'>
+      <target type=3D'virtio' name=3D'org.linux-kvm.port.lla'/>
+      <address type=3D'virtio-serial' controller=3D'1' bus=3D'0' port=3D'3=
'/>
+    </channel>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-default.x86_64-latest.=
xml b/tests/qemuxml2xmloutdata/channel-virtio-default.x86_64-latest.xml
new file mode 100644
index 0000000000..8558bf4c82
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/channel-virtio-default.x86_64-latest.xml
@@ -0,0 +1,61 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static' cpuset=3D'1-4,8-20,525'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'virtio-serial' index=3D'1'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0a' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </controller>
+    <channel type=3D'pty'>
+      <target type=3D'virtio'/>
+      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'1=
'/>
+    </channel>
+    <channel type=3D'spicevmc'>
+      <target type=3D'virtio'/>
+      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'2=
'/>
+    </channel>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <graphics type=3D'spice'>
+      <listen type=3D'none'/>
+    </graphics>
+    <audio id=3D'1' type=3D'spice'/>
+    <video>
+      <model type=3D'cirrus' vram=3D'16384' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-unix.x86_64-latest.xml=
 b/tests/qemuxml2xmloutdata/channel-virtio-unix.x86_64-latest.xml
new file mode 100644
index 0000000000..9cce89d858
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/channel-virtio-unix.x86_64-latest.xml
@@ -0,0 +1,60 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static' cpuset=3D'1-4,8-20,525'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'virtio-serial' index=3D'1'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0a' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </controller>
+    <channel type=3D'unix'>
+      <target type=3D'virtio' name=3D'org.qemu.guest_agent.0'/>
+      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'1=
'/>
+    </channel>
+    <channel type=3D'unix'>
+      <target type=3D'virtio'/>
+      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'2=
'/>
+    </channel>
+    <channel type=3D'unix'>
+      <target type=3D'virtio' name=3D'ble'/>
+      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'3=
'/>
+    </channel>
+    <channel type=3D'unix'>
+      <target type=3D'virtio' name=3D'fdsa'/>
+      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'4=
'/>
+    </channel>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/chardev-reconnect.x86_64-latest.xml b=
/tests/qemuxml2xmloutdata/chardev-reconnect.x86_64-latest.xml
new file mode 100644
index 0000000000..a49818488e
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/chardev-reconnect.x86_64-latest.xml
@@ -0,0 +1,72 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'virtio-serial' index=3D'1'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0a' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'ccid' index=3D'0'/>
+    <smartcard mode=3D'passthrough' type=3D'unix'>
+      <source mode=3D'connect' path=3D'/var/lib/libvirt/qemu/channel/targe=
t/asdf'>
+        <reconnect enabled=3D'yes' timeout=3D'20'/>
+      </source>
+      <address type=3D'ccid' controller=3D'0' slot=3D'0'/>
+    </smartcard>
+    <channel type=3D'tcp'>
+      <source mode=3D'connect' host=3D'localhost' service=3D'1234'>
+        <reconnect enabled=3D'yes' timeout=3D'10'/>
+      </source>
+      <protocol type=3D'raw'/>
+      <target type=3D'virtio' name=3D'asdf'/>
+      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'1=
'/>
+    </channel>
+    <channel type=3D'unix'>
+      <source mode=3D'connect' path=3D'/var/lib/libvirt/qemu/channel/targe=
t/fdsa'>
+        <reconnect enabled=3D'no'/>
+      </source>
+      <target type=3D'virtio' name=3D'fdsa'/>
+      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'2=
'/>
+    </channel>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <redirdev bus=3D'usb' type=3D'tcp'>
+      <source mode=3D'connect' host=3D'localhost' service=3D'3456'>
+        <reconnect enabled=3D'yes' timeout=3D'15'/>
+      </source>
+      <protocol type=3D'raw'/>
+    </redirdev>
+    <memballoon model=3D'none'/>
+    <rng model=3D'virtio'>
+      <backend model=3D'egd' type=3D'tcp'>
+        <source mode=3D'connect' host=3D'localhost' service=3D'2345'>
+          <reconnect enabled=3D'yes' timeout=3D'5'/>
+        </source>
+        <protocol type=3D'raw'/>
+      </backend>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </rng>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/clock-france.x86_64-latest.xml b/test=
s/qemuxml2xmloutdata/clock-france.x86_64-latest.xml
new file mode 100644
index 0000000000..7e35da2a97
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/clock-france.x86_64-latest.xml
@@ -0,0 +1,40 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'timezone' timezone=3D'Europe/Paris'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/clock-hpet-off.x86_64-7.2.0.xml b/tes=
ts/qemuxml2xmloutdata/clock-hpet-off.x86_64-7.2.0.xml
new file mode 100644
index 0000000000..e52460ea49
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/clock-hpet-off.x86_64-7.2.0.xml
@@ -0,0 +1,44 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-7.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </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>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/clock-hpet-off.x86_64-latest.xml b/te=
sts/qemuxml2xmloutdata/clock-hpet-off.x86_64-latest.xml
new file mode 100644
index 0000000000..a9c65d61dc
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/clock-hpet-off.x86_64-latest.xml
@@ -0,0 +1,44 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </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>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/clock-localtime-basis-localtime.x86_6=
4-latest.xml b/tests/qemuxml2xmloutdata/clock-localtime-basis-localtime.x86=
_64-latest.xml
new file mode 100644
index 0000000000..fd3ac7b362
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/clock-localtime-basis-localtime.x86_64-lates=
t.xml
@@ -0,0 +1,40 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>1c15a1f6-f4f0-4d3c-9002-667ddb458736</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'variable' adjustment=3D'3600' basis=3D'localtime'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/clock-variable.x86_64-latest.xml b/te=
sts/qemuxml2xmloutdata/clock-variable.x86_64-latest.xml
new file mode 100644
index 0000000000..da0dbb1d02
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/clock-variable.x86_64-latest.xml
@@ -0,0 +1,40 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'variable' adjustment=3D'123456' basis=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/console-compat-chardev.x86_64-latest.=
xml b/tests/qemuxml2xmloutdata/console-compat-chardev.x86_64-latest.xml
new file mode 100644
index 0000000000..59c454375c
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/console-compat-chardev.x86_64-latest.xml
@@ -0,0 +1,48 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <serial type=3D'pty'>
+      <target type=3D'isa-serial' port=3D'0'>
+        <model name=3D'isa-serial'/>
+      </target>
+    </serial>
+    <console type=3D'pty'>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/console-sclp.s390x-latest.xml b/tests=
/qemuxml2xmloutdata/console-sclp.s390x-latest.xml
new file mode 100644
index 0000000000..1e58902d1f
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/console-sclp.s390x-latest.xml
@@ -0,0 +1,36 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D's390x' machine=3D's390-ccw-virtio'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'virtio'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0000'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <console type=3D'pty'>
+      <target type=3D'sclp' port=3D'0'/>
+    </console>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0001'/>
+    </memballoon>
+    <panic model=3D's390'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/console-virtio-ccw.s390x-latest.xml b=
/tests/qemuxml2xmloutdata/console-virtio-ccw.s390x-latest.xml
new file mode 100644
index 0000000000..95fa0ddd73
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/console-virtio-ccw.s390x-latest.xml
@@ -0,0 +1,39 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D's390x' machine=3D's390-ccw-virtio'>hvm</type>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'virtio'/>
+      <boot order=3D'1'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0000'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0001'/>
+    </controller>
+    <console type=3D'pty'>
+      <target type=3D'virtio' port=3D'0'/>
+    </console>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x000a'/>
+    </memballoon>
+    <panic model=3D's390'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/console-virtio-unix.x86_64-latest.xml=
 b/tests/qemuxml2xmloutdata/console-virtio-unix.x86_64-latest.xml
new file mode 100644
index 0000000000..ff8429dc28
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/console-virtio-unix.x86_64-latest.xml
@@ -0,0 +1,45 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </controller>
+    <console type=3D'unix'>
+      <source mode=3D'bind' path=3D'/tmp/listen.socket'/>
+      <target type=3D'virtio' port=3D'0'/>
+    </console>
+    <console type=3D'unix'>
+      <source mode=3D'connect' path=3D'/tmp/connect.socket'/>
+      <target type=3D'virtio' port=3D'1'/>
+    </console>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/controller-order.x86_64-latest.xml b/=
tests/qemuxml2xmloutdata/controller-order.x86_64-latest.xml
new file mode 100644
index 0000000000..e8446fee95
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/controller-order.x86_64-latest.xml
@@ -0,0 +1,98 @@
+<domain type=3D'kvm'>
+  <name>fdr</name>
+  <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid>
+  <memory unit=3D'KiB'>4194304</memory>
+  <currentMemory unit=3D'KiB'>4194304</currentMemory>
+  <vcpu placement=3D'static'>4</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+    <boot dev=3D'network'/>
+    <boot dev=3D'fd'/>
+    <bootmenu enable=3D'no'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw' cache=3D'none' io=3D'native'/>
+      <source file=3D'/tmp/fdr.img'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <shareable/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'file' device=3D'cdrom'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/tmp/Fedora-17-x86_64-Live-Desktop.iso'/>
+      <target dev=3D'hdc' bus=3D'ide'/>
+      <readonly/>
+      <address type=3D'drive' controller=3D'0' bus=3D'1' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x07' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ccid' index=3D'0'/>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:00:4d:4b:19'/>
+      <model type=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </interface>
+    <smartcard mode=3D'passthrough' type=3D'spicevmc'>
+      <address type=3D'ccid' controller=3D'0' slot=3D'0'/>
+    </smartcard>
+    <serial type=3D'pty'>
+      <target type=3D'isa-serial' port=3D'0'>
+        <model name=3D'isa-serial'/>
+      </target>
+    </serial>
+    <console type=3D'pty'>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <channel type=3D'spicevmc'>
+      <target type=3D'virtio' name=3D'com.redhat.spice.0'/>
+      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'1=
'/>
+    </channel>
+    <input type=3D'tablet' bus=3D'usb'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <graphics type=3D'spice' autoport=3D'yes' listen=3D'0.0.0.0'>
+      <listen type=3D'address' address=3D'0.0.0.0'/>
+    </graphics>
+    <sound model=3D'ich6'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </sound>
+    <audio id=3D'1' type=3D'spice'/>
+    <video>
+      <model type=3D'cirrus' vram=3D'16384' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <hostdev mode=3D'subsystem' type=3D'usb' managed=3D'yes'>
+      <source>
+        <address bus=3D'14' device=3D'6'/>
+      </source>
+    </hostdev>
+    <hub type=3D'usb'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+  <seclabel type=3D'dynamic' model=3D'selinux' relabel=3D'yes'/>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-Haswell-noTSX.x86_64-latest.xml b=
/tests/qemuxml2xmloutdata/cpu-Haswell-noTSX.x86_64-latest.xml
new file mode 100644
index 0000000000..36dace3a53
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-Haswell-noTSX.x86_64-latest.xml
@@ -0,0 +1,31 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'partial'>
+    <model fallback=3D'forbid'>Haswell-noTSX</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-Haswell.x86_64-latest.xml b/tests=
/qemuxml2xmloutdata/cpu-Haswell.x86_64-latest.xml
new file mode 100644
index 0000000000..a0c483e5e4
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-Haswell.x86_64-latest.xml
@@ -0,0 +1,31 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'partial'>
+    <model fallback=3D'forbid'>Haswell</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-Haswell2.x86_64-latest.xml b/test=
s/qemuxml2xmloutdata/cpu-Haswell2.x86_64-latest.xml
new file mode 100644
index 0000000000..458c696cc6
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-Haswell2.x86_64-latest.xml
@@ -0,0 +1,33 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'partial'>
+    <model fallback=3D'forbid'>Haswell</model>
+    <feature policy=3D'disable' name=3D'hle'/>
+    <feature policy=3D'disable' name=3D'rtm'/>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-Haswell3.x86_64-latest.xml b/test=
s/qemuxml2xmloutdata/cpu-Haswell3.x86_64-latest.xml
new file mode 100644
index 0000000000..184370519b
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-Haswell3.x86_64-latest.xml
@@ -0,0 +1,33 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'partial'>
+    <model fallback=3D'forbid'>Haswell</model>
+    <feature policy=3D'require' name=3D'rtm'/>
+    <feature policy=3D'force' name=3D'hle'/>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-cache-disable.x86_64-latest.xml b=
/tests/qemuxml2xmloutdata/cpu-cache-disable.x86_64-latest.xml
new file mode 100644
index 0000000000..8d1c35c6f3
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-cache-disable.x86_64-latest.xml
@@ -0,0 +1,31 @@
+<domain type=3D'kvm'>
+  <name>foo</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-passthrough' check=3D'none' migratable=3D'on'>
+    <cache mode=3D'disable'/>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-cache-disable3.x86_64-latest.xml =
b/tests/qemuxml2xmloutdata/cpu-cache-disable3.x86_64-latest.xml
new file mode 100644
index 0000000000..ed02c4f47a
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-cache-disable3.x86_64-latest.xml
@@ -0,0 +1,31 @@
+<domain type=3D'kvm'>
+  <name>foo</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'>
+    <cache mode=3D'disable'/>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-cache-emulate-l3.x86_64-latest.xm=
l b/tests/qemuxml2xmloutdata/cpu-cache-emulate-l3.x86_64-latest.xml
new file mode 100644
index 0000000000..7384e1cd9f
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-cache-emulate-l3.x86_64-latest.xml
@@ -0,0 +1,31 @@
+<domain type=3D'kvm'>
+  <name>foo</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-passthrough' check=3D'none' migratable=3D'on'>
+    <cache level=3D'3' mode=3D'emulate'/>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-cache-passthrough.x86_64-latest.x=
ml b/tests/qemuxml2xmloutdata/cpu-cache-passthrough.x86_64-latest.xml
new file mode 100644
index 0000000000..154cfe2426
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-cache-passthrough.x86_64-latest.xml
@@ -0,0 +1,31 @@
+<domain type=3D'kvm'>
+  <name>foo</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-passthrough' check=3D'none' migratable=3D'on'>
+    <cache mode=3D'passthrough'/>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-exact1.x86_64-latest.xml b/tests/=
qemuxml2xmloutdata/cpu-exact1.x86_64-latest.xml
new file mode 100644
index 0000000000..a5945ebfb8
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-exact1.x86_64-latest.xml
@@ -0,0 +1,38 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'partial'>
+    <model fallback=3D'allow'>qemu64</model>
+    <feature policy=3D'disable' name=3D'mca'/>
+    <feature policy=3D'disable' name=3D'pse36'/>
+    <feature policy=3D'disable' name=3D'clflush'/>
+    <feature policy=3D'disable' name=3D'syscall'/>
+    <feature policy=3D'disable' name=3D'nx'/>
+    <feature policy=3D'disable' name=3D'lm'/>
+    <feature policy=3D'disable' name=3D'svm'/>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-exact2-nofallback.x86_64-latest.x=
ml b/tests/qemuxml2xmloutdata/cpu-exact2-nofallback.x86_64-latest.xml
new file mode 100644
index 0000000000..d66d0a182b
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-exact2-nofallback.x86_64-latest.xml
@@ -0,0 +1,45 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'partial'>
+    <model fallback=3D'forbid'>core2duo</model>
+    <feature policy=3D'require' name=3D'ds'/>
+    <feature policy=3D'require' name=3D'ht'/>
+    <feature policy=3D'optional' name=3D'tm'/>
+    <feature policy=3D'require' name=3D'ds_cpl'/>
+    <feature policy=3D'require' name=3D'xtpr'/>
+    <feature policy=3D'force' name=3D'3dnowext'/>
+    <feature policy=3D'require' name=3D'lahf_lm'/>
+    <feature policy=3D'disable' name=3D'nx'/>
+    <feature policy=3D'disable' name=3D'cx16'/>
+    <feature policy=3D'disable' name=3D'tm2'/>
+    <feature policy=3D'disable' name=3D'pbe'/>
+    <feature policy=3D'disable' name=3D'ss'/>
+    <feature policy=3D'optional' name=3D'sse4a'/>
+    <feature policy=3D'forbid' name=3D'wdt'/>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-exact2.x86_64-latest.xml b/tests/=
qemuxml2xmloutdata/cpu-exact2.x86_64-latest.xml
new file mode 100644
index 0000000000..7dccf6902c
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-exact2.x86_64-latest.xml
@@ -0,0 +1,45 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'partial'>
+    <model fallback=3D'allow'>core2duo</model>
+    <feature policy=3D'require' name=3D'ds'/>
+    <feature policy=3D'require' name=3D'ht'/>
+    <feature policy=3D'optional' name=3D'tm'/>
+    <feature policy=3D'require' name=3D'ds_cpl'/>
+    <feature policy=3D'require' name=3D'xtpr'/>
+    <feature policy=3D'force' name=3D'3dnowext'/>
+    <feature policy=3D'require' name=3D'lahf_lm'/>
+    <feature policy=3D'disable' name=3D'nx'/>
+    <feature policy=3D'disable' name=3D'cx16'/>
+    <feature policy=3D'disable' name=3D'tm2'/>
+    <feature policy=3D'disable' name=3D'pbe'/>
+    <feature policy=3D'disable' name=3D'ss'/>
+    <feature policy=3D'optional' name=3D'sse4a'/>
+    <feature policy=3D'forbid' name=3D'wdt'/>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-fallback.x86_64-5.2.0.xml b/tests=
/qemuxml2xmloutdata/cpu-fallback.x86_64-5.2.0.xml
new file mode 100644
index 0000000000..0f5e606abc
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-fallback.x86_64-5.2.0.xml
@@ -0,0 +1,40 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.2'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'partial'>
+    <model fallback=3D'allow'>EPYC-Milan</model>
+    <feature policy=3D'disable' name=3D'amd-ssbd'/>
+    <feature policy=3D'disable' name=3D'erms'/>
+    <feature policy=3D'disable' name=3D'fsrm'/>
+    <feature policy=3D'disable' name=3D'ibrs'/>
+    <feature policy=3D'disable' name=3D'invpcid'/>
+    <feature policy=3D'disable' name=3D'pcid'/>
+    <feature policy=3D'disable' name=3D'pku'/>
+    <feature policy=3D'disable' name=3D'svme-addr-chk'/>
+    <feature policy=3D'disable' name=3D'xsaves'/>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-fallback.x86_64-8.0.0.xml b/tests=
/qemuxml2xmloutdata/cpu-fallback.x86_64-8.0.0.xml
new file mode 100644
index 0000000000..865d1586bc
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-fallback.x86_64-8.0.0.xml
@@ -0,0 +1,40 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-8.0'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'partial'>
+    <model fallback=3D'allow'>EPYC-Milan</model>
+    <feature policy=3D'disable' name=3D'amd-ssbd'/>
+    <feature policy=3D'disable' name=3D'erms'/>
+    <feature policy=3D'disable' name=3D'fsrm'/>
+    <feature policy=3D'disable' name=3D'ibrs'/>
+    <feature policy=3D'disable' name=3D'invpcid'/>
+    <feature policy=3D'disable' name=3D'pcid'/>
+    <feature policy=3D'disable' name=3D'pku'/>
+    <feature policy=3D'disable' name=3D'svme-addr-chk'/>
+    <feature policy=3D'disable' name=3D'xsaves'/>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-cmt.x86_64-latest.xml =
b/tests/qemuxml2xmloutdata/cpu-host-model-cmt.x86_64-latest.xml
new file mode 100644
index 0000000000..9a1c602064
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-cmt.x86_64-latest.xml
@@ -0,0 +1,29 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-4.=
2.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-4.2.0=
.xml
new file mode 100644
index 0000000000..8ceb15959b
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-4.2.0.xml
@@ -0,0 +1,29 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-4.2'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-5.=
0.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-5.0.0=
.xml
new file mode 100644
index 0000000000..b9fb6b252f
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-5.0.0.xml
@@ -0,0 +1,29 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.0'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-5.=
1.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-5.1.0=
.xml
new file mode 100644
index 0000000000..592816f5d8
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-5.1.0.xml
@@ -0,0 +1,29 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.1'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-5.=
2.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-5.2.0=
.xml
new file mode 100644
index 0000000000..54d410f06d
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-5.2.0.xml
@@ -0,0 +1,29 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.2'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-6.=
0.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-6.0.0=
.xml
new file mode 100644
index 0000000000..744cf75b91
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-6.0.0.xml
@@ -0,0 +1,29 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-6.0'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-6.=
1.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-6.1.0=
.xml
new file mode 100644
index 0000000000..4b2d3cf008
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-6.1.0.xml
@@ -0,0 +1,29 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-6.1'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-6.=
2.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-6.2.0=
.xml
new file mode 100644
index 0000000000..946989db24
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-6.2.0.xml
@@ -0,0 +1,29 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-6.2'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-7.=
0.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-7.0.0=
.xml
new file mode 100644
index 0000000000..0a9e8ac441
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-7.0.0.xml
@@ -0,0 +1,29 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-7.0'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-7.=
1.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-7.1.0=
.xml
new file mode 100644
index 0000000000..179670f794
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-7.1.0.xml
@@ -0,0 +1,29 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-7.1'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-7.=
2.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-7.2.0=
.xml
new file mode 100644
index 0000000000..3596e14511
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-7.2.0.xml
@@ -0,0 +1,29 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-7.2'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-8.=
0.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-8.0.0=
.xml
new file mode 100644
index 0000000000..31678de9e3
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-8.0.0.xml
@@ -0,0 +1,29 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-8.0'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-8.=
1.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-8.1.0=
.xml
new file mode 100644
index 0000000000..31f406d2a4
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-8.1.0.xml
@@ -0,0 +1,29 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-8.1'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-la=
test.xml b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-late=
st.xml
new file mode 100644
index 0000000000..8772918cdc
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-kvm.x86_64-latest.xml
@@ -0,0 +1,29 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-4.=
2.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-4.2.0=
.xml
new file mode 100644
index 0000000000..f8a6358682
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-4.2.0.xml
@@ -0,0 +1,29 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-4.2'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-5.=
0.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-5.0.0=
.xml
new file mode 100644
index 0000000000..1c41b7cae3
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-5.0.0.xml
@@ -0,0 +1,29 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.0'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-5.=
1.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-5.1.0=
.xml
new file mode 100644
index 0000000000..2531aebb66
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-5.1.0.xml
@@ -0,0 +1,29 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.1'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-5.=
2.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-5.2.0=
.xml
new file mode 100644
index 0000000000..7530386c1e
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-5.2.0.xml
@@ -0,0 +1,29 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.2'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-6.=
0.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-6.0.0=
.xml
new file mode 100644
index 0000000000..3acb35f395
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-6.0.0.xml
@@ -0,0 +1,29 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-6.0'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-6.=
1.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-6.1.0=
.xml
new file mode 100644
index 0000000000..acda20f811
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-6.1.0.xml
@@ -0,0 +1,29 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-6.1'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-6.=
2.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-6.2.0=
.xml
new file mode 100644
index 0000000000..ac4de2d615
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-6.2.0.xml
@@ -0,0 +1,29 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-6.2'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-7.=
0.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-7.0.0=
.xml
new file mode 100644
index 0000000000..fc631b4d60
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-7.0.0.xml
@@ -0,0 +1,29 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-7.0'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-7.=
1.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-7.1.0=
.xml
new file mode 100644
index 0000000000..9225a44994
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-7.1.0.xml
@@ -0,0 +1,29 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-7.1'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-7.=
2.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-7.2.0=
.xml
new file mode 100644
index 0000000000..966370ea5a
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-7.2.0.xml
@@ -0,0 +1,29 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-7.2'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-8.=
0.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-8.0.0=
.xml
new file mode 100644
index 0000000000..6cac57a3fd
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-8.0.0.xml
@@ -0,0 +1,29 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-8.0'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-8.=
1.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-8.1.0=
.xml
new file mode 100644
index 0000000000..00d20a644c
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-8.1.0.xml
@@ -0,0 +1,29 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-8.1'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-la=
test.xml b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-late=
st.xml
new file mode 100644
index 0000000000..9a1c602064
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-fallback-tcg.x86_64-latest.xml
@@ -0,0 +1,29 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-4.2.0.xml b=
/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-4.2.0.xml
new file mode 100644
index 0000000000..edfc1696ed
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-4.2.0.xml
@@ -0,0 +1,48 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-4.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-5.0.0.xml b=
/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-5.0.0.xml
new file mode 100644
index 0000000000..6e99b799cb
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-5.0.0.xml
@@ -0,0 +1,48 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-5.0'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-5.1.0.xml b=
/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-5.1.0.xml
new file mode 100644
index 0000000000..258bdc3fbf
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-5.1.0.xml
@@ -0,0 +1,48 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-5.1'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-5.2.0.xml b=
/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-5.2.0.xml
new file mode 100644
index 0000000000..e025fdbbfa
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-5.2.0.xml
@@ -0,0 +1,48 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-5.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-6.0.0.xml b=
/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-6.0.0.xml
new file mode 100644
index 0000000000..c624e0c352
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-6.0.0.xml
@@ -0,0 +1,48 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-6.0'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-6.1.0.xml b=
/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-6.1.0.xml
new file mode 100644
index 0000000000..c28bfaf026
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-6.1.0.xml
@@ -0,0 +1,48 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-6.1'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-6.2.0.xml b=
/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-6.2.0.xml
new file mode 100644
index 0000000000..9265aa9651
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-6.2.0.xml
@@ -0,0 +1,48 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-6.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-7.0.0.xml b=
/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-7.0.0.xml
new file mode 100644
index 0000000000..3e37b8b5cf
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-7.0.0.xml
@@ -0,0 +1,48 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-7.0'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-7.1.0.xml b=
/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-7.1.0.xml
new file mode 100644
index 0000000000..4d80e22399
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-7.1.0.xml
@@ -0,0 +1,48 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-7.1'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-7.2.0.xml b=
/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-7.2.0.xml
new file mode 100644
index 0000000000..9637e7cd24
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-7.2.0.xml
@@ -0,0 +1,48 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-7.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-8.0.0.xml b=
/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-8.0.0.xml
new file mode 100644
index 0000000000..53325fddbd
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-8.0.0.xml
@@ -0,0 +1,48 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-8.0'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-8.1.0.xml b=
/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-8.1.0.xml
new file mode 100644
index 0000000000..0506347661
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-8.1.0.xml
@@ -0,0 +1,48 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-8.1'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-latest.xml =
b/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-latest.xml
new file mode 100644
index 0000000000..6b245f6b9d
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-kvm.x86_64-latest.xml
@@ -0,0 +1,48 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'q35'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-=
4.2.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-4=
.2.0.xml
new file mode 100644
index 0000000000..8ceb15959b
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-4.2.0.x=
ml
@@ -0,0 +1,29 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-4.2'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-=
5.0.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-5=
.0.0.xml
new file mode 100644
index 0000000000..b9fb6b252f
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-5.0.0.x=
ml
@@ -0,0 +1,29 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.0'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-=
5.1.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-5=
.1.0.xml
new file mode 100644
index 0000000000..592816f5d8
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-5.1.0.x=
ml
@@ -0,0 +1,29 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.1'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-=
5.2.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-5=
.2.0.xml
new file mode 100644
index 0000000000..54d410f06d
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-5.2.0.x=
ml
@@ -0,0 +1,29 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.2'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-=
6.0.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-6=
.0.0.xml
new file mode 100644
index 0000000000..744cf75b91
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-6.0.0.x=
ml
@@ -0,0 +1,29 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-6.0'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-=
6.1.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-6=
.1.0.xml
new file mode 100644
index 0000000000..4b2d3cf008
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-6.1.0.x=
ml
@@ -0,0 +1,29 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-6.1'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-=
6.2.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-6=
.2.0.xml
new file mode 100644
index 0000000000..946989db24
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-6.2.0.x=
ml
@@ -0,0 +1,29 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-6.2'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-=
7.0.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-7=
.0.0.xml
new file mode 100644
index 0000000000..0a9e8ac441
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-7.0.0.x=
ml
@@ -0,0 +1,29 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-7.0'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-=
7.1.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-7=
.1.0.xml
new file mode 100644
index 0000000000..179670f794
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-7.1.0.x=
ml
@@ -0,0 +1,29 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-7.1'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-=
7.2.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-7=
.2.0.xml
new file mode 100644
index 0000000000..3596e14511
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-7.2.0.x=
ml
@@ -0,0 +1,29 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-7.2'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-=
8.0.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-8=
.0.0.xml
new file mode 100644
index 0000000000..31678de9e3
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-8.0.0.x=
ml
@@ -0,0 +1,29 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-8.0'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-=
8.1.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-8=
.1.0.xml
new file mode 100644
index 0000000000..31f406d2a4
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-8.1.0.x=
ml
@@ -0,0 +1,29 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-8.1'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-=
latest.xml b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-=
latest.xml
new file mode 100644
index 0000000000..8772918cdc
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-kvm.x86_64-latest.=
xml
@@ -0,0 +1,29 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-=
4.2.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-4=
.2.0.xml
new file mode 100644
index 0000000000..f8a6358682
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-4.2.0.x=
ml
@@ -0,0 +1,29 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-4.2'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-=
5.0.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-5=
.0.0.xml
new file mode 100644
index 0000000000..1c41b7cae3
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-5.0.0.x=
ml
@@ -0,0 +1,29 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.0'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-=
5.1.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-5=
.1.0.xml
new file mode 100644
index 0000000000..2531aebb66
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-5.1.0.x=
ml
@@ -0,0 +1,29 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.1'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-=
5.2.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-5=
.2.0.xml
new file mode 100644
index 0000000000..7530386c1e
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-5.2.0.x=
ml
@@ -0,0 +1,29 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.2'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-=
6.0.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-6=
.0.0.xml
new file mode 100644
index 0000000000..3acb35f395
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-6.0.0.x=
ml
@@ -0,0 +1,29 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-6.0'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-=
6.1.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-6=
.1.0.xml
new file mode 100644
index 0000000000..acda20f811
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-6.1.0.x=
ml
@@ -0,0 +1,29 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-6.1'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-=
6.2.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-6=
.2.0.xml
new file mode 100644
index 0000000000..ac4de2d615
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-6.2.0.x=
ml
@@ -0,0 +1,29 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-6.2'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-=
7.0.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-7=
.0.0.xml
new file mode 100644
index 0000000000..fc631b4d60
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-7.0.0.x=
ml
@@ -0,0 +1,29 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-7.0'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-=
7.1.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-7=
.1.0.xml
new file mode 100644
index 0000000000..9225a44994
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-7.1.0.x=
ml
@@ -0,0 +1,29 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-7.1'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-=
7.2.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-7=
.2.0.xml
new file mode 100644
index 0000000000..966370ea5a
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-7.2.0.x=
ml
@@ -0,0 +1,29 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-7.2'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-=
8.0.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-8=
.0.0.xml
new file mode 100644
index 0000000000..6cac57a3fd
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-8.0.0.x=
ml
@@ -0,0 +1,29 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-8.0'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-=
8.1.0.xml b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-8=
.1.0.xml
new file mode 100644
index 0000000000..00d20a644c
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-8.1.0.x=
ml
@@ -0,0 +1,29 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-8.1'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-=
latest.xml b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-=
latest.xml
new file mode 100644
index 0000000000..9a1c602064
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-nofallback-tcg.x86_64-latest.=
xml
@@ -0,0 +1,29 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-4.2.0.xml b=
/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-4.2.0.xml
new file mode 100644
index 0000000000..5090ed4251
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-4.2.0.xml
@@ -0,0 +1,48 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-4.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-5.0.0.xml b=
/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-5.0.0.xml
new file mode 100644
index 0000000000..86aa1e27d2
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-5.0.0.xml
@@ -0,0 +1,48 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-5.0'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-5.1.0.xml b=
/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-5.1.0.xml
new file mode 100644
index 0000000000..4d4fd90b27
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-5.1.0.xml
@@ -0,0 +1,48 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-5.1'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-5.2.0.xml b=
/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-5.2.0.xml
new file mode 100644
index 0000000000..4c334dcf20
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-5.2.0.xml
@@ -0,0 +1,48 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-5.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-6.0.0.xml b=
/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-6.0.0.xml
new file mode 100644
index 0000000000..201891dcf1
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-6.0.0.xml
@@ -0,0 +1,48 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-6.0'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-6.1.0.xml b=
/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-6.1.0.xml
new file mode 100644
index 0000000000..594ab46d39
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-6.1.0.xml
@@ -0,0 +1,48 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-6.1'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-6.2.0.xml b=
/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-6.2.0.xml
new file mode 100644
index 0000000000..3cc3b1faf5
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-6.2.0.xml
@@ -0,0 +1,48 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-6.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-7.0.0.xml b=
/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-7.0.0.xml
new file mode 100644
index 0000000000..b413ddeab6
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-7.0.0.xml
@@ -0,0 +1,48 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-7.0'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-7.1.0.xml b=
/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-7.1.0.xml
new file mode 100644
index 0000000000..fce26032b6
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-7.1.0.xml
@@ -0,0 +1,48 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-7.1'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-7.2.0.xml b=
/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-7.2.0.xml
new file mode 100644
index 0000000000..e9508469e2
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-7.2.0.xml
@@ -0,0 +1,48 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-7.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-8.0.0.xml b=
/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-8.0.0.xml
new file mode 100644
index 0000000000..0c9da63ded
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-8.0.0.xml
@@ -0,0 +1,48 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-8.0'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-8.1.0.xml b=
/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-8.1.0.xml
new file mode 100644
index 0000000000..7717d359a4
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-8.1.0.xml
@@ -0,0 +1,48 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-8.1'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-latest.xml =
b/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-latest.xml
new file mode 100644
index 0000000000..8089736d61
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-tcg.x86_64-latest.xml
@@ -0,0 +1,48 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'q35'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-passthrough.x86_64-latest.xm=
l b/tests/qemuxml2xmloutdata/cpu-host-passthrough.x86_64-latest.xml
new file mode 100644
index 0000000000..9b17034cd2
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-host-passthrough.x86_64-latest.xml
@@ -0,0 +1,29 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-passthrough' check=3D'none' migratable=3D'on'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-hotplug-startup.x86_64-latest.xml=
 b/tests/qemuxml2xmloutdata/cpu-hotplug-startup.x86_64-latest.xml
new file mode 100644
index 0000000000..bbfb4f54da
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-hotplug-startup.x86_64-latest.xml
@@ -0,0 +1,40 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static' current=3D'3'>6</vcpu>
+  <vcpus>
+    <vcpu id=3D'0' enabled=3D'yes' hotpluggable=3D'no' order=3D'1'/>
+    <vcpu id=3D'1' enabled=3D'no' hotpluggable=3D'yes'/>
+    <vcpu id=3D'2' enabled=3D'no' hotpluggable=3D'yes'/>
+    <vcpu id=3D'3' enabled=3D'no' hotpluggable=3D'yes'/>
+    <vcpu id=3D'4' enabled=3D'yes' hotpluggable=3D'yes' order=3D'2'/>
+    <vcpu id=3D'5' enabled=3D'yes' hotpluggable=3D'yes' order=3D'3'/>
+  </vcpus>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+    <topology sockets=3D'3' dies=3D'1' cores=3D'2' threads=3D'1'/>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-minimum1.x86_64-latest.xml b/test=
s/qemuxml2xmloutdata/cpu-minimum1.x86_64-latest.xml
new file mode 100644
index 0000000000..28084c09a8
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-minimum1.x86_64-latest.xml
@@ -0,0 +1,31 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'minimum' check=3D'partial'>
+    <model fallback=3D'allow'>486</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-minimum2.x86_64-latest.xml b/test=
s/qemuxml2xmloutdata/cpu-minimum2.x86_64-latest.xml
new file mode 100644
index 0000000000..7cc4cfe5e8
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-minimum2.x86_64-latest.xml
@@ -0,0 +1,35 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'minimum' check=3D'partial'>
+    <model fallback=3D'allow'>qemu64</model>
+    <feature policy=3D'disable' name=3D'syscall'/>
+    <feature policy=3D'disable' name=3D'nx'/>
+    <feature policy=3D'disable' name=3D'lm'/>
+    <feature policy=3D'disable' name=3D'svm'/>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-no-removed-features.x86_64-latest=
.xml b/tests/qemuxml2xmloutdata/cpu-no-removed-features.x86_64-latest.xml
new file mode 100644
index 0000000000..1dbd0000a6
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-no-removed-features.x86_64-latest.xml
@@ -0,0 +1,33 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'partial'>
+    <model fallback=3D'allow'>core2duo</model>
+    <feature policy=3D'optional' name=3D'osxsave'/>
+    <feature policy=3D'optional' name=3D'ospke'/>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-nofallback.x86_64-5.2.0.xml b/tes=
ts/qemuxml2xmloutdata/cpu-nofallback.x86_64-5.2.0.xml
new file mode 100644
index 0000000000..81e33d64bd
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-nofallback.x86_64-5.2.0.xml
@@ -0,0 +1,40 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.2'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'partial'>
+    <model fallback=3D'forbid'>EPYC-Milan</model>
+    <feature policy=3D'disable' name=3D'amd-ssbd'/>
+    <feature policy=3D'disable' name=3D'erms'/>
+    <feature policy=3D'disable' name=3D'fsrm'/>
+    <feature policy=3D'disable' name=3D'ibrs'/>
+    <feature policy=3D'disable' name=3D'invpcid'/>
+    <feature policy=3D'disable' name=3D'pcid'/>
+    <feature policy=3D'disable' name=3D'pku'/>
+    <feature policy=3D'disable' name=3D'svme-addr-chk'/>
+    <feature policy=3D'disable' name=3D'xsaves'/>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-nofallback.x86_64-8.0.0.xml b/tes=
ts/qemuxml2xmloutdata/cpu-nofallback.x86_64-8.0.0.xml
new file mode 100644
index 0000000000..35bf0d3a41
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-nofallback.x86_64-8.0.0.xml
@@ -0,0 +1,40 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-8.0'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'partial'>
+    <model fallback=3D'forbid'>EPYC-Milan</model>
+    <feature policy=3D'disable' name=3D'amd-ssbd'/>
+    <feature policy=3D'disable' name=3D'erms'/>
+    <feature policy=3D'disable' name=3D'fsrm'/>
+    <feature policy=3D'disable' name=3D'ibrs'/>
+    <feature policy=3D'disable' name=3D'invpcid'/>
+    <feature policy=3D'disable' name=3D'pcid'/>
+    <feature policy=3D'disable' name=3D'pku'/>
+    <feature policy=3D'disable' name=3D'svme-addr-chk'/>
+    <feature policy=3D'disable' name=3D'xsaves'/>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-phys-bits-emulate.x86_64-latest.x=
ml b/tests/qemuxml2xmloutdata/cpu-phys-bits-emulate.x86_64-latest.xml
new file mode 100644
index 0000000000..5ef7b901bc
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-phys-bits-emulate.x86_64-latest.xml
@@ -0,0 +1,31 @@
+<domain type=3D'kvm'>
+  <name>foo</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-passthrough' check=3D'none' migratable=3D'on'>
+    <maxphysaddr mode=3D'emulate' bits=3D'42'/>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-phys-bits-emulate2.x86_64-latest.=
xml b/tests/qemuxml2xmloutdata/cpu-phys-bits-emulate2.x86_64-latest.xml
new file mode 100644
index 0000000000..cf7844333c
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-phys-bits-emulate2.x86_64-latest.xml
@@ -0,0 +1,31 @@
+<domain type=3D'kvm'>
+  <name>foo</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'>
+    <maxphysaddr mode=3D'emulate' bits=3D'42'/>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-phys-bits-passthrough.x86_64-late=
st.xml b/tests/qemuxml2xmloutdata/cpu-phys-bits-passthrough.x86_64-latest.x=
ml
new file mode 100644
index 0000000000..27f8c0194d
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-phys-bits-passthrough.x86_64-latest.xml
@@ -0,0 +1,31 @@
+<domain type=3D'kvm'>
+  <name>foo</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-passthrough' check=3D'none' migratable=3D'on'>
+    <maxphysaddr mode=3D'passthrough'/>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-qemu-host-passthrough.x86_64-late=
st.xml b/tests/qemuxml2xmloutdata/cpu-qemu-host-passthrough.x86_64-latest.x=
ml
new file mode 100644
index 0000000000..34c4f2f577
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-qemu-host-passthrough.x86_64-latest.xml
@@ -0,0 +1,29 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'host-passthrough' check=3D'none' migratable=3D'on'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-s390-features.s390x-latest.xml b/=
tests/qemuxml2xmloutdata/cpu-s390-features.s390x-latest.xml
new file mode 100644
index 0000000000..785695292a
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-s390-features.s390x-latest.xml
@@ -0,0 +1,27 @@
+<domain type=3D'kvm'>
+  <name>guest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D's390x' machine=3D's390-ccw-virtio'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'partial'>
+    <model fallback=3D'forbid'>zEC12</model>
+    <feature policy=3D'require' name=3D'dfppc'/>
+    <feature policy=3D'disable' name=3D'stckf'/>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+    <panic model=3D's390'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-s390-zEC12.s390x-latest.xml b/tes=
ts/qemuxml2xmloutdata/cpu-s390-zEC12.s390x-latest.xml
new file mode 100644
index 0000000000..da273daeb9
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-s390-zEC12.s390x-latest.xml
@@ -0,0 +1,25 @@
+<domain type=3D'kvm'>
+  <name>guest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D's390x' machine=3D's390-ccw-virtio'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'partial'>
+    <model fallback=3D'forbid'>zEC12</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+    <panic model=3D's390'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-strict1.x86_64-latest.xml b/tests=
/qemuxml2xmloutdata/cpu-strict1.x86_64-latest.xml
new file mode 100644
index 0000000000..beeaf5c682
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-strict1.x86_64-latest.xml
@@ -0,0 +1,58 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'strict' check=3D'partial'>
+    <model fallback=3D'allow'>Haswell</model>
+    <feature policy=3D'require' name=3D'ds'/>
+    <feature policy=3D'optional' name=3D'acpi'/>
+    <feature policy=3D'require' name=3D'ht'/>
+    <feature policy=3D'optional' name=3D'tm'/>
+    <feature policy=3D'require' name=3D'ds_cpl'/>
+    <feature policy=3D'optional' name=3D'vmx'/>
+    <feature policy=3D'optional' name=3D'est'/>
+    <feature policy=3D'require' name=3D'xtpr'/>
+    <feature policy=3D'force' name=3D'3dnowext'/>
+    <feature policy=3D'require' name=3D'lahf_lm'/>
+    <feature policy=3D'disable' name=3D'nx'/>
+    <feature policy=3D'disable' name=3D'cx16'/>
+    <feature policy=3D'disable' name=3D'tm2'/>
+    <feature policy=3D'disable' name=3D'pbe'/>
+    <feature policy=3D'disable' name=3D'ss'/>
+    <feature policy=3D'optional' name=3D'sse4a'/>
+    <feature policy=3D'forbid' name=3D'wdt'/>
+    <feature policy=3D'disable' name=3D'vme'/>
+    <feature policy=3D'disable' name=3D'invtsc'/>
+    <feature policy=3D'disable' name=3D'abm'/>
+    <feature policy=3D'disable' name=3D'pdpe1gb'/>
+    <feature policy=3D'disable' name=3D'rdrand'/>
+    <feature policy=3D'disable' name=3D'f16c'/>
+    <feature policy=3D'disable' name=3D'pdcm'/>
+    <feature policy=3D'disable' name=3D'smx'/>
+    <feature policy=3D'disable' name=3D'monitor'/>
+    <feature policy=3D'disable' name=3D'dtes64'/>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-topology1.x86_64-latest.xml b/tes=
ts/qemuxml2xmloutdata/cpu-topology1.x86_64-latest.xml
new file mode 100644
index 0000000000..7576e3b165
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-topology1.x86_64-latest.xml
@@ -0,0 +1,32 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static' current=3D'1'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+    <topology sockets=3D'3' dies=3D'1' cores=3D'2' threads=3D'1'/>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-topology2.x86_64-latest.xml b/tes=
ts/qemuxml2xmloutdata/cpu-topology2.x86_64-latest.xml
new file mode 100644
index 0000000000..f21a8e26e9
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-topology2.x86_64-latest.xml
@@ -0,0 +1,32 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+    <topology sockets=3D'1' dies=3D'1' cores=3D'2' threads=3D'3'/>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-topology3.x86_64-latest.xml b/tes=
ts/qemuxml2xmloutdata/cpu-topology3.x86_64-latest.xml
new file mode 100644
index 0000000000..5ecf5d88ac
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-topology3.x86_64-latest.xml
@@ -0,0 +1,32 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+    <topology sockets=3D'3' dies=3D'1' cores=3D'2' threads=3D'1'/>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-topology4.x86_64-latest.xml b/tes=
ts/qemuxml2xmloutdata/cpu-topology4.x86_64-latest.xml
new file mode 100644
index 0000000000..71cb98674d
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-topology4.x86_64-latest.xml
@@ -0,0 +1,32 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static' current=3D'1'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+    <topology sockets=3D'1' dies=3D'3' cores=3D'2' threads=3D'1'/>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-translation.x86_64-latest.xml b/t=
ests/qemuxml2xmloutdata/cpu-translation.x86_64-latest.xml
new file mode 100644
index 0000000000..e7f8b710a7
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-translation.x86_64-latest.xml
@@ -0,0 +1,44 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-fade-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <features>
+    <apic eoi=3D'on'/>
+    <pvspinlock state=3D'on'/>
+  </features>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>Haswell</model>
+    <feature policy=3D'require' name=3D'pclmuldq'/>
+    <feature policy=3D'require' name=3D'ds_cpl'/>
+    <feature policy=3D'require' name=3D'tsc_adjust'/>
+    <feature policy=3D'require' name=3D'fxsr_opt'/>
+    <feature policy=3D'require' name=3D'lahf_lm'/>
+    <feature policy=3D'require' name=3D'cmp_legacy'/>
+    <feature policy=3D'require' name=3D'nodeid_msr'/>
+    <feature policy=3D'require' name=3D'perfctr_core'/>
+    <feature policy=3D'require' name=3D'perfctr_nb'/>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/cpu-tsc-frequency.x86_64-latest.xml b=
/tests/qemuxml2xmloutdata/cpu-tsc-frequency.x86_64-latest.xml
new file mode 100644
index 0000000000..ad889ca691
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/cpu-tsc-frequency.x86_64-latest.xml
@@ -0,0 +1,41 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <title>A description of the test machine.</title>
+  <description>
+      A test of qemu&apos;s minimal configuration.
+      This test also tests the description and title elements.
+  </description>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'>
+    <feature policy=3D'require' name=3D'invtsc'/>
+  </cpu>
+  <clock offset=3D'utc'>
+    <timer name=3D'tsc' frequency=3D'4567890000'/>
+  </clock>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-cdrom-network-nbdkit.x86_64-late=
st.xml b/tests/qemuxml2xmloutdata/disk-cdrom-network-nbdkit.x86_64-latest.x=
ml
new file mode 100644
index 0000000000..86f8ccf921
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-cdrom-network-nbdkit.x86_64-latest.xml
@@ -0,0 +1,72 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'cdrom'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'network' device=3D'cdrom'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source protocol=3D'ftp' name=3D'/url/path/file.iso'>
+        <host name=3D'host.name' port=3D'21'/>
+      </source>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <readonly/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'network' device=3D'cdrom'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source protocol=3D'ftps' name=3D'/url/path/file.iso'>
+        <host name=3D'host.name' port=3D'990'/>
+        <auth username=3D'testuser'>
+          <secret type=3D'iscsi' usage=3D'mycluster_myname'/>
+        </auth>
+      </source>
+      <target dev=3D'hdb' bus=3D'ide'/>
+      <readonly/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'1'/>
+    </disk>
+    <disk type=3D'network' device=3D'cdrom'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source protocol=3D'https' name=3D'/url/path/file.iso' query=3D'test=
=3Dval'>
+        <host name=3D'host.name' port=3D'443'/>
+        <auth username=3D'testuser'>
+          <secret type=3D'iscsi' usage=3D'mycluster_myname'/>
+        </auth>
+      </source>
+      <target dev=3D'hdc' bus=3D'ide'/>
+      <readonly/>
+      <address type=3D'drive' controller=3D'0' bus=3D'1' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-cdrom-tray.x86_64-latest.xml b/t=
ests/qemuxml2xmloutdata/disk-cdrom-tray.x86_64-latest.xml
new file mode 100644
index 0000000000..1490dedbf1
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-cdrom-tray.x86_64-latest.xml
@@ -0,0 +1,56 @@
+<domain type=3D'qemu'>
+  <name>test</name>
+  <uuid>3fa02811-7832-34bd-004d-1ff56a9286ff</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'cdrom'/>
+    <boot dev=3D'hd'/>
+    <bootmenu enable=3D'yes'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <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/f14.img'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'file' device=3D'cdrom'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/>
+      <target dev=3D'hdc' bus=3D'ide'/>
+      <readonly/>
+      <address type=3D'drive' controller=3D'0' bus=3D'1' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'file' device=3D'cdrom'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/tmp/cdrom.img'/>
+      <target dev=3D'hdd' bus=3D'ide' tray=3D'open'/>
+      <readonly/>
+      <address type=3D'drive' controller=3D'0' bus=3D'1' target=3D'0' unit=
=3D'1'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-device-removable.x86_64-latest.x=
ml b/tests/qemuxml2xmloutdata/disk-device-removable.x86_64-latest.xml
new file mode 100644
index 0000000000..2fd3284dee
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-device-removable.x86_64-latest.xml
@@ -0,0 +1,54 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/tmp/usbdisk.img'/>
+      <target dev=3D'sda' bus=3D'usb' removable=3D'on'/>
+    </disk>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/tmp/scsidisk.img'/>
+      <target dev=3D'sdb' bus=3D'scsi'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'1'/>
+    </disk>
+    <controller type=3D'scsi' index=3D'0' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-error-policy-s390x.s390x-latest.=
xml b/tests/qemuxml2xmloutdata/disk-error-policy-s390x.s390x-latest.xml
new file mode 100644
index 0000000000..42509c4bae
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-error-policy-s390x.s390x-latest.xml
@@ -0,0 +1,43 @@
+<domain type=3D'qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D's390x' machine=3D's390-ccw-virtio'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2' cache=3D'none' error_policy=3D'=
stop'/>
+      <source file=3D'/var/images/image1'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0000'/>
+    </disk>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2' cache=3D'none' error_policy=3D'=
enospace'/>
+      <source file=3D'/var/images/image2'/>
+      <target dev=3D'vdb' bus=3D'virtio'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0001'/>
+    </disk>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2' cache=3D'none' error_policy=3D'=
report' rerror_policy=3D'ignore'/>
+      <source file=3D'/var/images/image3'/>
+      <target dev=3D'vdc' bus=3D'virtio'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0002'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+    <panic model=3D's390'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-floppy-pseries.ppc64-latest.xml =
b/tests/qemuxml2xmloutdata/disk-floppy-pseries.ppc64-latest.xml
new file mode 100644
index 0000000000..3f50bfe096
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-floppy-pseries.ppc64-latest.xml
@@ -0,0 +1,44 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'ppc64' machine=3D'pseries'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>POWER9</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-ppc64</emulator>
+    <disk type=3D'block' device=3D'floppy'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/fd0'/>
+      <target dev=3D'fda' bus=3D'fdc'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'file' device=3D'floppy'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/tmp/firmware.img'/>
+      <target dev=3D'fdb' bus=3D'fdc'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'1'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'pci-ohci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'fdc' index=3D'0'/>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'>
+      <model name=3D'spapr-pci-host-bridge'/>
+      <target index=3D'0'/>
+    </controller>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+    <panic model=3D'pseries'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-floppy-q35.x86_64-latest.xml b/t=
ests/qemuxml2xmloutdata/disk-floppy-q35.x86_64-latest.xml
new file mode 100644
index 0000000000..cd6c0e3352
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-floppy-q35.x86_64-latest.xml
@@ -0,0 +1,56 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'q35'>hvm</type>
+    <boot dev=3D'fd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'file' device=3D'floppy'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/tmp/firmware.img'/>
+      <target dev=3D'fda' bus=3D'fdc'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'file' device=3D'floppy'>
+      <driver name=3D'qemu' type=3D'qcow2'/>
+      <source file=3D'/tmp/data.img'/>
+      <target dev=3D'fdb' bus=3D'fdc'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'1'/>
+    </disk>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'fdc' index=3D'0'/>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-floppy-tray.x86_64-latest.xml b/=
tests/qemuxml2xmloutdata/disk-floppy-tray.x86_64-latest.xml
new file mode 100644
index 0000000000..38635c8aec
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-floppy-tray.x86_64-latest.xml
@@ -0,0 +1,53 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'block' device=3D'floppy'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/fd0'/>
+      <target dev=3D'fda' bus=3D'fdc'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'file' device=3D'floppy'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/tmp/firmware.img'/>
+      <target dev=3D'fdb' bus=3D'fdc' tray=3D'open'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'1'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'fdc' index=3D'0'/>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-geometry.x86_64-latest.xml b/tes=
ts/qemuxml2xmloutdata/disk-geometry.x86_64-latest.xml
new file mode 100644
index 0000000000..86d4de7df6
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-geometry.x86_64-latest.xml
@@ -0,0 +1,41 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <geometry cyls=3D'16383' heads=3D'16' secs=3D'63' trans=3D'lba'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-ide-split.x86_64-latest.xml b/te=
sts/qemuxml2xmloutdata/disk-ide-split.x86_64-latest.xml
new file mode 100644
index 0000000000..c89978c048
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-ide-split.x86_64-latest.xml
@@ -0,0 +1,47 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'cdrom'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <readonly/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'1'/>
+    </disk>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/tmp/idedisk.img'/>
+      <target dev=3D'hdc' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'2'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-ide-wwn.x86_64-latest.xml b/test=
s/qemuxml2xmloutdata/disk-ide-wwn.x86_64-latest.xml
new file mode 100644
index 0000000000..b082217a42
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-ide-wwn.x86_64-latest.xml
@@ -0,0 +1,42 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <serial>WD-WMAP9A966149</serial>
+      <wwn>5000c50015ea71ad</wwn>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'1'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-ioeventfd.x86_64-latest.xml b/te=
sts/qemuxml2xmloutdata/disk-ioeventfd.x86_64-latest.xml
new file mode 100644
index 0000000000..d06cd443c9
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-ioeventfd.x86_64-latest.xml
@@ -0,0 +1,58 @@
+<domain type=3D'qemu'>
+  <name>test</name>
+  <uuid>8c273d77-39b0-47c4-9714-6dddcad56b88</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'cdrom'/>
+    <boot dev=3D'hd'/>
+    <bootmenu enable=3D'yes'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2' ioeventfd=3D'on'/>
+      <source file=3D'/var/lib/libvirt/images/f14.img'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'file' device=3D'cdrom'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/>
+      <target dev=3D'hdc' bus=3D'ide'/>
+      <readonly/>
+      <address type=3D'drive' controller=3D'0' bus=3D'1' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:00:e5:48:58'/>
+      <model type=3D'virtio'/>
+      <driver name=3D'vhost' txmode=3D'iothread' ioeventfd=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </interface>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-network-http-nbdkit.x86_64-lates=
t.xml b/tests/qemuxml2xmloutdata/disk-network-http-nbdkit.x86_64-latest.xml
new file mode 100644
index 0000000000..2c2ed4f17d
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-network-http-nbdkit.x86_64-latest.xml
@@ -0,0 +1,72 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'network' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source protocol=3D'http' name=3D'test.img'>
+        <host name=3D'example.org' port=3D'80'/>
+        <timeout seconds=3D'1234'/>
+      </source>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'network' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source protocol=3D'https' name=3D'test2.img'>
+        <host name=3D'example.org' port=3D'443'/>
+        <readahead size=3D'1024'/>
+      </source>
+      <target dev=3D'vdb' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'network' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source protocol=3D'http' name=3D'test3.img'>
+        <host name=3D'example.org' port=3D'1234'/>
+        <cookies>
+          <cookie name=3D'test'>testcookievalue</cookie>
+          <cookie name=3D'test2'>&quot;blurb&quot;</cookie>
+        </cookies>
+      </source>
+      <target dev=3D'vdc' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'network' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source protocol=3D'https' name=3D'test4.img' query=3D'par=3Dval&amp=
;other=3Dble'>
+        <host name=3D'example.org' port=3D'1234'/>
+        <ssl verify=3D'no'/>
+        <cookies>
+          <cookie name=3D'test'>testcookievalue</cookie>
+          <cookie name=3D'test2'>&quot;blurb&quot;</cookie>
+        </cookies>
+      </source>
+      <target dev=3D'vdd' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-network-rbd-no-colon.x86_64-late=
st.xml b/tests/qemuxml2xmloutdata/disk-network-rbd-no-colon.x86_64-latest.x=
ml
new file mode 100644
index 0000000000..9ed7bcb0be
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-network-rbd-no-colon.x86_64-latest.xml
@@ -0,0 +1,50 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'network' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source protocol=3D'rbd' name=3D'poolname/imagename:rbd_cache=3D1:rb=
d_cache_size=3D67108864:rbd_cache_max_dirty=3D0'>
+        <host name=3D'mon1.example.org' port=3D'6321'/>
+        <host name=3D'mon2.example.org' port=3D'6322'/>
+        <host name=3D'mon3.example.org' port=3D'6322'/>
+      </source>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-network-sheepdog.x86_64-6.0.0.xm=
l b/tests/qemuxml2xmloutdata/disk-network-sheepdog.x86_64-6.0.0.xml
new file mode 100644
index 0000000000..3421293663
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-network-sheepdog.x86_64-6.0.0.xml
@@ -0,0 +1,46 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-6.0'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMU,Guest,,1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'network' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source protocol=3D'sheepdog' name=3D'image,with,commas'>
+        <host name=3D'example.org' port=3D'6000'/>
+      </source>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-network-source-curl-nbdkit-backi=
ng.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-network-source-curl-nb=
dkit-backing.x86_64-latest.xml
new file mode 100644
index 0000000000..c384242611
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-network-source-curl-nbdkit-backing.x86_=
64-latest.xml
@@ -0,0 +1,52 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'network' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2'/>
+      <source protocol=3D'https' name=3D'path/to/disk1.qcow2'>
+        <host name=3D'https.example.org' port=3D'8443'/>
+        <cookies>
+          <cookie name=3D'cookie1'>cookievalue1</cookie>
+          <cookie name=3D'cookie2'>cookievalue2</cookie>
+        </cookies>
+      </source>
+      <backingStore type=3D'network'>
+        <format type=3D'qcow2'/>
+        <source protocol=3D'https' name=3D'path/to/backing.qcow2'>
+          <host name=3D'https.example2.org' port=3D'8444'/>
+          <cookies>
+            <cookie name=3D'cookie3'>cookievalue3</cookie>
+            <cookie name=3D'cookie4'>cookievalue4</cookie>
+          </cookies>
+        </source>
+      </backingStore>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <readonly/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-network-source-curl-nbdkit.x86_6=
4-latest.xml b/tests/qemuxml2xmloutdata/disk-network-source-curl-nbdkit.x86=
_64-latest.xml
new file mode 100644
index 0000000000..8266e5c280
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-network-source-curl-nbdkit.x86_64-lates=
t.xml
@@ -0,0 +1,96 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'network' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source protocol=3D'https' name=3D'path/to/disk1.iso'>
+        <host name=3D'https.example.org' port=3D'8443'/>
+        <cookies>
+          <cookie name=3D'cookie1'>cookievalue1</cookie>
+          <cookie name=3D'cookie2'>cookievalue2</cookie>
+        </cookies>
+      </source>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <readonly/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'network' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source protocol=3D'https' name=3D'path/to/disk5.iso' query=3D'foo=
=3Dbar'>
+        <host name=3D'https.example.org' port=3D'8443'/>
+        <ssl verify=3D'no'/>
+        <cookies>
+          <cookie name=3D'cookie1'>cookievalue1</cookie>
+          <cookie name=3D'cookie2'>cookievalue2</cookie>
+        </cookies>
+        <auth username=3D'myname'>
+          <secret type=3D'iscsi' usage=3D'mycluster_myname'/>
+        </auth>
+        <encryption format=3D'luks' engine=3D'qemu'>
+          <secret type=3D'passphrase' uuid=3D'1148b693-0843-4cef-9f97-8feb=
4e1ae365'/>
+        </encryption>
+      </source>
+      <target dev=3D'vde' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'network' device=3D'cdrom'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source protocol=3D'http' name=3D'path/to/disk2.iso'>
+        <host name=3D'http.example.org' port=3D'8080'/>
+        <cookies>
+          <cookie name=3D'cookie1'>cookievalue1</cookie>
+          <cookie name=3D'cookie2'>cookievalue2</cookie>
+          <cookie name=3D'cookie3'>cookievalue3</cookie>
+        </cookies>
+      </source>
+      <target dev=3D'hdb' bus=3D'sata'/>
+      <readonly/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'1'/>
+    </disk>
+    <disk type=3D'network' device=3D'cdrom'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source protocol=3D'ftp' name=3D'path/to/disk3.iso'>
+        <host name=3D'ftp.example.org' port=3D'20'/>
+      </source>
+      <target dev=3D'hdc' bus=3D'sata'/>
+      <readonly/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'2'/>
+    </disk>
+    <disk type=3D'network' device=3D'cdrom'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source protocol=3D'ftps' name=3D'path/to/disk4.iso'>
+        <host name=3D'ftps.example.org' port=3D'22'/>
+      </source>
+      <target dev=3D'hdd' bus=3D'sata'/>
+      <readonly/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'3'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-network-source-curl.x86_64-lates=
t.xml b/tests/qemuxml2xmloutdata/disk-network-source-curl.x86_64-latest.xml
new file mode 100644
index 0000000000..8266e5c280
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-network-source-curl.x86_64-latest.xml
@@ -0,0 +1,96 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'network' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source protocol=3D'https' name=3D'path/to/disk1.iso'>
+        <host name=3D'https.example.org' port=3D'8443'/>
+        <cookies>
+          <cookie name=3D'cookie1'>cookievalue1</cookie>
+          <cookie name=3D'cookie2'>cookievalue2</cookie>
+        </cookies>
+      </source>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <readonly/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'network' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source protocol=3D'https' name=3D'path/to/disk5.iso' query=3D'foo=
=3Dbar'>
+        <host name=3D'https.example.org' port=3D'8443'/>
+        <ssl verify=3D'no'/>
+        <cookies>
+          <cookie name=3D'cookie1'>cookievalue1</cookie>
+          <cookie name=3D'cookie2'>cookievalue2</cookie>
+        </cookies>
+        <auth username=3D'myname'>
+          <secret type=3D'iscsi' usage=3D'mycluster_myname'/>
+        </auth>
+        <encryption format=3D'luks' engine=3D'qemu'>
+          <secret type=3D'passphrase' uuid=3D'1148b693-0843-4cef-9f97-8feb=
4e1ae365'/>
+        </encryption>
+      </source>
+      <target dev=3D'vde' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'network' device=3D'cdrom'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source protocol=3D'http' name=3D'path/to/disk2.iso'>
+        <host name=3D'http.example.org' port=3D'8080'/>
+        <cookies>
+          <cookie name=3D'cookie1'>cookievalue1</cookie>
+          <cookie name=3D'cookie2'>cookievalue2</cookie>
+          <cookie name=3D'cookie3'>cookievalue3</cookie>
+        </cookies>
+      </source>
+      <target dev=3D'hdb' bus=3D'sata'/>
+      <readonly/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'1'/>
+    </disk>
+    <disk type=3D'network' device=3D'cdrom'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source protocol=3D'ftp' name=3D'path/to/disk3.iso'>
+        <host name=3D'ftp.example.org' port=3D'20'/>
+      </source>
+      <target dev=3D'hdc' bus=3D'sata'/>
+      <readonly/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'2'/>
+    </disk>
+    <disk type=3D'network' device=3D'cdrom'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source protocol=3D'ftps' name=3D'path/to/disk4.iso'>
+        <host name=3D'ftps.example.org' port=3D'22'/>
+      </source>
+      <target dev=3D'hdd' bus=3D'sata'/>
+      <readonly/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'3'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-network-ssh-key.x86_64-latest.xm=
l b/tests/qemuxml2xmloutdata/disk-network-ssh-key.x86_64-latest.xml
new file mode 100644
index 0000000000..dc15a254d3
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-network-ssh-key.x86_64-latest.xml
@@ -0,0 +1,49 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'network' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source protocol=3D'ssh' name=3D'test1.img'>
+        <host name=3D'example.org' port=3D'2222'/>
+        <knownHosts path=3D'/path/to/ssh_known_hosts1'/>
+        <identity username=3D'myuser' agentsock=3D'/path/to/agent/socket'/>
+      </source>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'network' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source protocol=3D'ssh' name=3D'test2.img'>
+        <host name=3D'example.org' port=3D'2222'/>
+        <knownHosts path=3D'/path/to/ssh_known_hosts2'/>
+        <identity username=3D'myuser2' keyfile=3D'/path/to/id_rsa'/>
+      </source>
+      <target dev=3D'vdb' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-network-ssh-nbdkit.x86_64-latest=
.xml b/tests/qemuxml2xmloutdata/disk-network-ssh-nbdkit.x86_64-latest.xml
new file mode 100644
index 0000000000..854e903800
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-network-ssh-nbdkit.x86_64-latest.xml
@@ -0,0 +1,38 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'network' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source protocol=3D'ssh' name=3D'test.img'>
+        <host name=3D'example.org' port=3D'2222'/>
+        <knownHosts path=3D'/path/to/ssh_known_hosts'/>
+      </source>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-network-ssh-password.x86_64-late=
st.xml b/tests/qemuxml2xmloutdata/disk-network-ssh-password.x86_64-latest.x=
ml
new file mode 100644
index 0000000000..b8a31dcfc6
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-network-ssh-password.x86_64-latest.xml
@@ -0,0 +1,41 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'network' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source protocol=3D'ssh' name=3D'test2.img'>
+        <host name=3D'example.org' port=3D'2222'/>
+        <knownHosts path=3D'/path/to/knownhosts'/>
+        <auth username=3D'testuser'>
+          <secret type=3D'iscsi' usage=3D'mycluster_myname'/>
+        </auth>
+      </source>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-network-ssh.x86_64-latest.xml b/=
tests/qemuxml2xmloutdata/disk-network-ssh.x86_64-latest.xml
new file mode 100644
index 0000000000..854e903800
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-network-ssh.x86_64-latest.xml
@@ -0,0 +1,38 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'network' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source protocol=3D'ssh' name=3D'test.img'>
+        <host name=3D'example.org' port=3D'2222'/>
+        <knownHosts path=3D'/path/to/ssh_known_hosts'/>
+      </source>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd.x86_64-5.2.0=
.xml b/tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd.x86_64-5.2.0.xml
new file mode 100644
index 0000000000..41168fde48
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd.x86_64-5.2.0.xml
@@ -0,0 +1,37 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'network' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw' cache=3D'none'/>
+      <source protocol=3D'nbd' tls=3D'yes'>
+        <host name=3D'example.com' port=3D'1234'/>
+      </source>
+      <target dev=3D'vdd' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x07' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-no-boot.x86_64-latest.xml b/test=
s/qemuxml2xmloutdata/disk-no-boot.x86_64-latest.xml
new file mode 100644
index 0000000000..2986cbb04f
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-no-boot.x86_64-latest.xml
@@ -0,0 +1,54 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'cdrom'/>
+    <boot dev=3D'hd'/>
+    <boot dev=3D'fd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'block' device=3D'cdrom'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest2'/>
+      <target dev=3D'hdc' bus=3D'ide'/>
+      <readonly/>
+      <address type=3D'drive' controller=3D'0' bus=3D'1' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'block' device=3D'floppy'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/fd0'/>
+      <target dev=3D'fda' bus=3D'fdc'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'fdc' index=3D'0'/>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-order.x86_64-latest.xml b/tests/=
qemuxml2xmloutdata/disk-order.x86_64-latest.xml
new file mode 100644
index 0000000000..1babcbb5c0
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-order.x86_64-latest.xml
@@ -0,0 +1,59 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'block' device=3D'cdrom'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest2'/>
+      <target dev=3D'hdc' bus=3D'ide'/>
+      <readonly/>
+      <address type=3D'drive' controller=3D'0' bus=3D'1' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/tmp/data.img'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/tmp/logs.img'/>
+      <target dev=3D'vdb' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-readonly-disk.x86_64-latest.xml =
b/tests/qemuxml2xmloutdata/disk-readonly-disk.x86_64-latest.xml
new file mode 100644
index 0000000000..f898ef4e7d
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-readonly-disk.x86_64-latest.xml
@@ -0,0 +1,47 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'block' device=3D'cdrom'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/sr0'/>
+      <target dev=3D'hdc' bus=3D'ide'/>
+      <readonly/>
+      <address type=3D'drive' controller=3D'0' bus=3D'1' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-scsi-disk-split.x86_64-latest.xm=
l b/tests/qemuxml2xmloutdata/disk-scsi-disk-split.x86_64-latest.xml
new file mode 100644
index 0000000000..a3dfcab846
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-scsi-disk-split.x86_64-latest.xml
@@ -0,0 +1,69 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'cdrom'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'sda' bus=3D'scsi'/>
+      <readonly/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'1' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'block' device=3D'cdrom'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest2'/>
+      <target dev=3D'sdb' bus=3D'scsi'/>
+      <readonly/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/tmp/scsidisk.img'/>
+      <target dev=3D'sdc' bus=3D'scsi'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'1'/>
+    </disk>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/tmp/scsidisk.img'/>
+      <target dev=3D'sdd' bus=3D'scsi'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'1' unit=
=3D'1'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'0' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'1' model=3D'lsilogic'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'2' model=3D'lsilogic'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'3' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-scsi-disk-wwn.x86_64-latest.xml =
b/tests/qemuxml2xmloutdata/disk-scsi-disk-wwn.x86_64-latest.xml
new file mode 100644
index 0000000000..c5d7d3e1dd
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-scsi-disk-wwn.x86_64-latest.xml
@@ -0,0 +1,53 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'cdrom'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'sda' bus=3D'scsi'/>
+      <readonly/>
+      <serial>WD-WMAP9A966149</serial>
+      <wwn>5000c50015ea71ac</wwn>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'1' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest2'/>
+      <target dev=3D'sdb' bus=3D'scsi'/>
+      <wwn>0x5000c50015ea71ad</wwn>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'0' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'1' model=3D'lsilogic'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough.x86_64-late=
st.xml b/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough.x86_64-latest.x=
ml
new file mode 100644
index 0000000000..6c0d3b41e8
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough.x86_64-latest.xml
@@ -0,0 +1,49 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'lun'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'scsi'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'block' device=3D'lun'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest2'/>
+      <target dev=3D'hdb' bus=3D'scsi'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'1' unit=
=3D'1'/>
+    </disk>
+    <controller type=3D'scsi' index=3D'0' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'1' model=3D'lsilogic'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-shared.x86_64-latest.xml b/tests=
/qemuxml2xmloutdata/disk-shared.x86_64-latest.xml
new file mode 100644
index 0000000000..3380994fbc
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-shared.x86_64-latest.xml
@@ -0,0 +1,66 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <shareable/>
+      <serial>XYZXYZXYZYXXYZYZYXYZY</serial>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'block' device=3D'cdrom'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest2'/>
+      <target dev=3D'hdc' bus=3D'ide'/>
+      <readonly/>
+      <address type=3D'drive' controller=3D'0' bus=3D'1' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/scsi'/>
+      <target dev=3D'sda' bus=3D'scsi'/>
+      <shareable/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/virtio'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <shareable/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'0' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-snapshot.x86_64-latest.xml b/tes=
ts/qemuxml2xmloutdata/disk-snapshot.x86_64-latest.xml
new file mode 100644
index 0000000000..247c1559a3
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-snapshot.x86_64-latest.xml
@@ -0,0 +1,53 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk' snapshot=3D'internal'>
+      <driver name=3D'qemu' type=3D'qcow2' cache=3D'none'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'block' device=3D'disk' snapshot=3D'external'>
+      <driver name=3D'qemu' type=3D'qcow2' cache=3D'none'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest3'/>
+      <target dev=3D'hdb' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'2' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'block' device=3D'cdrom'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest2'/>
+      <target dev=3D'hdc' bus=3D'ide'/>
+      <readonly/>
+      <address type=3D'drive' controller=3D'0' bus=3D'1' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-vhostuser-numa.x86_64-4.2.0.xml =
b/tests/qemuxml2xmloutdata/disk-vhostuser-numa.x86_64-4.2.0.xml
new file mode 100644
index 0000000000..f1825f3a8d
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-vhostuser-numa.x86_64-4.2.0.xml
@@ -0,0 +1,48 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-4.2'>hvm</type>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+    <numa>
+      <cell id=3D'0' cpus=3D'0' memory=3D'14680064' unit=3D'KiB' memAccess=
=3D'shared'/>
+    </numa>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'vhostuser' device=3D'disk' snapshot=3D'no'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source type=3D'unix' path=3D'/tmp/vhost1.sock'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <boot order=3D'1'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'vhostuser' device=3D'disk' snapshot=3D'no'>
+      <driver name=3D'qemu' type=3D'raw' iommu=3D'on' ats=3D'on' packed=3D=
'on'/>
+      <source type=3D'unix' path=3D'/tmp/vhost1.sock'>
+        <reconnect enabled=3D'yes' timeout=3D'10'/>
+      </source>
+      <target dev=3D'vdb' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-vhostuser-numa.x86_64-latest.xml=
 b/tests/qemuxml2xmloutdata/disk-vhostuser-numa.x86_64-latest.xml
new file mode 100644
index 0000000000..0a2e40f496
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-vhostuser-numa.x86_64-latest.xml
@@ -0,0 +1,48 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+    <numa>
+      <cell id=3D'0' cpus=3D'0' memory=3D'14680064' unit=3D'KiB' memAccess=
=3D'shared'/>
+    </numa>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'vhostuser' device=3D'disk' snapshot=3D'no'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source type=3D'unix' path=3D'/tmp/vhost1.sock'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <boot order=3D'1'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'vhostuser' device=3D'disk' snapshot=3D'no'>
+      <driver name=3D'qemu' type=3D'raw' iommu=3D'on' ats=3D'on' packed=3D=
'on'/>
+      <source type=3D'unix' path=3D'/tmp/vhost1.sock'>
+        <reconnect enabled=3D'yes' timeout=3D'10'/>
+      </source>
+      <target dev=3D'vdb' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-vhostvdpa.x86_64-latest.xml b/te=
sts/qemuxml2xmloutdata/disk-vhostvdpa.x86_64-latest.xml
new file mode 100644
index 0000000000..6ef351fabe
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-vhostvdpa.x86_64-latest.xml
@@ -0,0 +1,40 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <memoryBacking>
+    <access mode=3D'shared'/>
+  </memoryBacking>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'vhostvdpa' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw' cache=3D'none'/>
+      <source dev=3D'/dev/vhost-vdpa-0'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-virtio-ccw-many.s390x-latest.xml=
 b/tests/qemuxml2xmloutdata/disk-virtio-ccw-many.s390x-latest.xml
new file mode 100644
index 0000000000..c2d3dd1350
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-virtio-ccw-many.s390x-latest.xml
@@ -0,0 +1,51 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D's390x' machine=3D's390-ccw-virtio'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'virtio'/>
+      <address type=3D'ccw' cssid=3D'0x0' ssid=3D'0x0' devno=3D'0x0007'/>
+    </disk>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest4'/>
+      <target dev=3D'hdb' bus=3D'virtio'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0000'/>
+    </disk>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest2'/>
+      <target dev=3D'hdc' bus=3D'virtio'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0001'/>
+    </disk>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest3'/>
+      <target dev=3D'hdd' bus=3D'virtio'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x2' devno=3D'0xf00f'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x000a'/>
+    </memballoon>
+    <panic model=3D's390'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-virtio-ccw.s390x-latest.xml b/te=
sts/qemuxml2xmloutdata/disk-virtio-ccw.s390x-latest.xml
new file mode 100644
index 0000000000..aee8e0e97a
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-virtio-ccw.s390x-latest.xml
@@ -0,0 +1,39 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D's390x' machine=3D's390-ccw-virtio'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'virtio'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0000'/>
+    </disk>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest2'/>
+      <target dev=3D'hdb' bus=3D'virtio'/>
+      <address type=3D'ccw' cssid=3D'0x0' ssid=3D'0x0' devno=3D'0x0007'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x000a'/>
+    </memballoon>
+    <panic model=3D's390'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations.x86_64-=
5.2.0.xml b/tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations.x86_64-5=
.2.0.xml
new file mode 100644
index 0000000000..74c254aa3c
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations.x86_64-5.2.0.x=
ml
@@ -0,0 +1,53 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>8</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'lun'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'>
+        <reservations managed=3D'yes'/>
+      </source>
+      <target dev=3D'sda' bus=3D'scsi'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'block' device=3D'lun'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest2'>
+        <reservations managed=3D'no'>
+          <source type=3D'unix' path=3D'/path/to/qemu-pr-helper.sock' mode=
=3D'client'/>
+        </reservations>
+      </source>
+      <target dev=3D'sdb' bus=3D'scsi'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'1'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'0' model=3D'virtio-scsi'>
+      <driver queues=3D'8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/fips-enabled.x86_64-5.1.0.xml b/tests=
/qemuxml2xmloutdata/fips-enabled.x86_64-5.1.0.xml
new file mode 100644
index 0000000000..5fb54cfd81
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/fips-enabled.x86_64-5.1.0.xml
@@ -0,0 +1,40 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static' cpuset=3D'1-4,8-20,525'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.1'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/fips-enabled.x86_64-latest.xml b/test=
s/qemuxml2xmloutdata/fips-enabled.x86_64-latest.xml
new file mode 100644
index 0000000000..dac2714445
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/fips-enabled.x86_64-latest.xml
@@ -0,0 +1,40 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static' cpuset=3D'1-4,8-20,525'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/fs9p-ccw.s390x-latest.xml b/tests/qem=
uxml2xmloutdata/fs9p-ccw.s390x-latest.xml
new file mode 100644
index 0000000000..eb85ac4824
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/fs9p-ccw.s390x-latest.xml
@@ -0,0 +1,50 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D's390x' machine=3D's390-ccw-virtio'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'virtio'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0000'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <filesystem type=3D'mount' accessmode=3D'passthrough'>
+      <source dir=3D'/export/to/guest'/>
+      <target dir=3D'/import/from/host'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0001'/>
+    </filesystem>
+    <filesystem type=3D'mount' accessmode=3D'mapped'>
+      <driver type=3D'path' wrpolicy=3D'immediate'/>
+      <source dir=3D'/export/to/guest2'/>
+      <target dir=3D'/import/from/host2'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0002'/>
+    </filesystem>
+    <filesystem type=3D'mount' accessmode=3D'passthrough'>
+      <driver type=3D'handle' wrpolicy=3D'immediate'/>
+      <source dir=3D'/export/to/guest3'/>
+      <target dir=3D'/import/from/host3'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0003'/>
+    </filesystem>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0004'/>
+    </memballoon>
+    <panic model=3D's390'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/fs9p.x86_64-latest.xml b/tests/qemuxm=
l2xmloutdata/fs9p.x86_64-latest.xml
new file mode 100644
index 0000000000..9d31f21bf3
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/fs9p.x86_64-latest.xml
@@ -0,0 +1,44 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'none'/>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <filesystem type=3D'mount' accessmode=3D'passthrough'>
+      <source dir=3D'/export/to/guest'/>
+      <target dir=3D'/import/from/host'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </filesystem>
+    <filesystem type=3D'mount' accessmode=3D'mapped'>
+      <driver type=3D'path' wrpolicy=3D'immediate'/>
+      <source dir=3D'/export/to/guest2'/>
+      <target dir=3D'/import/from/host2'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </filesystem>
+    <filesystem type=3D'mount' accessmode=3D'passthrough'>
+      <driver type=3D'handle' wrpolicy=3D'immediate'/>
+      <source dir=3D'/export/to/guest3'/>
+      <target dir=3D'/import/from/host3'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </filesystem>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/graphics-dbus-usbredir.x86_64-latest.=
xml b/tests/qemuxml2xmloutdata/graphics-dbus-usbredir.x86_64-latest.xml
new file mode 100644
index 0000000000..b8bd5fb3b0
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/graphics-dbus-usbredir.x86_64-latest.xml
@@ -0,0 +1,42 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <graphics type=3D'dbus' p2p=3D'yes'/>
+    <video>
+      <model type=3D'cirrus' vram=3D'16384' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <redirdev bus=3D'usb' type=3D'dbus'>
+      <source channel=3D'org.qemu.usbredir'/>
+    </redirdev>
+    <redirdev bus=3D'usb' type=3D'dbus'>
+      <source channel=3D'org.qemu.usbredir'/>
+    </redirdev>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/graphics-egl-headless.x86_64-latest.x=
ml b/tests/qemuxml2xmloutdata/graphics-egl-headless.x86_64-latest.xml
new file mode 100644
index 0000000000..2523d5c374
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/graphics-egl-headless.x86_64-latest.xml
@@ -0,0 +1,42 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <graphics type=3D'egl-headless'/>
+    <video>
+      <model type=3D'cirrus' vram=3D'16384' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-agent-file-xfer.x86_64=
-latest.xml b/tests/qemuxml2xmloutdata/graphics-spice-agent-file-xfer.x86_6=
4-latest.xml
new file mode 100644
index 0000000000..5c0c04cb04
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/graphics-spice-agent-file-xfer.x86_64-latest=
.xml
@@ -0,0 +1,48 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <graphics type=3D'spice' port=3D'5903' tlsPort=3D'5904' autoport=3D'no=
' listen=3D'127.0.0.1'>
+      <listen type=3D'address' address=3D'127.0.0.1'/>
+      <channel name=3D'main' mode=3D'secure'/>
+      <channel name=3D'inputs' mode=3D'insecure'/>
+      <filetransfer enable=3D'no'/>
+    </graphics>
+    <audio id=3D'1' type=3D'spice'/>
+    <video>
+      <model type=3D'qxl' ram=3D'65536' vram=3D'32768' vgamem=3D'16384' he=
ads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <video>
+      <model type=3D'qxl' ram=3D'65536' vram=3D'65536' vgamem=3D'16384' he=
ads=3D'1'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-agentmouse.x86_64-late=
st.xml b/tests/qemuxml2xmloutdata/graphics-spice-agentmouse.x86_64-latest.x=
ml
new file mode 100644
index 0000000000..a0c72c32cc
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/graphics-spice-agentmouse.x86_64-latest.xml
@@ -0,0 +1,50 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static' cpuset=3D'1-4,8-20,525'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'virtio-serial' index=3D'1'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0a' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <channel type=3D'spicevmc'>
+      <target type=3D'virtio' name=3D'com.redhat.spice.0'/>
+      <address type=3D'virtio-serial' controller=3D'1' bus=3D'0' port=3D'3=
'/>
+    </channel>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <graphics type=3D'spice' port=3D'5903' tlsPort=3D'5904' autoport=3D'no=
' listen=3D'127.0.0.1'>
+      <listen type=3D'address' address=3D'127.0.0.1'/>
+      <channel name=3D'main' mode=3D'secure'/>
+      <mouse mode=3D'server'/>
+    </graphics>
+    <audio id=3D'1' type=3D'spice'/>
+    <video>
+      <model type=3D'cirrus' vram=3D'16384' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-gl-auto-rendernode.x86=
_64-latest.xml b/tests/qemuxml2xmloutdata/graphics-spice-gl-auto-rendernode=
.x86_64-latest.xml
new file mode 100644
index 0000000000..8a557068ec
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/graphics-spice-gl-auto-rendernode.x86_64-lat=
est.xml
@@ -0,0 +1,39 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <graphics type=3D'spice'>
+      <listen type=3D'none'/>
+      <gl enable=3D'yes'/>
+    </graphics>
+    <audio id=3D'1' type=3D'spice'/>
+    <video>
+      <model type=3D'cirrus' vram=3D'16384' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-no-args.x86_64-latest.=
xml b/tests/qemuxml2xmloutdata/graphics-spice-no-args.x86_64-latest.xml
new file mode 100644
index 0000000000..5bf67991d0
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/graphics-spice-no-args.x86_64-latest.xml
@@ -0,0 +1,38 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <graphics type=3D'spice'>
+      <listen type=3D'none'/>
+    </graphics>
+    <audio id=3D'1' type=3D'spice'/>
+    <video>
+      <model type=3D'cirrus' vram=3D'16384' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-sasl.x86_64-latest.xml=
 b/tests/qemuxml2xmloutdata/graphics-spice-sasl.x86_64-latest.xml
new file mode 100644
index 0000000000..ac04f132b8
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/graphics-spice-sasl.x86_64-latest.xml
@@ -0,0 +1,41 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <graphics type=3D'spice' port=3D'5903' tlsPort=3D'5904' autoport=3D'no=
' listen=3D'127.0.0.1' defaultMode=3D'secure'>
+      <listen type=3D'address' address=3D'127.0.0.1'/>
+    </graphics>
+    <audio id=3D'1' type=3D'spice'/>
+    <video>
+      <model type=3D'qxl' ram=3D'65536' vram=3D'32768' vgamem=3D'16384' he=
ads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-usb-redir.x86_64-lates=
t.xml b/tests/qemuxml2xmloutdata/graphics-spice-usb-redir.x86_64-latest.xml
new file mode 100644
index 0000000000..42382a7631
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/graphics-spice-usb-redir.x86_64-latest.xml
@@ -0,0 +1,66 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'ich9-ehci1'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x7'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'ich9-uhci1'>
+      <master startport=3D'0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'ich9-uhci2'>
+      <master startport=3D'2'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'ich9-uhci3'>
+      <master startport=3D'4'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <graphics type=3D'spice' port=3D'5903' tlsPort=3D'5904' autoport=3D'no=
' listen=3D'127.0.0.1'>
+      <listen type=3D'address' address=3D'127.0.0.1'/>
+      <channel name=3D'main' mode=3D'secure'/>
+      <channel name=3D'inputs' mode=3D'insecure'/>
+      <channel name=3D'usbredir' mode=3D'secure'/>
+      <image compression=3D'auto_glz'/>
+      <jpeg compression=3D'auto'/>
+      <zlib compression=3D'auto'/>
+      <playback compression=3D'on'/>
+      <streaming mode=3D'filter'/>
+      <clipboard copypaste=3D'no'/>
+    </graphics>
+    <audio id=3D'1' type=3D'spice'/>
+    <video>
+      <model type=3D'cirrus' vram=3D'16384' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <redirdev bus=3D'usb' type=3D'tcp'>
+      <source mode=3D'connect' host=3D'localhost' service=3D'4000'/>
+      <protocol type=3D'raw'/>
+    </redirdev>
+    <redirdev bus=3D'usb' type=3D'spicevmc'>
+      <address type=3D'usb' bus=3D'0' port=3D'4'/>
+    </redirdev>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-none.x86_64-latest.xml b=
/tests/qemuxml2xmloutdata/graphics-vnc-none.x86_64-latest.xml
new file mode 100644
index 0000000000..b03658b9b3
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-none.x86_64-latest.xml
@@ -0,0 +1,39 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <graphics type=3D'vnc'>
+      <listen type=3D'none'/>
+    </graphics>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <model type=3D'cirrus' vram=3D'16384' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-policy.x86_64-latest.xml=
 b/tests/qemuxml2xmloutdata/graphics-vnc-policy.x86_64-latest.xml
new file mode 100644
index 0000000000..3a26abbbec
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-policy.x86_64-latest.xml
@@ -0,0 +1,45 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <graphics type=3D'vnc' port=3D'65530' autoport=3D'no' listen=3D'::' sh=
arePolicy=3D'allow-exclusive'>
+      <listen type=3D'address' address=3D'::'/>
+    </graphics>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <model type=3D'cirrus' vram=3D'16384' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-power.x86_64-latest.xml =
b/tests/qemuxml2xmloutdata/graphics-vnc-power.x86_64-latest.xml
new file mode 100644
index 0000000000..c174ee4909
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-power.x86_64-latest.xml
@@ -0,0 +1,45 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <graphics type=3D'vnc' port=3D'65530' autoport=3D'no' listen=3D'::' po=
werControl=3D'yes'>
+      <listen type=3D'address' address=3D'::'/>
+    </graphics>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <model type=3D'cirrus' vram=3D'16384' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-socket-new-cmdline.x86_6=
4-latest.xml b/tests/qemuxml2xmloutdata/graphics-vnc-socket-new-cmdline.x86=
_64-latest.xml
new file mode 100644
index 0000000000..51adf91513
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-socket-new-cmdline.x86_64-lates=
t.xml
@@ -0,0 +1,36 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <graphics type=3D'vnc' socket=3D'/tmp/foo=3Dbar.sock'>
+      <listen type=3D'socket' socket=3D'/tmp/foo=3Dbar.sock'/>
+    </graphics>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <model type=3D'cirrus' vram=3D'16384' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-tls-secret.x86_64-5.2.0.=
xml b/tests/qemuxml2xmloutdata/graphics-vnc-tls-secret.x86_64-5.2.0.xml
new file mode 100644
index 0000000000..c1fa05c3e2
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-tls-secret.x86_64-5.2.0.xml
@@ -0,0 +1,39 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <graphics type=3D'vnc' port=3D'5903' autoport=3D'no' listen=3D'127.0.0=
.1'>
+      <listen type=3D'address' address=3D'127.0.0.1'/>
+    </graphics>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <model type=3D'cirrus' vram=3D'16384' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-tls-secret.x86_64-latest=
.xml b/tests/qemuxml2xmloutdata/graphics-vnc-tls-secret.x86_64-latest.xml
new file mode 100644
index 0000000000..8a2cd444ad
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-tls-secret.x86_64-latest.xml
@@ -0,0 +1,39 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <graphics type=3D'vnc' port=3D'5903' autoport=3D'no' listen=3D'127.0.0=
.1'>
+      <listen type=3D'address' address=3D'127.0.0.1'/>
+    </graphics>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <model type=3D'cirrus' vram=3D'16384' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-display-spice-egl-headle=
ss.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hostdev-mdev-display-spice-=
egl-headless.x86_64-latest.xml
new file mode 100644
index 0000000000..860d373e1e
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/hostdev-mdev-display-spice-egl-headless.x86_=
64-latest.xml
@@ -0,0 +1,46 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest2</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <graphics type=3D'spice'>
+      <listen type=3D'none'/>
+    </graphics>
+    <graphics type=3D'egl-headless'/>
+    <audio id=3D'1' type=3D'spice'/>
+    <video>
+      <model type=3D'qxl' ram=3D'65536' vram=3D'65536' vgamem=3D'16384' he=
ads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <hostdev mode=3D'subsystem' type=3D'mdev' managed=3D'no' model=3D'vfio=
-pci' display=3D'on'>
+      <source>
+        <address uuid=3D'53764d0e-85a0-42b4-af5c-2046b460b1dc'/>
+      </source>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </hostdev>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-display-spice-opengl.x86=
_64-latest.xml b/tests/qemuxml2xmloutdata/hostdev-mdev-display-spice-opengl=
.x86_64-latest.xml
new file mode 100644
index 0000000000..224513f5c4
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/hostdev-mdev-display-spice-opengl.x86_64-lat=
est.xml
@@ -0,0 +1,46 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest2</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <graphics type=3D'spice'>
+      <listen type=3D'none'/>
+      <gl enable=3D'yes' rendernode=3D'/dev/dri/foo'/>
+    </graphics>
+    <audio id=3D'1' type=3D'spice'/>
+    <video>
+      <model type=3D'qxl' ram=3D'65536' vram=3D'65536' vgamem=3D'16384' he=
ads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <hostdev mode=3D'subsystem' type=3D'mdev' managed=3D'no' model=3D'vfio=
-pci' display=3D'on'>
+      <source>
+        <address uuid=3D'53764d0e-85a0-42b4-af5c-2046b460b1dc'/>
+      </source>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </hostdev>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-display-vnc-egl-headless=
.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hostdev-mdev-display-vnc-egl-=
headless.x86_64-latest.xml
new file mode 100644
index 0000000000..c615235b6b
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/hostdev-mdev-display-vnc-egl-headless.x86_64=
-latest.xml
@@ -0,0 +1,46 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest2</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <graphics type=3D'vnc' port=3D'-1' autoport=3D'yes'>
+      <listen type=3D'address'/>
+    </graphics>
+    <graphics type=3D'egl-headless'/>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <model type=3D'qxl' ram=3D'65536' vram=3D'65536' vgamem=3D'16384' he=
ads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <hostdev mode=3D'subsystem' type=3D'mdev' managed=3D'no' model=3D'vfio=
-pci' display=3D'on'>
+      <source>
+        <address uuid=3D'53764d0e-85a0-42b4-af5c-2046b460b1dc'/>
+      </source>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </hostdev>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-display-vnc.x86_64-lates=
t.xml b/tests/qemuxml2xmloutdata/hostdev-mdev-display-vnc.x86_64-latest.xml
new file mode 100644
index 0000000000..b2e3092370
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/hostdev-mdev-display-vnc.x86_64-latest.xml
@@ -0,0 +1,45 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest2</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <graphics type=3D'vnc' port=3D'-1' autoport=3D'yes'>
+      <listen type=3D'address'/>
+    </graphics>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <model type=3D'qxl' ram=3D'65536' vram=3D'65536' vgamem=3D'16384' he=
ads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <hostdev mode=3D'subsystem' type=3D'mdev' managed=3D'no' model=3D'vfio=
-pci' display=3D'on'>
+      <source>
+        <address uuid=3D'53764d0e-85a0-42b4-af5c-2046b460b1dc'/>
+      </source>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </hostdev>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-pci-address-device.x86_64-lat=
est.xml b/tests/qemuxml2xmloutdata/hostdev-pci-address-device.x86_64-latest=
.xml
new file mode 100644
index 0000000000..dac3dda77f
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/hostdev-pci-address-device.x86_64-latest.xml
@@ -0,0 +1,46 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest2</name>
+  <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'i686' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest2'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
+      <source>
+        <address domain=3D'0x0000' bus=3D'0x06' slot=3D'0x12' function=3D'=
0x5'/>
+      </source>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </hostdev>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4=
.2.0.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2=
.0.xml
new file mode 100644
index 0000000000..02c9931299
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.xml
@@ -0,0 +1,45 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest2</name>
+  <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-4.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'none'/>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <hostdev mode=3D'subsystem' type=3D'scsi_host' managed=3D'no'>
+      <source protocol=3D'vhost' wwpn=3D'naa.5123456789abcde0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </hostdev>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-usb-address-device-boot.x86_6=
4-latest.xml b/tests/qemuxml2xmloutdata/hostdev-usb-address-device-boot.x86=
_64-latest.xml
new file mode 100644
index 0000000000..c6b6c43d50
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/hostdev-usb-address-device-boot.x86_64-lates=
t.xml
@@ -0,0 +1,45 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'i686' machine=3D'pc'>hvm</type>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <hostdev mode=3D'subsystem' type=3D'usb' managed=3D'no'>
+      <source>
+        <address bus=3D'14' device=3D'6'/>
+      </source>
+      <boot order=3D'1'/>
+    </hostdev>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-usb-address-device.x86_64-lat=
est.xml b/tests/qemuxml2xmloutdata/hostdev-usb-address-device.x86_64-latest=
.xml
new file mode 100644
index 0000000000..e8e8f61858
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/hostdev-usb-address-device.x86_64-latest.xml
@@ -0,0 +1,45 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'i686' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <hostdev mode=3D'subsystem' type=3D'usb' managed=3D'no'>
+      <source>
+        <address bus=3D'14' device=3D'6'/>
+      </source>
+    </hostdev>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-multidomain.x86_64-lates=
t.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-multidomain.x86_64-latest.xml
new file mode 100644
index 0000000000..98e08a1fac
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/hostdev-vfio-multidomain.x86_64-latest.xml
@@ -0,0 +1,46 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest2</name>
+  <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest2'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <hostdev mode=3D'subsystem' type=3D'pci' managed=3D'yes'>
+      <source>
+        <address domain=3D'0x0021' bus=3D'0xde' slot=3D'0x1f' function=3D'=
0x1'/>
+      </source>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </hostdev>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/hotplug-base.x86_64-latest.xml b/test=
s/qemuxml2xmloutdata/hotplug-base.x86_64-latest.xml
new file mode 100644
index 0000000000..ca18e978ef
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/hotplug-base.x86_64-latest.xml
@@ -0,0 +1,44 @@
+<domain type=3D'kvm'>
+  <name>hotplug</name>
+  <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid>
+  <memory unit=3D'KiB'>4194304</memory>
+  <currentMemory unit=3D'KiB'>4194304</currentMemory>
+  <vcpu placement=3D'static'>4</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'0' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+  <seclabel type=3D'none' model=3D'none'/>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/hugepages-default-5M.x86_64-latest.xm=
l b/tests/qemuxml2xmloutdata/hugepages-default-5M.x86_64-latest.xml
new file mode 100644
index 0000000000..9c6351e8b4
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/hugepages-default-5M.x86_64-latest.xml
@@ -0,0 +1,41 @@
+<domain type=3D'kvm'>
+  <name>NonExistentPageSize</name>
+  <uuid>21433e10-aea8-434a-8f81-55781c2e9035</uuid>
+  <memory unit=3D'KiB'>4194304</memory>
+  <currentMemory unit=3D'KiB'>4194304</currentMemory>
+  <memoryBacking>
+    <hugepages>
+      <page size=3D'5120' unit=3D'KiB'/>
+    </hugepages>
+  </memoryBacking>
+  <vcpu placement=3D'static'>2</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/hugepages-numa-default.x86_64-latest.=
xml b/tests/qemuxml2xmloutdata/hugepages-numa-default.x86_64-latest.xml
new file mode 100644
index 0000000000..cc50a63a47
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/hugepages-numa-default.x86_64-latest.xml
@@ -0,0 +1,35 @@
+<domain type=3D'qemu'>
+  <name>fedora</name>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
+  <memory unit=3D'KiB'>1572863</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <memoryBacking>
+    <hugepages/>
+  </memoryBacking>
+  <vcpu placement=3D'static'>2</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+    <numa>
+      <cell id=3D'0' cpus=3D'0-1' memory=3D'1048576' unit=3D'KiB'/>
+    </numa>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/hyperv-passthrough.x86_64-6.1.0.xml b=
/tests/qemuxml2xmloutdata/hyperv-passthrough.x86_64-6.1.0.xml
new file mode 100644
index 0000000000..02410a403e
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/hyperv-passthrough.x86_64-6.1.0.xml
@@ -0,0 +1,34 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-6.1'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <features>
+    <acpi/>
+    <hyperv mode=3D'passthrough'>
+    </hyperv>
+  </features>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/input-usbmouse-addr.x86_64-latest.xml=
 b/tests/qemuxml2xmloutdata/input-usbmouse-addr.x86_64-latest.xml
new file mode 100644
index 0000000000..f9ba78b6f2
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/input-usbmouse-addr.x86_64-latest.xml
@@ -0,0 +1,43 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'usb'>
+      <address type=3D'usb' bus=3D'0' port=3D'2'/>
+    </input>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.s390x-4.2.0=
.xml b/tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.s390x-4.2.0.xml
new file mode 100644
index 0000000000..95a0f102b7
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.s390x-4.2.0.xml
@@ -0,0 +1,41 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <iothreads>2</iothreads>
+  <os>
+    <type arch=3D's390x' machine=3D's390-ccw-virtio-4.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw' iothread=3D'1'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'virtio'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0000'/>
+    </disk>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw' iothread=3D'2'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest2'/>
+      <target dev=3D'hdb' bus=3D'virtio'/>
+      <address type=3D'ccw' cssid=3D'0x0' ssid=3D'0x0' devno=3D'0x0007'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'none'/>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x000a'/>
+    </memballoon>
+    <panic model=3D's390'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.x86_64-5.2.=
0.xml b/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.x86_64-5.2.0.xml
new file mode 100644
index 0000000000..4353b7a606
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.x86_64-5.2.0.xml
@@ -0,0 +1,49 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>2</vcpu>
+  <iothreads>2</iothreads>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw' iothread=3D'1'/>
+      <source file=3D'/var/lib/libvirt/images/iothrtest1.img'/>
+      <target dev=3D'vdb' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/var/lib/libvirt/images/iothrtest2.img'/>
+      <target dev=3D'sdc' bus=3D'scsi'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'3'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'scsi' index=3D'0' model=3D'virtio-scsi'>
+      <driver iothread=3D'2'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0b' f=
unction=3D'0x0'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/kvm-pit-delay.x86_64-latest.xml b/tes=
ts/qemuxml2xmloutdata/kvm-pit-delay.x86_64-latest.xml
new file mode 100644
index 0000000000..68b6ccf810
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/kvm-pit-delay.x86_64-latest.xml
@@ -0,0 +1,42 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>2</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'>
+    <timer name=3D'pit' tickpolicy=3D'delay'/>
+  </clock>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/kvm-pit-discard.x86_64-latest.xml b/t=
ests/qemuxml2xmloutdata/kvm-pit-discard.x86_64-latest.xml
new file mode 100644
index 0000000000..925b92ce9c
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/kvm-pit-discard.x86_64-latest.xml
@@ -0,0 +1,42 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>2</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'>
+    <timer name=3D'pit' tickpolicy=3D'discard'/>
+  </clock>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/kvmclock+eoi-disabled.x86_64-latest.x=
ml b/tests/qemuxml2xmloutdata/kvmclock+eoi-disabled.x86_64-latest.xml
new file mode 100644
index 0000000000..b2bce210d7
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/kvmclock+eoi-disabled.x86_64-latest.xml
@@ -0,0 +1,38 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>6</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'network'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic eoi=3D'off'/>
+    <pae/>
+  </features>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'>
+    <timer name=3D'kvmclock' present=3D'no'/>
+  </clock>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/launch-security-s390-pv.s390x-latest.=
xml b/tests/qemuxml2xmloutdata/launch-security-s390-pv.s390x-latest.xml
new file mode 100644
index 0000000000..b5ae0a3f7b
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/launch-security-s390-pv.s390x-latest.xml
@@ -0,0 +1,32 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D's390x' machine=3D's390-ccw-virtio'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'host-model' check=3D'partial'/>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'virtio'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0000'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0001'/>
+    </memballoon>
+    <panic model=3D's390'/>
+  </devices>
+  <launchSecurity type=3D's390-pv'/>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/launch-security-sev-direct.x86_64-lat=
est.xml b/tests/qemuxml2xmloutdata/launch-security-sev-direct.x86_64-latest=
.xml
new file mode 100644
index 0000000000..e289b1e95e
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/launch-security-sev-direct.x86_64-latest.xml
@@ -0,0 +1,48 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <kernel>/vmlinuz</kernel>
+    <initrd>/initrd</initrd>
+    <cmdline>runme</cmdline>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+  <launchSecurity type=3D'sev' kernelHashes=3D'yes'>
+    <cbitpos>47</cbitpos>
+    <reducedPhysBits>1</reducedPhysBits>
+    <policy>0x0001</policy>
+    <dhCert>AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA</dhCer=
t>
+    <session>IHAVENOIDEABUTJUSTPROVIDINGASTRING</session>
+  </launchSecurity>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/launch-security-sev-missing-platform-=
info.x86_64-6.0.0.xml b/tests/qemuxml2xmloutdata/launch-security-sev-missin=
g-platform-info.x86_64-6.0.0.xml
new file mode 100644
index 0000000000..b10a748ea4
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/launch-security-sev-missing-platform-info.x8=
6_64-6.0.0.xml
@@ -0,0 +1,43 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-6.0'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+  <launchSecurity type=3D'sev'>
+    <policy>0x0001</policy>
+    <dhCert>AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA</dhCer=
t>
+    <session>IHAVENOIDEABUTJUSTPROVIDINGASTRING</session>
+  </launchSecurity>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/launch-security-sev.x86_64-6.0.0.xml =
b/tests/qemuxml2xmloutdata/launch-security-sev.x86_64-6.0.0.xml
new file mode 100644
index 0000000000..c32e5c94ab
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/launch-security-sev.x86_64-6.0.0.xml
@@ -0,0 +1,45 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-6.0'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+  <launchSecurity type=3D'sev'>
+    <cbitpos>47</cbitpos>
+    <reducedPhysBits>1</reducedPhysBits>
+    <policy>0x0001</policy>
+    <dhCert>AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA</dhCer=
t>
+    <session>IHAVENOIDEABUTJUSTPROVIDINGASTRING</session>
+  </launchSecurity>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/luks-disks-source-qcow2.x86_64-5.2.0.=
xml b/tests/qemuxml2xmloutdata/luks-disks-source-qcow2.x86_64-5.2.0.xml
new file mode 100644
index 0000000000..6ab476ab95
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/luks-disks-source-qcow2.x86_64-5.2.0.xml
@@ -0,0 +1,107 @@
+<domain type=3D'qemu'>
+  <name>encryptdisk</name>
+  <uuid>496898a6-e6ff-f7c8-5dc2-3cf410945ee9</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>524288</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <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'/storage/guest_disks/encryptdisk'>
+        <encryption format=3D'luks' engine=3D'qemu'>
+          <secret type=3D'passphrase' uuid=3D'0a81f5b2-8403-7b23-c8d6-21cc=
c2f80d6f'/>
+        </encryption>
+      </source>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2'/>
+      <source file=3D'/storage/guest_disks/encryptdisk2'>
+        <encryption format=3D'luks' engine=3D'qemu'>
+          <secret type=3D'passphrase' usage=3D'/storage/guest_disks/encryp=
tdisk2'/>
+        </encryption>
+      </source>
+      <target dev=3D'vdb' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'network' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2'/>
+      <source protocol=3D'iscsi' name=3D'iqn.1992-01.com.example:storage/1=
'>
+        <host name=3D'example.org' port=3D'6000'/>
+        <auth username=3D'myname'>
+          <secret type=3D'iscsi' uuid=3D'0a81f5b2-8403-7b23-c8d6-21ccc2f80=
e80'/>
+        </auth>
+        <encryption format=3D'luks' engine=3D'qemu'>
+          <secret type=3D'passphrase' uuid=3D'0a81f5b2-8403-7b23-c8d6-21cc=
c2f80f77'/>
+        </encryption>
+      </source>
+      <target dev=3D'vdc' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'volume' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2'/>
+      <source pool=3D'pool-iscsi' volume=3D'unit:0:0:3' mode=3D'direct'>
+        <encryption format=3D'luks' engine=3D'qemu'>
+          <secret type=3D'passphrase' uuid=3D'0a81f5b2-8403-7b23-c8d6-21cc=
c2f80f80'/>
+        </encryption>
+      </source>
+      <target dev=3D'vdd' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'network' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2'/>
+      <source protocol=3D'rbd' name=3D'pool/image'>
+        <host name=3D'mon1.example.org' port=3D'6321'/>
+        <host name=3D'mon2.example.org' port=3D'6322'/>
+        <host name=3D'mon3.example.org' port=3D'6322'/>
+        <encryption format=3D'luks' engine=3D'qemu'>
+          <secret type=3D'passphrase' uuid=3D'0a81f5b2-8403-7b23-c8d6-21cc=
c2f80fb0'/>
+        </encryption>
+      </source>
+      <target dev=3D'vde' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x07' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2'/>
+      <source file=3D'/storage/guest_disks/encryptdisk5'>
+        <encryption format=3D'luks' engine=3D'qemu'>
+          <secret type=3D'passphrase' uuid=3D'0a81f5b2-8403-7b23-c8d6-21cc=
c2f80d6f'/>
+        </encryption>
+      </source>
+      <backingStore type=3D'file'>
+        <format type=3D'qcow2'/>
+        <source file=3D'/storage/guest_disks/base.qcow2'>
+          <encryption format=3D'luks' engine=3D'qemu'>
+            <secret type=3D'passphrase' uuid=3D'0a81f5b2-8403-7b23-c8d6-21=
ccc2f80d6f'/>
+          </encryption>
+        </source>
+        <backingStore/>
+      </backingStore>
+      <target dev=3D'vdf' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x08' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/machine-aeskeywrap-off-cap.s390x-late=
st.xml b/tests/qemuxml2xmloutdata/machine-aeskeywrap-off-cap.s390x-latest.x=
ml
new file mode 100644
index 0000000000..2521e9534e
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/machine-aeskeywrap-off-cap.s390x-latest.xml
@@ -0,0 +1,34 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D's390x' machine=3D's390-ccw-virtio'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0000'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+    <panic model=3D's390'/>
+  </devices>
+  <keywrap>
+    <cipher name=3D'aes' state=3D'off'/>
+  </keywrap>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/machine-aeskeywrap-off-caps.s390x-lat=
est.xml b/tests/qemuxml2xmloutdata/machine-aeskeywrap-off-caps.s390x-latest=
.xml
new file mode 100644
index 0000000000..2521e9534e
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/machine-aeskeywrap-off-caps.s390x-latest.xml
@@ -0,0 +1,34 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D's390x' machine=3D's390-ccw-virtio'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0000'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+    <panic model=3D's390'/>
+  </devices>
+  <keywrap>
+    <cipher name=3D'aes' state=3D'off'/>
+  </keywrap>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/machine-aeskeywrap-on-cap.s390x-lates=
t.xml b/tests/qemuxml2xmloutdata/machine-aeskeywrap-on-cap.s390x-latest.xml
new file mode 100644
index 0000000000..6c75d068c7
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/machine-aeskeywrap-on-cap.s390x-latest.xml
@@ -0,0 +1,34 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D's390x' machine=3D's390-ccw-virtio'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0000'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+    <panic model=3D's390'/>
+  </devices>
+  <keywrap>
+    <cipher name=3D'aes' state=3D'on'/>
+  </keywrap>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/machine-aeskeywrap-on-caps.s390x-late=
st.xml b/tests/qemuxml2xmloutdata/machine-aeskeywrap-on-caps.s390x-latest.x=
ml
new file mode 100644
index 0000000000..6c75d068c7
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/machine-aeskeywrap-on-caps.s390x-latest.xml
@@ -0,0 +1,34 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D's390x' machine=3D's390-ccw-virtio'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0000'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+    <panic model=3D's390'/>
+  </devices>
+  <keywrap>
+    <cipher name=3D'aes' state=3D'on'/>
+  </keywrap>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/machine-aliases1.x86_64-latest.xml b/=
tests/qemuxml2xmloutdata/machine-aliases1.x86_64-latest.xml
new file mode 100644
index 0000000000..baea8b3da6
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/machine-aliases1.x86_64-latest.xml
@@ -0,0 +1,40 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/machine-aliases2.x86_64-latest.xml b/=
tests/qemuxml2xmloutdata/machine-aliases2.x86_64-latest.xml
new file mode 100644
index 0000000000..fd65da80ff
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/machine-aliases2.x86_64-latest.xml
@@ -0,0 +1,40 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/machine-deakeywrap-off-cap.s390x-late=
st.xml b/tests/qemuxml2xmloutdata/machine-deakeywrap-off-cap.s390x-latest.x=
ml
new file mode 100644
index 0000000000..9cd8d01483
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/machine-deakeywrap-off-cap.s390x-latest.xml
@@ -0,0 +1,34 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D's390x' machine=3D's390-ccw-virtio'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0000'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+    <panic model=3D's390'/>
+  </devices>
+  <keywrap>
+    <cipher name=3D'dea' state=3D'off'/>
+  </keywrap>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/machine-deakeywrap-off-caps.s390x-lat=
est.xml b/tests/qemuxml2xmloutdata/machine-deakeywrap-off-caps.s390x-latest=
.xml
new file mode 100644
index 0000000000..9cd8d01483
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/machine-deakeywrap-off-caps.s390x-latest.xml
@@ -0,0 +1,34 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D's390x' machine=3D's390-ccw-virtio'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0000'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+    <panic model=3D's390'/>
+  </devices>
+  <keywrap>
+    <cipher name=3D'dea' state=3D'off'/>
+  </keywrap>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/machine-deakeywrap-on-cap.s390x-lates=
t.xml b/tests/qemuxml2xmloutdata/machine-deakeywrap-on-cap.s390x-latest.xml
new file mode 100644
index 0000000000..bc2c3ec141
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/machine-deakeywrap-on-cap.s390x-latest.xml
@@ -0,0 +1,34 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D's390x' machine=3D's390-ccw-virtio'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0000'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+    <panic model=3D's390'/>
+  </devices>
+  <keywrap>
+    <cipher name=3D'dea' state=3D'on'/>
+  </keywrap>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/machine-deakeywrap-on-caps.s390x-late=
st.xml b/tests/qemuxml2xmloutdata/machine-deakeywrap-on-caps.s390x-latest.x=
ml
new file mode 100644
index 0000000000..bc2c3ec141
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/machine-deakeywrap-on-caps.s390x-latest.xml
@@ -0,0 +1,34 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D's390x' machine=3D's390-ccw-virtio'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0000'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+    <panic model=3D's390'/>
+  </devices>
+  <keywrap>
+    <cipher name=3D'dea' state=3D'on'/>
+  </keywrap>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/machine-keywrap-none-caps.s390x-lates=
t.xml b/tests/qemuxml2xmloutdata/machine-keywrap-none-caps.s390x-latest.xml
new file mode 100644
index 0000000000..e403b6c2ec
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/machine-keywrap-none-caps.s390x-latest.xml
@@ -0,0 +1,31 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D's390x' machine=3D's390-ccw-virtio'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0000'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+    <panic model=3D's390'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/machine-keywrap-none.s390x-latest.xml=
 b/tests/qemuxml2xmloutdata/machine-keywrap-none.s390x-latest.xml
new file mode 100644
index 0000000000..e403b6c2ec
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/machine-keywrap-none.s390x-latest.xml
@@ -0,0 +1,31 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D's390x' machine=3D's390-ccw-virtio'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0000'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+    <panic model=3D's390'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/machine-loadparm-net-s390.s390x-lates=
t.xml b/tests/qemuxml2xmloutdata/machine-loadparm-net-s390.s390x-latest.xml
new file mode 100644
index 0000000000..c155929eba
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/machine-loadparm-net-s390.s390x-latest.xml
@@ -0,0 +1,32 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D's390x' machine=3D's390-ccw-virtio'>hvm</type>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <interface type=3D'user'>
+      <mac address=3D'00:11:22:33:44:54'/>
+      <model type=3D'virtio'/>
+      <boot order=3D'1' loadparm=3D'2'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0000'/>
+    </interface>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0001'/>
+    </memballoon>
+    <panic model=3D's390'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/machine-loadparm-s390.s390x-latest.xm=
l b/tests/qemuxml2xmloutdata/machine-loadparm-s390.s390x-latest.xml
new file mode 100644
index 0000000000..94e304c397
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/machine-loadparm-s390.s390x-latest.xml
@@ -0,0 +1,33 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D's390x' machine=3D's390-ccw-virtio'>hvm</type>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'virtio'/>
+      <boot order=3D'1' loadparm=3D'2'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0000'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0001'/>
+    </memballoon>
+    <panic model=3D's390'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/machine-vmport-opt.x86_64-latest.xml =
b/tests/qemuxml2xmloutdata/machine-vmport-opt.x86_64-latest.xml
new file mode 100644
index 0000000000..462209febf
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/machine-vmport-opt.x86_64-latest.xml
@@ -0,0 +1,43 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <features>
+    <vmport state=3D'off'/>
+  </features>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/memory-align-fail.x86_64-latest.xml b=
/tests/qemuxml2xmloutdata/memory-align-fail.x86_64-latest.xml
new file mode 100644
index 0000000000..a4c921143c
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/memory-align-fail.x86_64-latest.xml
@@ -0,0 +1,39 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <maxMemory slots=3D'16' unit=3D'KiB'>9007199254740991</maxMemory>
+  <memory unit=3D'KiB'>9007199254740991</memory>
+  <currentMemory unit=3D'KiB'>9007199254740991</currentMemory>
+  <vcpu placement=3D'static' cpuset=3D'0-1'>2</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+    <topology sockets=3D'2' dies=3D'1' cores=3D'1' threads=3D'1'/>
+    <numa>
+      <cell id=3D'0' cpus=3D'0-1' memory=3D'9007199254740991' unit=3D'KiB'=
/>
+    </numa>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-align.x86_64-5.=
2.0.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-align.x86_64-5.2.0=
.xml
new file mode 100644
index 0000000000..5e9a507118
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-align.x86_64-5.2.0.xml
@@ -0,0 +1,60 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <maxMemory slots=3D'16' unit=3D'KiB'>1099511627776</maxMemory>
+  <memory unit=3D'KiB'>1267710</memory>
+  <currentMemory unit=3D'KiB'>1267710</currentMemory>
+  <vcpu placement=3D'static' cpuset=3D'0-1'>2</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <idmap>
+    <uid start=3D'0' target=3D'1000' count=3D'10'/>
+    <gid start=3D'0' target=3D'1000' count=3D'10'/>
+  </idmap>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+    <topology sockets=3D'2' dies=3D'1' cores=3D'1' threads=3D'1'/>
+    <numa>
+      <cell id=3D'0' cpus=3D'0-1' memory=3D'219136' unit=3D'KiB'/>
+    </numa>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+    <memory model=3D'nvdimm' access=3D'private'>
+      <source>
+        <path>/tmp/nvdimm</path>
+        <alignsize unit=3D'KiB'>2048</alignsize>
+      </source>
+      <target>
+        <size unit=3D'KiB'>523264</size>
+        <node>0</node>
+      </target>
+      <address type=3D'dimm' slot=3D'0'/>
+    </memory>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-label.x86_64-5.=
2.0.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-label.x86_64-5.2.0=
.xml
new file mode 100644
index 0000000000..c1a0efe336
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-label.x86_64-5.2.0.xml
@@ -0,0 +1,62 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <maxMemory slots=3D'16' unit=3D'KiB'>1099511627776</maxMemory>
+  <memory unit=3D'KiB'>1267710</memory>
+  <currentMemory unit=3D'KiB'>1267710</currentMemory>
+  <vcpu placement=3D'static' cpuset=3D'0-1'>2</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <idmap>
+    <uid start=3D'0' target=3D'1000' count=3D'10'/>
+    <gid start=3D'0' target=3D'1000' count=3D'10'/>
+  </idmap>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+    <topology sockets=3D'2' dies=3D'1' cores=3D'1' threads=3D'1'/>
+    <numa>
+      <cell id=3D'0' cpus=3D'0-1' memory=3D'219136' unit=3D'KiB'/>
+    </numa>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+    <memory model=3D'nvdimm' access=3D'private'>
+      <source>
+        <path>/tmp/nvdimm</path>
+      </source>
+      <target>
+        <size unit=3D'KiB'>523264</size>
+        <node>0</node>
+        <label>
+          <size unit=3D'KiB'>128</size>
+        </label>
+      </target>
+      <address type=3D'dimm' slot=3D'0'/>
+    </memory>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-pmem.x86_64-5.2=
.0.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.x=
ml
new file mode 100644
index 0000000000..540794ccee
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.xml
@@ -0,0 +1,60 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <maxMemory slots=3D'16' unit=3D'KiB'>1099511627776</maxMemory>
+  <memory unit=3D'KiB'>1267710</memory>
+  <currentMemory unit=3D'KiB'>1267710</currentMemory>
+  <vcpu placement=3D'static' cpuset=3D'0-1'>2</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <idmap>
+    <uid start=3D'0' target=3D'1000' count=3D'10'/>
+    <gid start=3D'0' target=3D'1000' count=3D'10'/>
+  </idmap>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+    <topology sockets=3D'2' dies=3D'1' cores=3D'1' threads=3D'1'/>
+    <numa>
+      <cell id=3D'0' cpus=3D'0-1' memory=3D'219136' unit=3D'KiB'/>
+    </numa>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+    <memory model=3D'nvdimm' access=3D'private'>
+      <source>
+        <path>/tmp/nvdimm</path>
+        <pmem/>
+      </source>
+      <target>
+        <size unit=3D'KiB'>523264</size>
+        <node>0</node>
+      </target>
+      <address type=3D'dimm' slot=3D'0'/>
+    </memory>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-readonly.x86_64=
-5.2.0.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-readonly.x86_64=
-5.2.0.xml
new file mode 100644
index 0000000000..5b9910791a
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-readonly.x86_64-5.2.0.=
xml
@@ -0,0 +1,60 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <maxMemory slots=3D'16' unit=3D'KiB'>1099511627776</maxMemory>
+  <memory unit=3D'KiB'>1267710</memory>
+  <currentMemory unit=3D'KiB'>1267710</currentMemory>
+  <vcpu placement=3D'static' cpuset=3D'0-1'>2</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <idmap>
+    <uid start=3D'0' target=3D'1000' count=3D'10'/>
+    <gid start=3D'0' target=3D'1000' count=3D'10'/>
+  </idmap>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+    <topology sockets=3D'2' dies=3D'1' cores=3D'1' threads=3D'1'/>
+    <numa>
+      <cell id=3D'0' cpus=3D'0-1' memory=3D'219136' unit=3D'KiB'/>
+    </numa>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+    <memory model=3D'nvdimm' access=3D'private'>
+      <source>
+        <path>/tmp/nvdimm</path>
+      </source>
+      <target>
+        <size unit=3D'KiB'>523264</size>
+        <node>0</node>
+        <readonly/>
+      </target>
+      <address type=3D'dimm' slot=3D'0'/>
+    </memory>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-virtio-pmem.x86_64-5.2=
.0.xml b/tests/qemuxml2xmloutdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.x=
ml
new file mode 100644
index 0000000000..03a5d51ca8
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.xml
@@ -0,0 +1,55 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <maxMemory unit=3D'KiB'>1099511627776</maxMemory>
+  <memory unit=3D'KiB'>2095104</memory>
+  <currentMemory unit=3D'KiB'>2095104</currentMemory>
+  <vcpu placement=3D'static' cpuset=3D'0-1'>2</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+    <topology sockets=3D'2' dies=3D'1' cores=3D'1' threads=3D'1'/>
+    <numa>
+      <cell id=3D'0' cpus=3D'0-1' memory=3D'2095104' unit=3D'KiB'/>
+    </numa>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+    <memory model=3D'virtio-pmem' access=3D'shared'>
+      <source>
+        <path>/tmp/virtio_pmem</path>
+      </source>
+      <target>
+        <size unit=3D'KiB'>524288</size>
+        <address base=3D'0x140000000'/>
+      </target>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x0'/>
+    </memory>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/migrate-numa-unaligned.x86_64-latest.=
xml b/tests/qemuxml2xmloutdata/migrate-numa-unaligned.x86_64-latest.xml
new file mode 100644
index 0000000000..82cbb546d9
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/migrate-numa-unaligned.x86_64-latest.xml
@@ -0,0 +1,41 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest</name>
+  <uuid>9f4b6512-e73a-4a25-93e8-5307802821ce</uuid>
+  <memory unit=3D'KiB'>14682468</memory>
+  <currentMemory unit=3D'KiB'>14682468</currentMemory>
+  <vcpu placement=3D'static'>32</vcpu>
+  <numatune>
+    <memory mode=3D'strict' nodeset=3D'0-3'/>
+    <memnode cellid=3D'0' mode=3D'preferred' nodeset=3D'3'/>
+    <memnode cellid=3D'2' mode=3D'strict' nodeset=3D'0,2'/>
+  </numatune>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+    <numa>
+      <cell id=3D'0' cpus=3D'0' memory=3D'20002' unit=3D'KiB'/>
+      <cell id=3D'1' cpus=3D'1-27,29' memory=3D'660066' unit=3D'KiB'/>
+      <cell id=3D'2' cpus=3D'28,30-31' memory=3D'24002400' unit=3D'KiB'/>
+    </numa>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/misc-no-reboot.x86_64-5.2.0.xml b/tes=
ts/qemuxml2xmloutdata/misc-no-reboot.x86_64-5.2.0.xml
new file mode 100644
index 0000000000..dd72c115df
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/misc-no-reboot.x86_64-5.2.0.xml
@@ -0,0 +1,38 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>destroy</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/mlock-off.x86_64-latest.xml b/tests/q=
emuxml2xmloutdata/mlock-off.x86_64-latest.xml
new file mode 100644
index 0000000000..89631180ac
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/mlock-off.x86_64-latest.xml
@@ -0,0 +1,29 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/mlock-on.x86_64-latest.xml b/tests/qe=
muxml2xmloutdata/mlock-on.x86_64-latest.xml
new file mode 100644
index 0000000000..1bf62babb9
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/mlock-on.x86_64-latest.xml
@@ -0,0 +1,32 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <memoryBacking>
+    <locked/>
+  </memoryBacking>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/multifunction-pci-device.x86_64-lates=
t.xml b/tests/qemuxml2xmloutdata/multifunction-pci-device.x86_64-latest.xml
new file mode 100644
index 0000000000..fb8b119091
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/multifunction-pci-device.x86_64-latest.xml
@@ -0,0 +1,64 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/tmp/scsidisk.img'/>
+      <target dev=3D'sda' bus=3D'scsi'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'scsi' index=3D'0' model=3D'lsilogic'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0' multifunction=3D'off'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'1' model=3D'lsilogic'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'2' model=3D'lsilogic'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x1' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'3' model=3D'lsilogic'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'4' model=3D'lsilogic'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x3'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'5' model=3D'lsilogic'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x4'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'6' model=3D'lsilogic'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x5'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'7' model=3D'lsilogic'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x6'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'8' model=3D'lsilogic'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x7'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/name-escape.x86_64-latest.xml b/tests=
/qemuxml2xmloutdata/name-escape.x86_64-latest.xml
new file mode 100644
index 0000000000..cb4efcd154
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/name-escape.x86_64-latest.xml
@@ -0,0 +1,95 @@
+<domain type=3D'qemu'>
+  <name>foo=3D1,bar=3D2</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2' cache=3D'none'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <iotune>
+        <total_bytes_sec>5000</total_bytes_sec>
+        <total_iops_sec>6000</total_iops_sec>
+        <total_bytes_sec_max>10000</total_bytes_sec_max>
+        <total_iops_sec_max>11000</total_iops_sec_max>
+        <group_name>libvirt_iotune_group1,foo</group_name>
+      </iotune>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'scsi' index=3D'0' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'ccid' index=3D'0'/>
+    <smartcard mode=3D'host-certificates'>
+      <certificate>cert1,foo</certificate>
+      <certificate>cert2</certificate>
+      <certificate>cert3</certificate>
+      <database>/etc/pki/nssdb,foo</database>
+      <address type=3D'ccid' controller=3D'0' slot=3D'0'/>
+    </smartcard>
+    <serial type=3D'dev'>
+      <source path=3D'/dev/ttyS2,foo'/>
+      <target type=3D'isa-serial' port=3D'1'>
+        <model name=3D'isa-serial'/>
+      </target>
+    </serial>
+    <serial type=3D'file'>
+      <source path=3D'/tmp/serial.log,foo' append=3D'on'/>
+      <target type=3D'isa-serial' port=3D'0'>
+        <model name=3D'isa-serial'/>
+      </target>
+    </serial>
+    <console type=3D'dev'>
+      <source path=3D'/dev/ttyS2,foo'/>
+      <target type=3D'serial' port=3D'1'/>
+    </console>
+    <channel type=3D'pipe'>
+      <source path=3D'/tmp/guestfwd,foo'/>
+      <target type=3D'guestfwd' address=3D'10.0.2.1' port=3D'4600'/>
+    </channel>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <graphics type=3D'vnc'>
+      <listen type=3D'socket'/>
+    </graphics>
+    <graphics type=3D'spice'>
+      <listen type=3D'socket'/>
+      <gl enable=3D'yes' rendernode=3D'/dev/dri/foo,bar'/>
+    </graphics>
+    <audio id=3D'1' type=3D'spice'/>
+    <video>
+      <model type=3D'cirrus' vram=3D'16384' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <hostdev mode=3D'subsystem' type=3D'scsi' managed=3D'yes'>
+      <source protocol=3D'iscsi' name=3D'iqn.1992-01.com.example:my,storag=
e/1'>
+        <host name=3D'example.foo.org' port=3D'3260'/>
+      </source>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'4'/>
+    </hostdev>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/net-client.x86_64-latest.xml b/tests/=
qemuxml2xmloutdata/net-client.x86_64-latest.xml
new file mode 100644
index 0000000000..61987956a1
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/net-client.x86_64-latest.xml
@@ -0,0 +1,46 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <interface type=3D'client'>
+      <mac address=3D'52:54:00:8c:b9:05'/>
+      <source address=3D'192.168.0.1' port=3D'5558'/>
+      <model type=3D'rtl8139'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </interface>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/net-eth-names.x86_64-latest.xml b/tes=
ts/qemuxml2xmloutdata/net-eth-names.x86_64-latest.xml
new file mode 100644
index 0000000000..05cab3685d
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/net-eth-names.x86_64-latest.xml
@@ -0,0 +1,52 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <interface type=3D'ethernet'>
+      <mac address=3D'00:11:22:33:44:55'/>
+      <script path=3D'/etc/qemu-ifup'/>
+      <model type=3D'rtl8139'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </interface>
+    <interface type=3D'ethernet'>
+      <mac address=3D'00:11:22:33:44:56'/>
+      <script path=3D'/etc/qemu-ifup'/>
+      <model type=3D'e1000'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </interface>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/net-hostdev-fail.x86_64-latest.xml b/=
tests/qemuxml2xmloutdata/net-hostdev-fail.x86_64-latest.xml
new file mode 100644
index 0000000000..311f74480d
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/net-hostdev-fail.x86_64-latest.xml
@@ -0,0 +1,49 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <interface type=3D'hostdev' managed=3D'yes'>
+      <mac address=3D'00:11:22:33:44:55'/>
+      <source>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x06' slot=3D'0x12'=
 function=3D'0x1'/>
+      </source>
+      <model type=3D'virtio'/>
+      <backend tap=3D'/dev/mytap'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </interface>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/net-hostdev-multidomain.x86_64-latest=
.xml b/tests/qemuxml2xmloutdata/net-hostdev-multidomain.x86_64-latest.xml
new file mode 100644
index 0000000000..a639f951bf
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/net-hostdev-multidomain.x86_64-latest.xml
@@ -0,0 +1,54 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <interface type=3D'hostdev' managed=3D'yes'>
+      <mac address=3D'00:11:22:33:44:55'/>
+      <source>
+        <address type=3D'pci' domain=3D'0x2424' bus=3D'0x21' slot=3D'0x1c'=
 function=3D'0x6'/>
+      </source>
+      <vlan>
+        <tag id=3D'42'/>
+      </vlan>
+      <virtualport type=3D'802.1Qbg'>
+        <parameters managerid=3D'11' typeid=3D'1193047' typeidversion=3D'2=
' instanceid=3D'09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/>
+      </virtualport>
+      <model type=3D'rtl8139'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </interface>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/net-hostdev-vfio-multidomain.x86_64-l=
atest.xml b/tests/qemuxml2xmloutdata/net-hostdev-vfio-multidomain.x86_64-la=
test.xml
new file mode 100644
index 0000000000..007543d45d
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/net-hostdev-vfio-multidomain.x86_64-latest.x=
ml
@@ -0,0 +1,54 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <interface type=3D'hostdev' managed=3D'yes'>
+      <mac address=3D'00:11:22:33:44:55'/>
+      <source>
+        <address type=3D'pci' domain=3D'0x0021' bus=3D'0xde' slot=3D'0x1f'=
 function=3D'0x1'/>
+      </source>
+      <vlan>
+        <tag id=3D'42'/>
+      </vlan>
+      <virtualport type=3D'802.1Qbg'>
+        <parameters managerid=3D'11' typeid=3D'1193047' typeidversion=3D'2=
' instanceid=3D'09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/>
+      </virtualport>
+      <model type=3D'rtl8139'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </interface>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/net-mcast.x86_64-latest.xml b/tests/q=
emuxml2xmloutdata/net-mcast.x86_64-latest.xml
new file mode 100644
index 0000000000..d06866b71e
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/net-mcast.x86_64-latest.xml
@@ -0,0 +1,46 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <interface type=3D'mcast'>
+      <mac address=3D'52:54:00:8c:b9:05'/>
+      <source address=3D'192.0.0.1' port=3D'5558'/>
+      <model type=3D'rtl8139'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </interface>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/net-user-passt.x86_64-7.2.0.xml b/tes=
ts/qemuxml2xmloutdata/net-user-passt.x86_64-7.2.0.xml
new file mode 100644
index 0000000000..cfe07cc627
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/net-user-passt.x86_64-7.2.0.xml
@@ -0,0 +1,61 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-7.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'none'/>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <interface type=3D'user'>
+      <mac address=3D'00:11:22:33:44:55'/>
+      <source dev=3D'eth42'/>
+      <ip address=3D'172.17.2.0' family=3D'ipv4' prefix=3D'24'/>
+      <ip address=3D'2001:db8:ac10:fd01::feed' family=3D'ipv6'/>
+      <portForward proto=3D'tcp' address=3D'2001:db8:ac10:fd01::1:10'>
+        <range start=3D'22' to=3D'2022'/>
+        <range start=3D'1000' end=3D'1050'/>
+        <range start=3D'1020' exclude=3D'yes'/>
+        <range start=3D'1030' end=3D'1040' exclude=3D'yes'/>
+      </portForward>
+      <portForward proto=3D'udp' address=3D'1.2.3.4' dev=3D'eth0'>
+        <range start=3D'5000' end=3D'5020' to=3D'6000'/>
+        <range start=3D'5010' end=3D'5015' exclude=3D'yes'/>
+      </portForward>
+      <portForward proto=3D'tcp'>
+        <range start=3D'80'/>
+      </portForward>
+      <portForward proto=3D'tcp'>
+        <range start=3D'443' to=3D'344'/>
+      </portForward>
+      <model type=3D'rtl8139'/>
+      <backend type=3D'passt' logFile=3D'/var/log/loglaw.blog'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </interface>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/net-vhostuser-fail.x86_64-latest.xml =
b/tests/qemuxml2xmloutdata/net-vhostuser-fail.x86_64-latest.xml
new file mode 100644
index 0000000000..60e591001d
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/net-vhostuser-fail.x86_64-latest.xml
@@ -0,0 +1,46 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <interface type=3D'vhostuser'>
+      <mac address=3D'52:54:00:ee:96:6b'/>
+      <source type=3D'unix' path=3D'/tmp/vhost0.sock' mode=3D'server'/>
+      <model type=3D'virtio'/>
+      <driver queues=3D'4'/>
+      <backend tap=3D'/dev/mytap'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </interface>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/net-vhostuser-multiq.x86_64-latest.xm=
l b/tests/qemuxml2xmloutdata/net-vhostuser-multiq.x86_64-latest.xml
new file mode 100644
index 0000000000..5c2cf70a4b
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/net-vhostuser-multiq.x86_64-latest.xml
@@ -0,0 +1,73 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <interface type=3D'vhostuser'>
+      <mac address=3D'52:54:00:ee:96:6b'/>
+      <source type=3D'unix' path=3D'/tmp/vhost0.sock' mode=3D'server'/>
+      <model type=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </interface>
+    <interface type=3D'vhostuser'>
+      <mac address=3D'52:54:00:ee:96:6c'/>
+      <source type=3D'unix' path=3D'/tmp/vhost1.sock' mode=3D'client'/>
+      <model type=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </interface>
+    <interface type=3D'server'>
+      <mac address=3D'52:54:00:95:db:c0'/>
+      <source port=3D'2015'/>
+      <model type=3D'rtl8139'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </interface>
+    <interface type=3D'vhostuser'>
+      <mac address=3D'52:54:00:ee:96:6d'/>
+      <source type=3D'unix' path=3D'/tmp/vhost2.sock' mode=3D'client'>
+        <reconnect enabled=3D'yes' timeout=3D'10'/>
+      </source>
+      <model type=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x0'/>
+    </interface>
+    <interface type=3D'vhostuser'>
+      <mac address=3D'52:54:00:ee:96:6e'/>
+      <source type=3D'unix' path=3D'/tmp/vhost3.sock' mode=3D'client'>
+        <reconnect enabled=3D'no'/>
+      </source>
+      <model type=3D'virtio'/>
+      <driver queues=3D'4'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06' f=
unction=3D'0x0'/>
+    </interface>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-ccw.s390x-latest.xml b/tes=
ts/qemuxml2xmloutdata/net-virtio-ccw.s390x-latest.xml
new file mode 100644
index 0000000000..fc8f86b462
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/net-virtio-ccw.s390x-latest.xml
@@ -0,0 +1,37 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D's390x' machine=3D's390-ccw-virtio'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <interface type=3D'user'>
+      <mac address=3D'00:11:22:33:44:55'/>
+      <model type=3D'virtio'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0001'/>
+    </interface>
+    <interface type=3D'user'>
+      <mac address=3D'00:11:22:33:44:54'/>
+      <model type=3D'virtio'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0000'/>
+    </interface>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x000a'/>
+    </memballoon>
+    <panic model=3D's390'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-netdev.x86_64-latest.xml b=
/tests/qemuxml2xmloutdata/net-virtio-netdev.x86_64-latest.xml
new file mode 100644
index 0000000000..2e15c4326e
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/net-virtio-netdev.x86_64-latest.xml
@@ -0,0 +1,45 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <interface type=3D'user'>
+      <mac address=3D'00:11:22:33:44:55'/>
+      <model type=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </interface>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/numad-auto-vcpu-static-numatune.x86_6=
4-latest.xml b/tests/qemuxml2xmloutdata/numad-auto-vcpu-static-numatune.x86=
_64-latest.xml
new file mode 100644
index 0000000000..a575502bd6
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/numad-auto-vcpu-static-numatune.x86_64-lates=
t.xml
@@ -0,0 +1,44 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'auto'>2</vcpu>
+  <numatune>
+    <memory mode=3D'interleave' nodeset=3D'0'/>
+  </numatune>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+    <topology sockets=3D'2' dies=3D'1' cores=3D'1' threads=3D'1'/>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/numad-static-memory-auto-vcpu.x86_64-=
latest.xml b/tests/qemuxml2xmloutdata/numad-static-memory-auto-vcpu.x86_64-=
latest.xml
new file mode 100644
index 0000000000..2d04bc23c2
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/numad-static-memory-auto-vcpu.x86_64-latest.=
xml
@@ -0,0 +1,44 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static' cpuset=3D'0-1'>2</vcpu>
+  <numatune>
+    <memory mode=3D'interleave' placement=3D'auto'/>
+  </numatune>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+    <topology sockets=3D'2' dies=3D'1' cores=3D'1' threads=3D'1'/>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/numad.x86_64-latest.xml b/tests/qemux=
ml2xmloutdata/numad.x86_64-latest.xml
new file mode 100644
index 0000000000..80f7284126
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/numad.x86_64-latest.xml
@@ -0,0 +1,44 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'auto'>2</vcpu>
+  <numatune>
+    <memory mode=3D'interleave' placement=3D'auto'/>
+  </numatune>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+    <topology sockets=3D'2' dies=3D'1' cores=3D'1' threads=3D'1'/>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/numatune-memnode-unavailable-restrict=
ive.x86_64-latest.xml b/tests/qemuxml2xmloutdata/numatune-memnode-unavailab=
le-restrictive.x86_64-latest.xml
new file mode 100644
index 0000000000..80a516198f
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/numatune-memnode-unavailable-restrictive.x86=
_64-latest.xml
@@ -0,0 +1,30 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest</name>
+  <uuid>9f4b6512-e73a-4a25-93e8-5307802821ce</uuid>
+  <memory unit=3D'KiB'>24682468</memory>
+  <currentMemory unit=3D'KiB'>24682468</currentMemory>
+  <vcpu placement=3D'static'>32</vcpu>
+  <numatune>
+    <memory mode=3D'restrictive' nodeset=3D'999'/>
+  </numatune>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'none'/>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/numatune-memnode-unavailable-strict.x=
86_64-latest.xml b/tests/qemuxml2xmloutdata/numatune-memnode-unavailable-st=
rict.x86_64-latest.xml
new file mode 100644
index 0000000000..ab31bc2297
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/numatune-memnode-unavailable-strict.x86_64-l=
atest.xml
@@ -0,0 +1,30 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest</name>
+  <uuid>9f4b6512-e73a-4a25-93e8-5307802821ce</uuid>
+  <memory unit=3D'KiB'>24682468</memory>
+  <currentMemory unit=3D'KiB'>24682468</currentMemory>
+  <vcpu placement=3D'static'>32</vcpu>
+  <numatune>
+    <memory mode=3D'strict' nodeset=3D'999'/>
+  </numatune>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'none'/>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/numatune-memnode.x86_64-5.2.0.xml b/t=
ests/qemuxml2xmloutdata/numatune-memnode.x86_64-5.2.0.xml
new file mode 100644
index 0000000000..61c6ab883b
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/numatune-memnode.x86_64-5.2.0.xml
@@ -0,0 +1,41 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest</name>
+  <uuid>9f4b6512-e73a-4a25-93e8-5307802821ce</uuid>
+  <memory unit=3D'KiB'>24682468</memory>
+  <currentMemory unit=3D'KiB'>24682468</currentMemory>
+  <vcpu placement=3D'static'>32</vcpu>
+  <numatune>
+    <memory mode=3D'strict' nodeset=3D'0-3'/>
+    <memnode cellid=3D'0' mode=3D'preferred' nodeset=3D'3'/>
+    <memnode cellid=3D'2' mode=3D'strict' nodeset=3D'0,2'/>
+  </numatune>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+    <numa>
+      <cell id=3D'0' cpus=3D'0' memory=3D'20002' unit=3D'KiB'/>
+      <cell id=3D'1' cpus=3D'1-27,29' memory=3D'660066' unit=3D'KiB'/>
+      <cell id=3D'2' cpus=3D'28,30-31' memory=3D'24002400' unit=3D'KiB'/>
+    </numa>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/numatune-static-nodeset-exceed-hostno=
de.x86_64-latest.xml b/tests/qemuxml2xmloutdata/numatune-static-nodeset-exc=
eed-hostnode.x86_64-latest.xml
new file mode 100644
index 0000000000..23fd630681
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/numatune-static-nodeset-exceed-hostnode.x86_=
64-latest.xml
@@ -0,0 +1,48 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>4</vcpu>
+  <numatune>
+    <memnode cellid=3D'0' mode=3D'strict' nodeset=3D'0-8'/>
+    <memnode cellid=3D'1' mode=3D'strict' nodeset=3D'0'/>
+  </numatune>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+    <numa>
+      <cell id=3D'0' cpus=3D'0-1' memory=3D'524288' unit=3D'KiB'/>
+      <cell id=3D'1' cpus=3D'2-3' memory=3D'524288' unit=3D'KiB'/>
+    </numa>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/numatune-system-memory.x86_64-latest.=
xml b/tests/qemuxml2xmloutdata/numatune-system-memory.x86_64-latest.xml
new file mode 100644
index 0000000000..55afad0503
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/numatune-system-memory.x86_64-latest.xml
@@ -0,0 +1,32 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>2</vcpu>
+  <numatune>
+    <memory mode=3D'strict' nodeset=3D'0'/>
+  </numatune>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/parallel-parport-chardev.x86_64-lates=
t.xml b/tests/qemuxml2xmloutdata/parallel-parport-chardev.x86_64-latest.xml
new file mode 100644
index 0000000000..64bf42e99b
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/parallel-parport-chardev.x86_64-latest.xml
@@ -0,0 +1,44 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <parallel type=3D'dev'>
+      <source path=3D'/dev/parport0'/>
+      <target port=3D'0'/>
+    </parallel>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/parallel-tcp-chardev.x86_64-latest.xm=
l b/tests/qemuxml2xmloutdata/parallel-tcp-chardev.x86_64-latest.xml
new file mode 100644
index 0000000000..e14bd389a4
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/parallel-tcp-chardev.x86_64-latest.xml
@@ -0,0 +1,45 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <parallel type=3D'tcp'>
+      <source mode=3D'bind' host=3D'127.0.0.1' service=3D'9999'/>
+      <protocol type=3D'raw'/>
+      <target port=3D'0'/>
+    </parallel>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/parallel-unix-chardev.x86_64-latest.x=
ml b/tests/qemuxml2xmloutdata/parallel-unix-chardev.x86_64-latest.xml
new file mode 100644
index 0000000000..63fa4cacba
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/parallel-unix-chardev.x86_64-latest.xml
@@ -0,0 +1,42 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <parallel type=3D'unix'>
+      <source mode=3D'bind' path=3D'/tmp/parport0.socket'/>
+      <target port=3D'0'/>
+    </parallel>
+    <parallel type=3D'unix'>
+      <source mode=3D'connect' path=3D'/tmp/parport1.socket'/>
+      <target port=3D'1'/>
+    </parallel>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/ppc-dtb.ppc-latest.xml b/tests/qemuxm=
l2xmloutdata/ppc-dtb.ppc-latest.xml
new file mode 100644
index 0000000000..400f749eb0
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/ppc-dtb.ppc-latest.xml
@@ -0,0 +1,36 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>49545eb3-75e1-2d0a-acdd-f0294406c99e</uuid>
+  <memory unit=3D'KiB'>262144</memory>
+  <currentMemory unit=3D'KiB'>262144</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'ppc' machine=3D'ppce500'>hvm</type>
+    <kernel>/media/ram/uImage</kernel>
+    <initrd>/media/ram/ramdisk</initrd>
+    <cmdline>root=3D/dev/ram rw console=3DttyS0,115200</cmdline>
+    <dtb>/media/ram/test.dtb</dtb>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-ppc</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <serial type=3D'pty'>
+      <target port=3D'0'/>
+    </serial>
+    <console type=3D'pty'>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/ppc64-usb-controller-qemu-xhci.ppc64-=
latest.xml b/tests/qemuxml2xmloutdata/ppc64-usb-controller-qemu-xhci.ppc64-=
latest.xml
new file mode 100644
index 0000000000..26aecda36c
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/ppc64-usb-controller-qemu-xhci.ppc64-latest.=
xml
@@ -0,0 +1,38 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'ppc64' machine=3D'pseries'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>POWER9</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-ppc64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'>
+      <model name=3D'spapr-pci-host-bridge'/>
+      <target index=3D'0'/>
+    </controller>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06' f=
unction=3D'0x0'/>
+    </memballoon>
+    <panic model=3D'pseries'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/ppce500-serial.ppc-latest.xml b/tests=
/qemuxml2xmloutdata/ppce500-serial.ppc-latest.xml
new file mode 100644
index 0000000000..c6c41d7726
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/ppce500-serial.ppc-latest.xml
@@ -0,0 +1,35 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>262144</memory>
+  <currentMemory unit=3D'KiB'>262144</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'ppc' machine=3D'ppce500'>hvm</type>
+    <kernel>/media/ram/uImage</kernel>
+    <initrd>/media/ram/ramdisk</initrd>
+    <cmdline>root=3D/dev/ram rw console=3DttyS0,115200</cmdline>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-ppc</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <serial type=3D'pty'>
+      <target port=3D'0'/>
+    </serial>
+    <console type=3D'pty'>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/pseries-basic.ppc64-latest.xml b/test=
s/qemuxml2xmloutdata/pseries-basic.ppc64-latest.xml
new file mode 100644
index 0000000000..f22634994c
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/pseries-basic.ppc64-latest.xml
@@ -0,0 +1,41 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit=3D'KiB'>524288</memory>
+  <currentMemory unit=3D'KiB'>524288</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'ppc64' machine=3D'pseries'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>POWER9</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-ppc64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'pci-ohci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'>
+      <model name=3D'spapr-pci-host-bridge'/>
+      <target index=3D'0'/>
+    </controller>
+    <serial type=3D'pty'>
+      <target type=3D'spapr-vio-serial' port=3D'0'>
+        <model name=3D'spapr-vty'/>
+      </target>
+      <address type=3D'spapr-vio' reg=3D'0x30000000'/>
+    </serial>
+    <console type=3D'pty'>
+      <target type=3D'serial' port=3D'0'/>
+      <address type=3D'spapr-vio' reg=3D'0x30000000'/>
+    </console>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+    <panic model=3D'pseries'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/pseries-cpu-le.ppc64-latest.xml b/tes=
ts/qemuxml2xmloutdata/pseries-cpu-le.ppc64-latest.xml
new file mode 100644
index 0000000000..1ab7e8d83f
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/pseries-cpu-le.ppc64-latest.xml
@@ -0,0 +1,41 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit=3D'KiB'>524288</memory>
+  <currentMemory unit=3D'KiB'>524288</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'ppc64le' machine=3D'pseries'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>POWER9</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-ppc64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'pci-ohci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'>
+      <model name=3D'spapr-pci-host-bridge'/>
+      <target index=3D'0'/>
+    </controller>
+    <serial type=3D'pty'>
+      <target type=3D'spapr-vio-serial' port=3D'0'>
+        <model name=3D'spapr-vty'/>
+      </target>
+      <address type=3D'spapr-vio' reg=3D'0x30000000'/>
+    </serial>
+    <console type=3D'pty'>
+      <target type=3D'serial' port=3D'0'/>
+      <address type=3D'spapr-vio' reg=3D'0x30000000'/>
+    </console>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+    <panic model=3D'pseries'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/pseries-features.ppc64-4.2.0.xml b/te=
sts/qemuxml2xmloutdata/pseries-features.ppc64-4.2.0.xml
new file mode 100644
index 0000000000..c0ff69e5ba
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/pseries-features.ppc64-4.2.0.xml
@@ -0,0 +1,40 @@
+<domain type=3D'qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit=3D'KiB'>524288</memory>
+  <currentMemory unit=3D'KiB'>524288</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'ppc64' machine=3D'pseries-4.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <features>
+    <hpt resizing=3D'required'>
+      <maxpagesize unit=3D'KiB'>1048576</maxpagesize>
+    </hpt>
+    <htm state=3D'on'/>
+    <nested-hv state=3D'off'/>
+    <ccf-assist state=3D'on'/>
+    <cfpc value=3D'fixed'/>
+    <sbbc value=3D'broken'/>
+    <ibs value=3D'fixed-ccd'/>
+  </features>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>POWER9</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-ppc64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'>
+      <model name=3D'spapr-pci-host-bridge'/>
+      <target index=3D'0'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'none'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+    <panic model=3D'pseries'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/pseries-usb-default.ppc64-latest.xml =
b/tests/qemuxml2xmloutdata/pseries-usb-default.ppc64-latest.xml
new file mode 100644
index 0000000000..f22634994c
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/pseries-usb-default.ppc64-latest.xml
@@ -0,0 +1,41 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit=3D'KiB'>524288</memory>
+  <currentMemory unit=3D'KiB'>524288</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'ppc64' machine=3D'pseries'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>POWER9</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-ppc64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'pci-ohci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'>
+      <model name=3D'spapr-pci-host-bridge'/>
+      <target index=3D'0'/>
+    </controller>
+    <serial type=3D'pty'>
+      <target type=3D'spapr-vio-serial' port=3D'0'>
+        <model name=3D'spapr-vty'/>
+      </target>
+      <address type=3D'spapr-vio' reg=3D'0x30000000'/>
+    </serial>
+    <console type=3D'pty'>
+      <target type=3D'serial' port=3D'0'/>
+      <address type=3D'spapr-vio' reg=3D'0x30000000'/>
+    </console>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+    <panic model=3D'pseries'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/pseries-usb-kbd.ppc64-latest.xml b/te=
sts/qemuxml2xmloutdata/pseries-usb-kbd.ppc64-latest.xml
new file mode 100644
index 0000000000..94ce39439c
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/pseries-usb-kbd.ppc64-latest.xml
@@ -0,0 +1,42 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit=3D'KiB'>524288</memory>
+  <currentMemory unit=3D'KiB'>524288</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'ppc64' machine=3D'pseries'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>POWER9</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-ppc64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'pci-ohci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'>
+      <model name=3D'spapr-pci-host-bridge'/>
+      <target index=3D'0'/>
+    </controller>
+    <serial type=3D'pty'>
+      <target type=3D'spapr-vio-serial' port=3D'0'>
+        <model name=3D'spapr-vty'/>
+      </target>
+      <address type=3D'spapr-vio' reg=3D'0x30000000'/>
+    </serial>
+    <console type=3D'pty'>
+      <target type=3D'serial' port=3D'0'/>
+      <address type=3D'spapr-vio' reg=3D'0x30000000'/>
+    </console>
+    <input type=3D'keyboard' bus=3D'usb'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+    <panic model=3D'pseries'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/pseries-usb-multi.ppc64-latest.xml b/=
tests/qemuxml2xmloutdata/pseries-usb-multi.ppc64-latest.xml
new file mode 100644
index 0000000000..d5ea90c5b5
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/pseries-usb-multi.ppc64-latest.xml
@@ -0,0 +1,44 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit=3D'KiB'>524288</memory>
+  <currentMemory unit=3D'KiB'>524288</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'ppc64' machine=3D'pseries'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>POWER9</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-ppc64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'usb' index=3D'1' model=3D'pci-ohci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'>
+      <model name=3D'spapr-pci-host-bridge'/>
+      <target index=3D'0'/>
+    </controller>
+    <serial type=3D'pty'>
+      <target type=3D'spapr-vio-serial' port=3D'0'>
+        <model name=3D'spapr-vty'/>
+      </target>
+      <address type=3D'spapr-vio' reg=3D'0x30000000'/>
+    </serial>
+    <console type=3D'pty'>
+      <target type=3D'serial' port=3D'0'/>
+      <address type=3D'spapr-vio' reg=3D'0x30000000'/>
+    </console>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+    <panic model=3D'pseries'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/pseries-vio-user-assigned.ppc64-lates=
t.xml b/tests/qemuxml2xmloutdata/pseries-vio-user-assigned.ppc64-latest.xml
new file mode 100644
index 0000000000..a42abe24e9
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/pseries-vio-user-assigned.ppc64-latest.xml
@@ -0,0 +1,59 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>2754dd7b-ac8a-4850-aec0-1f3fcd43235b</uuid>
+  <memory unit=3D'KiB'>524288</memory>
+  <currentMemory unit=3D'KiB'>524288</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'ppc64' machine=3D'pseries'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>POWER9</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-ppc64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/tmp/scsidisk.img'/>
+      <target dev=3D'sda' bus=3D'scsi'/>
+      <address type=3D'drive' controller=3D'1' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'scsi' index=3D'0' model=3D'ibmvscsi'>
+      <address type=3D'spapr-vio' reg=3D'0x00002000'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'1' model=3D'ibmvscsi'>
+      <address type=3D'spapr-vio' reg=3D'0x30000000'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'pci-ohci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'>
+      <model name=3D'spapr-pci-host-bridge'/>
+      <target index=3D'0'/>
+    </controller>
+    <serial type=3D'pty'>
+      <target type=3D'spapr-vio-serial' port=3D'0'>
+        <model name=3D'spapr-vty'/>
+      </target>
+      <address type=3D'spapr-vio' reg=3D'0x20000000'/>
+    </serial>
+    <serial type=3D'pty'>
+      <target type=3D'spapr-vio-serial' port=3D'1'>
+        <model name=3D'spapr-vty'/>
+      </target>
+      <address type=3D'spapr-vio' reg=3D'0x30001000'/>
+    </serial>
+    <console type=3D'pty'>
+      <target type=3D'serial' port=3D'0'/>
+      <address type=3D'spapr-vio' reg=3D'0x20000000'/>
+    </console>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+    <panic model=3D'pseries'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/pseries-vio.ppc64-latest.xml b/tests/=
qemuxml2xmloutdata/pseries-vio.ppc64-latest.xml
new file mode 100644
index 0000000000..7253c234c5
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/pseries-vio.ppc64-latest.xml
@@ -0,0 +1,59 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>2754dd7b-ac8a-4850-aec0-1f3fcd43235b</uuid>
+  <memory unit=3D'KiB'>524288</memory>
+  <currentMemory unit=3D'KiB'>524288</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'ppc64' machine=3D'pseries'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>POWER9</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-ppc64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/tmp/scsidisk.img'/>
+      <target dev=3D'sda' bus=3D'scsi'/>
+      <address type=3D'drive' controller=3D'1' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'scsi' index=3D'0' model=3D'ibmvscsi'>
+      <address type=3D'spapr-vio' reg=3D'0x00002000'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'1' model=3D'ibmvscsi'>
+      <address type=3D'spapr-vio' reg=3D'0x00003000'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'pci-ohci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'>
+      <model name=3D'spapr-pci-host-bridge'/>
+      <target index=3D'0'/>
+    </controller>
+    <serial type=3D'pty'>
+      <target type=3D'spapr-vio-serial' port=3D'0'>
+        <model name=3D'spapr-vty'/>
+      </target>
+      <address type=3D'spapr-vio' reg=3D'0x30000000'/>
+    </serial>
+    <serial type=3D'pty'>
+      <target type=3D'spapr-vio-serial' port=3D'1'>
+        <model name=3D'spapr-vty'/>
+      </target>
+      <address type=3D'spapr-vio' reg=3D'0x30001000'/>
+    </serial>
+    <console type=3D'pty'>
+      <target type=3D'serial' port=3D'0'/>
+      <address type=3D'spapr-vio' reg=3D'0x30000000'/>
+    </console>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+    <panic model=3D'pseries'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/q35-default-devices-only.x86_64-4.2.0=
.xml b/tests/qemuxml2xmloutdata/q35-default-devices-only.x86_64-4.2.0.xml
new file mode 100644
index 0000000000..b107164ff6
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/q35-default-devices-only.x86_64-4.2.0.xml
@@ -0,0 +1,50 @@
+<domain type=3D'qemu'>
+  <name>q35-test</name>
+  <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid>
+  <memory unit=3D'KiB'>2097152</memory>
+  <currentMemory unit=3D'KiB'>2097152</currentMemory>
+  <vcpu placement=3D'static' cpuset=3D'0-1'>2</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-4.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/q35-multifunction.x86_64-4.2.0.xml b/=
tests/qemuxml2xmloutdata/q35-multifunction.x86_64-4.2.0.xml
new file mode 100644
index 0000000000..e647bfcea4
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/q35-multifunction.x86_64-4.2.0.xml
@@ -0,0 +1,125 @@
+<domain type=3D'qemu'>
+  <name>q35-test</name>
+  <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid>
+  <memory unit=3D'KiB'>2097152</memory>
+  <currentMemory unit=3D'KiB'>2097152</currentMemory>
+  <vcpu placement=3D'static' cpuset=3D'0-1'>2</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-4.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x10'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x11'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0x12'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'4' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'4' port=3D'0x18'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'5' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'5' port=3D'0x19'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x1' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'6' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'6' port=3D'0x20'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0' multifunction=3D'off'/>
+    </controller>
+    <controller type=3D'pci' index=3D'7' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'7' port=3D'0x21'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'8' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'8' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'9' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'9' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'10' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'10' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'11' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'11' port=3D'0xb'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x3'/>
+    </controller>
+    <controller type=3D'pci' index=3D'12' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'12' port=3D'0xc'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x4'/>
+    </controller>
+    <controller type=3D'pci' index=3D'13' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'13' port=3D'0xd'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x5'/>
+    </controller>
+    <controller type=3D'pci' index=3D'14' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'14' port=3D'0xe'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x6'/>
+    </controller>
+    <controller type=3D'pci' index=3D'15' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'15' port=3D'0xf'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x7'/>
+    </controller>
+    <controller type=3D'pci' index=3D'16' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'16' port=3D'0x13'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x3'/>
+    </controller>
+    <controller type=3D'pci' index=3D'17' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'17' port=3D'0x14'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x4'/>
+    </controller>
+    <controller type=3D'pci' index=3D'18' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'18' port=3D'0x15'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x5'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/q35-pcie-autoadd.x86_64-4.2.0.xml b/t=
ests/qemuxml2xmloutdata/q35-pcie-autoadd.x86_64-4.2.0.xml
new file mode 100644
index 0000000000..d33a9876fb
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/q35-pcie-autoadd.x86_64-4.2.0.xml
@@ -0,0 +1,154 @@
+<domain type=3D'qemu'>
+  <name>q35-test</name>
+  <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid>
+  <memory unit=3D'KiB'>2097152</memory>
+  <currentMemory unit=3D'KiB'>2097152</currentMemory>
+  <vcpu placement=3D'static' cpuset=3D'0-1'>2</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-4.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'vdb' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x07' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x04' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'0' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'nec-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x06' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x10'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x11'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0x12'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'4' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'4' port=3D'0x13'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x3'/>
+    </controller>
+    <controller type=3D'pci' index=3D'5' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'5' port=3D'0x14'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x4'/>
+    </controller>
+    <controller type=3D'pci' index=3D'6' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'6' port=3D'0x15'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x5'/>
+    </controller>
+    <controller type=3D'pci' index=3D'7' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'7' port=3D'0x16'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x6'/>
+    </controller>
+    <controller type=3D'pci' index=3D'8' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'8' port=3D'0x17'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x7'/>
+    </controller>
+    <controller type=3D'pci' index=3D'9' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'9' port=3D'0x18'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'10' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'10' port=3D'0x19'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'11' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'11' port=3D'0x1a'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'12' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'12' port=3D'0x1b'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x3'/>
+    </controller>
+    <controller type=3D'pci' index=3D'13' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'13' port=3D'0x1c'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x4'/>
+    </controller>
+    <controller type=3D'pci' index=3D'14' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'14' port=3D'0x1d'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x5'/>
+    </controller>
+    <filesystem type=3D'mount' accessmode=3D'passthrough'>
+      <source dir=3D'/export/to/guest'/>
+      <target dir=3D'/import/from/host'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </filesystem>
+    <interface type=3D'user'>
+      <mac address=3D'00:11:22:33:44:55'/>
+      <model type=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </interface>
+    <interface type=3D'user'>
+      <mac address=3D'00:11:22:33:44:66'/>
+      <model type=3D'e1000e'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </interface>
+    <input type=3D'passthrough' bus=3D'virtio'>
+      <source evdev=3D'/dev/input/event1234'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0a' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </input>
+    <input type=3D'mouse' bus=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0b' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </input>
+    <input type=3D'keyboard' bus=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0c' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </input>
+    <input type=3D'tablet' bus=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0d' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </input>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <model type=3D'virtio' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </video>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x08' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+    <rng model=3D'virtio'>
+      <rate bytes=3D'123' period=3D'1234'/>
+      <backend model=3D'random'>/dev/urandom</backend>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x09' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </rng>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/q35-pcie.x86_64-4.2.0.xml b/tests/qem=
uxml2xmloutdata/q35-pcie.x86_64-4.2.0.xml
new file mode 100644
index 0000000000..05904c1bf1
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/q35-pcie.x86_64-4.2.0.xml
@@ -0,0 +1,158 @@
+<domain type=3D'qemu'>
+  <name>q35-test</name>
+  <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid>
+  <memory unit=3D'KiB'>2097152</memory>
+  <currentMemory unit=3D'KiB'>2097152</currentMemory>
+  <vcpu placement=3D'static' cpuset=3D'0-1'>2</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-4.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'vdb' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x09' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'pci' index=3D'1' model=3D'dmi-to-pci-bridge'>
+      <model name=3D'i82801b11-bridge'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1e' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pci-bridge'>
+      <model name=3D'pci-bridge'/>
+      <target chassisNr=3D'2'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0x10'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'4' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'4' port=3D'0x11'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'5' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'5' port=3D'0x12'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'6' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'6' port=3D'0x13'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x3'/>
+    </controller>
+    <controller type=3D'pci' index=3D'7' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'7' port=3D'0x14'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x4'/>
+    </controller>
+    <controller type=3D'pci' index=3D'8' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'8' port=3D'0x15'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x5'/>
+    </controller>
+    <controller type=3D'pci' index=3D'9' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'9' port=3D'0x16'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x6'/>
+    </controller>
+    <controller type=3D'pci' index=3D'10' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'10' port=3D'0x17'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x7'/>
+    </controller>
+    <controller type=3D'pci' index=3D'11' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'11' port=3D'0x18'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'12' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'12' port=3D'0x19'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'13' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'13' port=3D'0x1a'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'14' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'14' port=3D'0x1b'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x3'/>
+    </controller>
+    <controller type=3D'pci' index=3D'15' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'15' port=3D'0x1c'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x4'/>
+    </controller>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x06' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'0' model=3D'virtio-scsi'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x07' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'nec-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x08' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <filesystem type=3D'mount' accessmode=3D'passthrough'>
+      <source dir=3D'/export/to/guest'/>
+      <target dir=3D'/import/from/host'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </filesystem>
+    <interface type=3D'user'>
+      <mac address=3D'00:11:22:33:44:55'/>
+      <model type=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x04' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </interface>
+    <interface type=3D'user'>
+      <mac address=3D'00:11:22:33:44:66'/>
+      <model type=3D'e1000e'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </interface>
+    <input type=3D'passthrough' bus=3D'virtio'>
+      <source evdev=3D'/dev/input/event1234'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0c' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </input>
+    <input type=3D'mouse' bus=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0d' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </input>
+    <input type=3D'keyboard' bus=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0e' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </input>
+    <input type=3D'tablet' bus=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0f' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </input>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <model type=3D'virtio' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </video>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0a' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+    <rng model=3D'virtio'>
+      <rate bytes=3D'123' period=3D'1234'/>
+      <backend model=3D'random'>/dev/urandom</backend>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0b' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </rng>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/q35-virt-manager-basic.x86_64-4.2.0.x=
ml b/tests/qemuxml2xmloutdata/q35-virt-manager-basic.x86_64-4.2.0.xml
new file mode 100644
index 0000000000..25fb639a88
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/q35-virt-manager-basic.x86_64-4.2.0.xml
@@ -0,0 +1,128 @@
+<domain type=3D'kvm'>
+  <name>virt-manager-basic</name>
+  <uuid>1b826c23-8767-47ad-a6b5-c83a88277f71</uuid>
+  <memory unit=3D'KiB'>4194304</memory>
+  <currentMemory unit=3D'KiB'>4194304</currentMemory>
+  <vcpu placement=3D'static'>2</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-q35-4.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <vmport state=3D'off'/>
+  </features>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </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'yes'/>
+  </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/basic.qcow2'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x04' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'nec-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x10'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x11'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0x12'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'4' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'4' port=3D'0x13'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x3'/>
+    </controller>
+    <controller type=3D'pci' index=3D'5' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'5' port=3D'0x14'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x4'/>
+    </controller>
+    <controller type=3D'pci' index=3D'6' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'6' port=3D'0x15'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x5'/>
+    </controller>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:00:9a:e6:c6'/>
+      <model type=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </interface>
+    <serial type=3D'pty'>
+      <target type=3D'isa-serial' port=3D'0'>
+        <model name=3D'isa-serial'/>
+      </target>
+    </serial>
+    <console type=3D'pty'>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <channel type=3D'unix'>
+      <target type=3D'virtio' name=3D'org.qemu.guest_agent.0'/>
+      <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'/>
+      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'2=
'/>
+    </channel>
+    <input type=3D'tablet' bus=3D'usb'>
+      <address type=3D'usb' bus=3D'0' port=3D'1'/>
+    </input>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <graphics type=3D'spice' autoport=3D'yes'>
+      <listen type=3D'address'/>
+      <image compression=3D'off'/>
+    </graphics>
+    <sound model=3D'ich9'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1b' f=
unction=3D'0x0'/>
+    </sound>
+    <audio id=3D'1' type=3D'spice'/>
+    <video>
+      <model type=3D'qxl' ram=3D'65536' vram=3D'65536' vgamem=3D'16384' he=
ads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </video>
+    <redirdev bus=3D'usb' type=3D'spicevmc'>
+      <address type=3D'usb' bus=3D'0' port=3D'2'/>
+    </redirdev>
+    <redirdev bus=3D'usb' type=3D'spicevmc'>
+      <address type=3D'usb' bus=3D'0' port=3D'3'/>
+    </redirdev>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/qemu-ns-alt.x86_64-latest.xml b/tests=
/qemuxml2xmloutdata/qemu-ns-alt.x86_64-latest.xml
new file mode 100644
index 0000000000..32c642f7db
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/qemu-ns-alt.x86_64-latest.xml
@@ -0,0 +1,46 @@
+<domain type=3D'qemu' xmlns:qemu=3D'http://libvirt.org/schemas/domain/qemu=
/1.0'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+  <qemu:commandline>
+    <qemu:arg value=3D'-unknown'/>
+    <qemu:arg value=3D'parameter'/>
+    <qemu:env name=3D'NS' value=3D'ns'/>
+    <qemu:env name=3D'BAR'/>
+  </qemu:commandline>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/qemu-ns-commandline-ns0.x86_64-latest=
.xml b/tests/qemuxml2xmloutdata/qemu-ns-commandline-ns0.x86_64-latest.xml
new file mode 100644
index 0000000000..a068420c94
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/qemu-ns-commandline-ns0.x86_64-latest.xml
@@ -0,0 +1,43 @@
+<domain type=3D'qemu' xmlns:qemu=3D'http://libvirt.org/schemas/domain/qemu=
/1.0'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+  <qemu:commandline>
+    <qemu:arg value=3D'ARGUMENT'/>
+  </qemu:commandline>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/qemu-ns-commandline-ns1.x86_64-latest=
.xml b/tests/qemuxml2xmloutdata/qemu-ns-commandline-ns1.x86_64-latest.xml
new file mode 100644
index 0000000000..a068420c94
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/qemu-ns-commandline-ns1.x86_64-latest.xml
@@ -0,0 +1,43 @@
+<domain type=3D'qemu' xmlns:qemu=3D'http://libvirt.org/schemas/domain/qemu=
/1.0'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+  <qemu:commandline>
+    <qemu:arg value=3D'ARGUMENT'/>
+  </qemu:commandline>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/qemu-ns-commandline.x86_64-latest.xml=
 b/tests/qemuxml2xmloutdata/qemu-ns-commandline.x86_64-latest.xml
new file mode 100644
index 0000000000..a068420c94
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/qemu-ns-commandline.x86_64-latest.xml
@@ -0,0 +1,43 @@
+<domain type=3D'qemu' xmlns:qemu=3D'http://libvirt.org/schemas/domain/qemu=
/1.0'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+  <qemu:commandline>
+    <qemu:arg value=3D'ARGUMENT'/>
+  </qemu:commandline>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/qemu-ns-domain-commandline-ns0.x86_64=
-latest.xml b/tests/qemuxml2xmloutdata/qemu-ns-domain-commandline-ns0.x86_6=
4-latest.xml
new file mode 100644
index 0000000000..a068420c94
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/qemu-ns-domain-commandline-ns0.x86_64-latest=
.xml
@@ -0,0 +1,43 @@
+<domain type=3D'qemu' xmlns:qemu=3D'http://libvirt.org/schemas/domain/qemu=
/1.0'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+  <qemu:commandline>
+    <qemu:arg value=3D'ARGUMENT'/>
+  </qemu:commandline>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/qemu-ns-domain-commandline.x86_64-lat=
est.xml b/tests/qemuxml2xmloutdata/qemu-ns-domain-commandline.x86_64-latest=
.xml
new file mode 100644
index 0000000000..a068420c94
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/qemu-ns-domain-commandline.x86_64-latest.xml
@@ -0,0 +1,43 @@
+<domain type=3D'qemu' xmlns:qemu=3D'http://libvirt.org/schemas/domain/qemu=
/1.0'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+  <qemu:commandline>
+    <qemu:arg value=3D'ARGUMENT'/>
+  </qemu:commandline>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/qemu-ns-domain-ns0.x86_64-latest.xml =
b/tests/qemuxml2xmloutdata/qemu-ns-domain-ns0.x86_64-latest.xml
new file mode 100644
index 0000000000..a068420c94
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/qemu-ns-domain-ns0.x86_64-latest.xml
@@ -0,0 +1,43 @@
+<domain type=3D'qemu' xmlns:qemu=3D'http://libvirt.org/schemas/domain/qemu=
/1.0'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+  <qemu:commandline>
+    <qemu:arg value=3D'ARGUMENT'/>
+  </qemu:commandline>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/restore-v2-fd.x86_64-latest.xml b/tes=
ts/qemuxml2xmloutdata/restore-v2-fd.x86_64-latest.xml
new file mode 100644
index 0000000000..576657ee94
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/restore-v2-fd.x86_64-latest.xml
@@ -0,0 +1,40 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/s390-allow-bogus-usb-controller.s390x=
-latest.xml b/tests/qemuxml2xmloutdata/s390-allow-bogus-usb-controller.s390=
x-latest.xml
new file mode 100644
index 0000000000..392f03fbc6
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/s390-allow-bogus-usb-controller.s390x-latest=
.xml
@@ -0,0 +1,48 @@
+<domain type=3D'qemu'>
+  <name>test</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D's390x' machine=3D's390-ccw-virtio'>hvm</type>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'virtio'/>
+      <boot order=3D'1'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0000'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'>
+        <zpci uid=3D'0x0001' fid=3D'0x00000000'/>
+      </address>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0001'/>
+    </controller>
+    <console type=3D'pty'>
+      <target type=3D'virtio' port=3D'0'/>
+    </console>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0002'/>
+    </memballoon>
+    <rng model=3D'virtio'>
+      <backend model=3D'random'>/dev/hwrng</backend>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0003'/>
+    </rng>
+    <panic model=3D's390'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/s390-allow-bogus-usb-none.s390x-lates=
t.xml b/tests/qemuxml2xmloutdata/s390-allow-bogus-usb-none.s390x-latest.xml
new file mode 100644
index 0000000000..97a14b63f7
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/s390-allow-bogus-usb-none.s390x-latest.xml
@@ -0,0 +1,44 @@
+<domain type=3D'qemu'>
+  <name>test</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D's390x' machine=3D's390-ccw-virtio'>hvm</type>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'virtio'/>
+      <boot order=3D'1'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0000'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'none'/>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0001'/>
+    </controller>
+    <console type=3D'pty'>
+      <target type=3D'virtio' port=3D'0'/>
+    </console>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0002'/>
+    </memballoon>
+    <rng model=3D'virtio'>
+      <backend model=3D'random'>/dev/hwrng</backend>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0003'/>
+    </rng>
+    <panic model=3D's390'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic.x86_64-latest.xml b/=
tests/qemuxml2xmloutdata/seclabel-dynamic.x86_64-latest.xml
new file mode 100644
index 0000000000..120d1887f2
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic.x86_64-latest.xml
@@ -0,0 +1,41 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static' cpuset=3D'1-4,8-20,525'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+  <seclabel type=3D'dynamic' model=3D'selinux' relabel=3D'yes'/>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/seclabel-static-relabel.x86_64-latest=
.xml b/tests/qemuxml2xmloutdata/seclabel-static-relabel.x86_64-latest.xml
new file mode 100644
index 0000000000..3301443f5c
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/seclabel-static-relabel.x86_64-latest.xml
@@ -0,0 +1,43 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static' cpuset=3D'1-4,8-20,525'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+  <seclabel type=3D'static' model=3D'selinux' relabel=3D'yes'>
+    <label>system_u:system_r:svirt_custom_t:s0:c192,c392</label>
+  </seclabel>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/serial-dev-chardev-iobase.x86_64-late=
st.xml b/tests/qemuxml2xmloutdata/serial-dev-chardev-iobase.x86_64-latest.x=
ml
new file mode 100644
index 0000000000..efa4cb2ffe
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/serial-dev-chardev-iobase.x86_64-latest.xml
@@ -0,0 +1,52 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <serial type=3D'dev'>
+      <source path=3D'/dev/ttyS2'/>
+      <target type=3D'isa-serial' port=3D'0'>
+        <model name=3D'isa-serial'/>
+      </target>
+      <address type=3D'isa' iobase=3D'0x3f8' irq=3D'0x4'/>
+    </serial>
+    <console type=3D'dev'>
+      <source path=3D'/dev/ttyS2'/>
+      <target type=3D'serial' port=3D'0'/>
+      <address type=3D'isa' iobase=3D'0x3f8' irq=3D'0x4'/>
+    </console>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/serial-dev-chardev.x86_64-latest.xml =
b/tests/qemuxml2xmloutdata/serial-dev-chardev.x86_64-latest.xml
new file mode 100644
index 0000000000..390f41ea8e
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/serial-dev-chardev.x86_64-latest.xml
@@ -0,0 +1,50 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <serial type=3D'dev'>
+      <source path=3D'/dev/ttyS2'/>
+      <target type=3D'isa-serial' port=3D'0'>
+        <model name=3D'isa-serial'/>
+      </target>
+    </serial>
+    <console type=3D'dev'>
+      <source path=3D'/dev/ttyS2'/>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/serial-file-chardev.x86_64-latest.xml=
 b/tests/qemuxml2xmloutdata/serial-file-chardev.x86_64-latest.xml
new file mode 100644
index 0000000000..fc5964068c
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/serial-file-chardev.x86_64-latest.xml
@@ -0,0 +1,50 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <serial type=3D'file'>
+      <source path=3D'/tmp/serial.log' append=3D'on'/>
+      <target type=3D'isa-serial' port=3D'0'>
+        <model name=3D'isa-serial'/>
+      </target>
+    </serial>
+    <console type=3D'file'>
+      <source path=3D'/tmp/serial.log' append=3D'on'/>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/serial-file-log.x86_64-latest.xml b/t=
ests/qemuxml2xmloutdata/serial-file-log.x86_64-latest.xml
new file mode 100644
index 0000000000..f646dfddb5
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/serial-file-log.x86_64-latest.xml
@@ -0,0 +1,50 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <serial type=3D'file'>
+      <source path=3D'/tmp/serial.log'/>
+      <log file=3D'/var/lib/libvirt/qemu/demo-serial.log' append=3D'off'/>
+      <target type=3D'isa-serial' port=3D'0'>
+        <model name=3D'isa-serial'/>
+      </target>
+    </serial>
+    <console type=3D'file'>
+      <source path=3D'/tmp/serial.log'/>
+      <log file=3D'/var/lib/libvirt/qemu/demo-serial.log' append=3D'off'/>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/serial-many-chardev.x86_64-latest.xml=
 b/tests/qemuxml2xmloutdata/serial-many-chardev.x86_64-latest.xml
new file mode 100644
index 0000000000..09e20a3c76
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/serial-many-chardev.x86_64-latest.xml
@@ -0,0 +1,54 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <serial type=3D'pty'>
+      <target type=3D'isa-serial' port=3D'0'>
+        <model name=3D'isa-serial'/>
+      </target>
+    </serial>
+    <serial type=3D'file'>
+      <source path=3D'/tmp/serial.log'/>
+      <target type=3D'isa-serial' port=3D'1'>
+        <model name=3D'isa-serial'/>
+      </target>
+    </serial>
+    <console type=3D'pty'>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/serial-pty-chardev.x86_64-latest.xml =
b/tests/qemuxml2xmloutdata/serial-pty-chardev.x86_64-latest.xml
new file mode 100644
index 0000000000..bbca9a49be
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/serial-pty-chardev.x86_64-latest.xml
@@ -0,0 +1,48 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <serial type=3D'pty'>
+      <target type=3D'isa-serial' port=3D'0'>
+        <model name=3D'isa-serial'/>
+      </target>
+    </serial>
+    <console type=3D'pty'>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/serial-tcp-chardev.x86_64-latest.xml =
b/tests/qemuxml2xmloutdata/serial-tcp-chardev.x86_64-latest.xml
new file mode 100644
index 0000000000..2443c0e831
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/serial-tcp-chardev.x86_64-latest.xml
@@ -0,0 +1,52 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <serial type=3D'tcp'>
+      <source mode=3D'connect' host=3D'127.0.0.1' service=3D'9999'/>
+      <protocol type=3D'raw'/>
+      <target type=3D'isa-serial' port=3D'0'>
+        <model name=3D'isa-serial'/>
+      </target>
+    </serial>
+    <console type=3D'tcp'>
+      <source mode=3D'connect' host=3D'127.0.0.1' service=3D'9999'/>
+      <protocol type=3D'raw'/>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/serial-tcp-telnet-chardev.x86_64-late=
st.xml b/tests/qemuxml2xmloutdata/serial-tcp-telnet-chardev.x86_64-latest.x=
ml
new file mode 100644
index 0000000000..b4ac269438
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/serial-tcp-telnet-chardev.x86_64-latest.xml
@@ -0,0 +1,52 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <serial type=3D'tcp'>
+      <source mode=3D'bind' host=3D'127.0.0.1' service=3D'9999'/>
+      <protocol type=3D'telnet'/>
+      <target type=3D'isa-serial' port=3D'0'>
+        <model name=3D'isa-serial'/>
+      </target>
+    </serial>
+    <console type=3D'tcp'>
+      <source mode=3D'bind' host=3D'127.0.0.1' service=3D'9999'/>
+      <protocol type=3D'telnet'/>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev-verify.x86=
_64-latest.xml b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev-verify=
.x86_64-latest.xml
new file mode 100644
index 0000000000..6fdc0d0d73
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev-verify.x86_64-lat=
est.xml
@@ -0,0 +1,59 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <serial type=3D'udp'>
+      <source mode=3D'bind' host=3D'127.0.0.1' service=3D'1111'/>
+      <source mode=3D'connect' host=3D'127.0.0.1' service=3D'2222'/>
+      <target type=3D'isa-serial' port=3D'0'>
+        <model name=3D'isa-serial'/>
+      </target>
+    </serial>
+    <serial type=3D'tcp'>
+      <source mode=3D'connect' host=3D'127.0.0.1' service=3D'5555'/>
+      <protocol type=3D'raw'/>
+      <target type=3D'isa-serial' port=3D'1'>
+        <model name=3D'isa-serial'/>
+      </target>
+    </serial>
+    <console type=3D'udp'>
+      <source mode=3D'bind' host=3D'127.0.0.1' service=3D'1111'/>
+      <source mode=3D'connect' host=3D'127.0.0.1' service=3D'2222'/>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-secret-chardev.x86=
_64-latest.xml b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-secret-chardev=
.x86_64-latest.xml
new file mode 100644
index 0000000000..e545fc825b
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-secret-chardev.x86_64-lat=
est.xml
@@ -0,0 +1,59 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <serial type=3D'udp'>
+      <source mode=3D'bind' host=3D'127.0.0.1' service=3D'1111'/>
+      <source mode=3D'connect' host=3D'127.0.0.1' service=3D'2222'/>
+      <target type=3D'isa-serial' port=3D'0'>
+        <model name=3D'isa-serial'/>
+      </target>
+    </serial>
+    <serial type=3D'tcp'>
+      <source mode=3D'connect' host=3D'127.0.0.1' service=3D'5555'/>
+      <protocol type=3D'raw'/>
+      <target type=3D'isa-serial' port=3D'1'>
+        <model name=3D'isa-serial'/>
+      </target>
+    </serial>
+    <console type=3D'udp'>
+      <source mode=3D'bind' host=3D'127.0.0.1' service=3D'1111'/>
+      <source mode=3D'connect' host=3D'127.0.0.1' service=3D'2222'/>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/serial-udp-chardev.x86_64-latest.xml =
b/tests/qemuxml2xmloutdata/serial-udp-chardev.x86_64-latest.xml
new file mode 100644
index 0000000000..bccbd7af15
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/serial-udp-chardev.x86_64-latest.xml
@@ -0,0 +1,58 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <serial type=3D'udp'>
+      <source mode=3D'bind' host=3D'127.0.0.1' service=3D'9999'/>
+      <source mode=3D'connect' host=3D'127.0.0.1' service=3D'9998'/>
+      <target type=3D'isa-serial' port=3D'0'>
+        <model name=3D'isa-serial'/>
+      </target>
+    </serial>
+    <serial type=3D'udp'>
+      <source mode=3D'connect' service=3D'9999'/>
+      <target type=3D'isa-serial' port=3D'1'>
+        <model name=3D'isa-serial'/>
+      </target>
+    </serial>
+    <console type=3D'udp'>
+      <source mode=3D'bind' host=3D'127.0.0.1' service=3D'9999'/>
+      <source mode=3D'connect' host=3D'127.0.0.1' service=3D'9998'/>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/serial-unix-chardev.x86_64-latest.xml=
 b/tests/qemuxml2xmloutdata/serial-unix-chardev.x86_64-latest.xml
new file mode 100644
index 0000000000..6decd3a43b
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/serial-unix-chardev.x86_64-latest.xml
@@ -0,0 +1,50 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <serial type=3D'unix'>
+      <source mode=3D'connect' path=3D'/tmp/serial.sock'/>
+      <target type=3D'isa-serial' port=3D'0'>
+        <model name=3D'isa-serial'/>
+      </target>
+    </serial>
+    <serial type=3D'unix'>
+      <source mode=3D'bind' path=3D'/tmp/serial-server.sock'/>
+      <target type=3D'isa-serial' port=3D'1'>
+        <model name=3D'isa-serial'/>
+      </target>
+    </serial>
+    <console type=3D'unix'>
+      <source mode=3D'connect' path=3D'/tmp/serial.sock'/>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/serial-vc-chardev.x86_64-latest.xml b=
/tests/qemuxml2xmloutdata/serial-vc-chardev.x86_64-latest.xml
new file mode 100644
index 0000000000..6c33f06e68
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/serial-vc-chardev.x86_64-latest.xml
@@ -0,0 +1,48 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <serial type=3D'vc'>
+      <target type=3D'isa-serial' port=3D'0'>
+        <model name=3D'isa-serial'/>
+      </target>
+    </serial>
+    <console type=3D'vc'>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/shmem-invalid-address.x86_64-latest.x=
ml b/tests/qemuxml2xmloutdata/shmem-invalid-address.x86_64-latest.xml
new file mode 100644
index 0000000000..a7f5195962
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/shmem-invalid-address.x86_64-latest.xml
@@ -0,0 +1,34 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+    <shmem name=3D'shmem0'>
+      <model type=3D'ivshmem-plain'/>
+      <size unit=3D'M'>4</size>
+      <address type=3D'isa'/>
+    </shmem>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/shmem-invalid-size.x86_64-latest.xml =
b/tests/qemuxml2xmloutdata/shmem-invalid-size.x86_64-latest.xml
new file mode 100644
index 0000000000..cc7b63da94
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/shmem-invalid-size.x86_64-latest.xml
@@ -0,0 +1,34 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+    <shmem name=3D'shmem0'>
+      <model type=3D'ivshmem-plain'/>
+      <size unit=3D'M'>12</size>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </shmem>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/shmem-small-size.x86_64-latest.xml b/=
tests/qemuxml2xmloutdata/shmem-small-size.x86_64-latest.xml
new file mode 100644
index 0000000000..fc6f9dda7d
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/shmem-small-size.x86_64-latest.xml
@@ -0,0 +1,34 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+    <shmem name=3D'shmem0'>
+      <model type=3D'ivshmem-plain'/>
+      <size unit=3D'M'>0</size>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </shmem>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/smartcard-passthrough-unix.x86_64-lat=
est.xml b/tests/qemuxml2xmloutdata/smartcard-passthrough-unix.x86_64-latest=
.xml
new file mode 100644
index 0000000000..b692b4f448
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/smartcard-passthrough-unix.x86_64-latest.xml
@@ -0,0 +1,36 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'ccid' index=3D'0'/>
+    <smartcard mode=3D'passthrough' type=3D'unix'>
+      <source mode=3D'bind' path=3D'/tmp/smartcard.sock'/>
+      <address type=3D'ccid' controller=3D'0' slot=3D'0'/>
+    </smartcard>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/sound-device.x86_64-4.2.0.xml b/tests=
/qemuxml2xmloutdata/sound-device.x86_64-4.2.0.xml
new file mode 100644
index 0000000000..f123a7a744
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/sound-device.x86_64-4.2.0.xml
@@ -0,0 +1,61 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-4.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <sound model=3D'pcspk'/>
+    <sound model=3D'es1370'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </sound>
+    <sound model=3D'sb16'/>
+    <sound model=3D'ac97'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </sound>
+    <sound model=3D'ich6'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </sound>
+    <sound model=3D'ich6'>
+      <codec type=3D'micro'/>
+      <codec type=3D'duplex'/>
+      <codec type=3D'output'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x0'/>
+    </sound>
+    <sound model=3D'ich9'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06' f=
unction=3D'0x0'/>
+    </sound>
+    <sound model=3D'ich9'>
+      <codec type=3D'micro'/>
+      <codec type=3D'duplex'/>
+      <codec type=3D'output'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x07' f=
unction=3D'0x0'/>
+    </sound>
+    <sound model=3D'usb' multichannel=3D'yes'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x08' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/sparc-minimal.sparc-latest.xml b/test=
s/qemuxml2xmloutdata/sparc-minimal.sparc-latest.xml
new file mode 100644
index 0000000000..96e6b5a983
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/sparc-minimal.sparc-latest.xml
@@ -0,0 +1,33 @@
+<domain type=3D'qemu'>
+  <name>redhat62sparc</name>
+  <uuid>00010203-0405-4607-8809-0a0b0c0d0e0f</uuid>
+  <memory unit=3D'KiB'>512000</memory>
+  <currentMemory unit=3D'KiB'>512000</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'sparc' machine=3D'SS-5'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-sparc</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2'/>
+      <source file=3D'/home/berrange/VirtualMachines/redhat-6.2-sparc.img'=
/>
+      <target dev=3D'sda' bus=3D'scsi'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'file' device=3D'cdrom'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/home/berrange/VirtualMachines/redhat-6.2-sparc.iso'=
/>
+      <target dev=3D'sdb' bus=3D'scsi'/>
+      <readonly/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'1'/>
+    </disk>
+    <controller type=3D'scsi' index=3D'0' model=3D'ncr53c90'/>
+    <audio id=3D'1' type=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/usb-bus-missing.x86_64-latest.xml b/t=
ests/qemuxml2xmloutdata/usb-bus-missing.x86_64-latest.xml
new file mode 100644
index 0000000000..eb4f4598cf
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/usb-bus-missing.x86_64-latest.xml
@@ -0,0 +1,37 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'usb'>
+      <address type=3D'usb' bus=3D'0'/>
+    </input>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <hub type=3D'usb'>
+      <address type=3D'usb' bus=3D'1'/>
+    </hub>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/usb-controller-default-unavailable-q3=
5.x86_64-latest.xml b/tests/qemuxml2xmloutdata/usb-controller-default-unava=
ilable-q35.x86_64-latest.xml
new file mode 100644
index 0000000000..c857816a3e
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/usb-controller-default-unavailable-q35.x86_6=
4-latest.xml
@@ -0,0 +1,33 @@
+<domain type=3D'qemu'>
+  <name>q35-test</name>
+  <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid>
+  <memory unit=3D'KiB'>2097152</memory>
+  <currentMemory unit=3D'KiB'>2097152</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'q35'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'usb' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/usb-controller-ich9-autoassign.x86_64=
-latest.xml b/tests/qemuxml2xmloutdata/usb-controller-ich9-autoassign.x86_6=
4-latest.xml
new file mode 100644
index 0000000000..27038cfab8
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/usb-controller-ich9-autoassign.x86_64-latest=
.xml
@@ -0,0 +1,48 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'ich9-ehci1'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x7'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'ich9-uhci1'>
+      <master startport=3D'0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'ich9-uhci2'>
+      <master startport=3D'2'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'ich9-uhci3'>
+      <master startport=3D'4'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'usb'/>
+    <input type=3D'mouse' bus=3D'usb'/>
+    <input type=3D'mouse' bus=3D'usb'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <hub type=3D'usb'/>
+    <hub type=3D'usb'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/usb-controller-ich9-companion.x86_64-=
latest.xml b/tests/qemuxml2xmloutdata/usb-controller-ich9-companion.x86_64-=
latest.xml
new file mode 100644
index 0000000000..a43c29e341
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/usb-controller-ich9-companion.x86_64-latest.=
xml
@@ -0,0 +1,43 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'ich9-ehci1'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x7'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'ich9-uhci1'>
+      <master startport=3D'0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'ich9-uhci2'>
+      <master startport=3D'2'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'ich9-uhci3'>
+      <master startport=3D'4'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/usb-controller-nec-xhci-unavailable.x=
86_64-latest.xml b/tests/qemuxml2xmloutdata/usb-controller-nec-xhci-unavail=
able.x86_64-latest.xml
new file mode 100644
index 0000000000..e6f61c20c3
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/usb-controller-nec-xhci-unavailable.x86_64-l=
atest.xml
@@ -0,0 +1,33 @@
+<domain type=3D'qemu'>
+  <name>q35-test</name>
+  <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid>
+  <memory unit=3D'KiB'>2097152</memory>
+  <currentMemory unit=3D'KiB'>2097152</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'q35'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'nec-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/usb-controller-nex-xhci-autoassign.x8=
6_64-latest.xml b/tests/qemuxml2xmloutdata/usb-controller-nex-xhci-autoassi=
gn.x86_64-latest.xml
new file mode 100644
index 0000000000..a80625bc38
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/usb-controller-nex-xhci-autoassign.x86_64-la=
test.xml
@@ -0,0 +1,34 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'nec-xhci' ports=3D'8'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'usb'/>
+    <input type=3D'mouse' bus=3D'usb'/>
+    <input type=3D'mouse' bus=3D'usb'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <hub type=3D'usb'/>
+    <hub type=3D'usb'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/usb-controller-qemu-xhci.x86_64-lates=
t.xml b/tests/qemuxml2xmloutdata/usb-controller-qemu-xhci.x86_64-latest.xml
new file mode 100644
index 0000000000..8e69b12326
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/usb-controller-qemu-xhci.x86_64-latest.xml
@@ -0,0 +1,29 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci' ports=3D'8'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/usb-hub-autoadd-deluxe.x86_64-latest.=
xml b/tests/qemuxml2xmloutdata/usb-hub-autoadd-deluxe.x86_64-latest.xml
new file mode 100644
index 0000000000..fdfc264e43
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/usb-hub-autoadd-deluxe.x86_64-latest.xml
@@ -0,0 +1,47 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'usb'/>
+    <input type=3D'mouse' bus=3D'usb'/>
+    <input type=3D'mouse' bus=3D'usb'/>
+    <input type=3D'tablet' bus=3D'usb'/>
+    <input type=3D'tablet' bus=3D'usb'/>
+    <input type=3D'tablet' bus=3D'usb'/>
+    <input type=3D'tablet' bus=3D'usb'/>
+    <input type=3D'tablet' bus=3D'usb'/>
+    <input type=3D'tablet' bus=3D'usb'/>
+    <input type=3D'tablet' bus=3D'usb'/>
+    <input type=3D'tablet' bus=3D'usb'/>
+    <input type=3D'tablet' bus=3D'usb'/>
+    <input type=3D'tablet' bus=3D'usb'/>
+    <input type=3D'tablet' bus=3D'usb'/>
+    <input type=3D'tablet' bus=3D'usb'/>
+    <input type=3D'tablet' bus=3D'usb'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/usb-hub-autoadd.x86_64-latest.xml b/t=
ests/qemuxml2xmloutdata/usb-hub-autoadd.x86_64-latest.xml
new file mode 100644
index 0000000000..2864246ffd
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/usb-hub-autoadd.x86_64-latest.xml
@@ -0,0 +1,35 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'usb'/>
+    <input type=3D'mouse' bus=3D'usb'/>
+    <input type=3D'mouse' bus=3D'usb'/>
+    <input type=3D'tablet' bus=3D'usb'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/usb-hub.x86_64-latest.xml b/tests/qem=
uxml2xmloutdata/usb-hub.x86_64-latest.xml
new file mode 100644
index 0000000000..d9e201a8c1
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/usb-hub.x86_64-latest.xml
@@ -0,0 +1,34 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <hub type=3D'usb'>
+      <address type=3D'usb' bus=3D'0' port=3D'1'/>
+    </hub>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/usb-long-port-path.x86_64-latest.xml =
b/tests/qemuxml2xmloutdata/usb-long-port-path.x86_64-latest.xml
new file mode 100644
index 0000000000..2193a2b2f8
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/usb-long-port-path.x86_64-latest.xml
@@ -0,0 +1,43 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <hub type=3D'usb'>
+      <address type=3D'usb' bus=3D'0' port=3D'1'/>
+    </hub>
+    <hub type=3D'usb'>
+      <address type=3D'usb' bus=3D'0' port=3D'1.1'/>
+    </hub>
+    <hub type=3D'usb'>
+      <address type=3D'usb' bus=3D'0' port=3D'1.1.1'/>
+    </hub>
+    <hub type=3D'usb'>
+      <address type=3D'usb' bus=3D'0' port=3D'1.1.1.1'/>
+    </hub>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/usb-port-autoassign.x86_64-latest.xml=
 b/tests/qemuxml2xmloutdata/usb-port-autoassign.x86_64-latest.xml
new file mode 100644
index 0000000000..2596727688
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/usb-port-autoassign.x86_64-latest.xml
@@ -0,0 +1,38 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'usb'/>
+    <input type=3D'mouse' bus=3D'usb'/>
+    <input type=3D'mouse' bus=3D'usb'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <hub type=3D'usb'>
+      <address type=3D'usb' bus=3D'0' port=3D'1'/>
+    </hub>
+    <hub type=3D'usb'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/usb-ports.x86_64-latest.xml b/tests/q=
emuxml2xmloutdata/usb-ports.x86_64-latest.xml
new file mode 100644
index 0000000000..42c9e19e00
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/usb-ports.x86_64-latest.xml
@@ -0,0 +1,46 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'usb'>
+      <address type=3D'usb' bus=3D'0' port=3D'1.1'/>
+    </input>
+    <input type=3D'mouse' bus=3D'usb'>
+      <address type=3D'usb' bus=3D'0' port=3D'1.2.1'/>
+    </input>
+    <input type=3D'mouse' bus=3D'usb'>
+      <address type=3D'usb' bus=3D'0' port=3D'1.2.2'/>
+    </input>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <hub type=3D'usb'>
+      <address type=3D'usb' bus=3D'0' port=3D'1'/>
+    </hub>
+    <hub type=3D'usb'>
+      <address type=3D'usb' bus=3D'0' port=3D'1.2'/>
+    </hub>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/usb-redir-boot.x86_64-latest.xml b/te=
sts/qemuxml2xmloutdata/usb-redir-boot.x86_64-latest.xml
new file mode 100644
index 0000000000..5759c2123e
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/usb-redir-boot.x86_64-latest.xml
@@ -0,0 +1,58 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'ich9-ehci1'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x7'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'ich9-uhci1'>
+      <master startport=3D'0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'ich9-uhci2'>
+      <master startport=3D'2'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'ich9-uhci3'>
+      <master startport=3D'4'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <graphics type=3D'spice'>
+      <listen type=3D'none'/>
+    </graphics>
+    <audio id=3D'1' type=3D'spice'/>
+    <video>
+      <model type=3D'cirrus' vram=3D'16384' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <redirdev bus=3D'usb' type=3D'tcp'>
+      <source mode=3D'connect' host=3D'localhost' service=3D'4000'/>
+      <protocol type=3D'raw'/>
+      <boot order=3D'1'/>
+    </redirdev>
+    <redirdev bus=3D'usb' type=3D'spicevmc'>
+      <boot order=3D'2'/>
+      <address type=3D'usb' bus=3D'0' port=3D'4'/>
+    </redirdev>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/usb-redir-unix.x86_64-latest.xml b/te=
sts/qemuxml2xmloutdata/usb-redir-unix.x86_64-latest.xml
new file mode 100644
index 0000000000..fa81adce6b
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/usb-redir-unix.x86_64-latest.xml
@@ -0,0 +1,49 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'ich9-ehci1'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x7'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'ich9-uhci1'>
+      <master startport=3D'0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'ich9-uhci2'>
+      <master startport=3D'2'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'ich9-uhci3'>
+      <master startport=3D'4'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <redirdev bus=3D'usb' type=3D'unix'>
+      <source mode=3D'connect' path=3D'/tmp/connect.socket'/>
+    </redirdev>
+    <redirdev bus=3D'usb' type=3D'unix'>
+      <source mode=3D'bind' path=3D'/tmp/listen.socket'/>
+    </redirdev>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/usb1-usb2.x86_64-latest.xml b/tests/q=
emuxml2xmloutdata/usb1-usb2.x86_64-latest.xml
new file mode 100644
index 0000000000..f60704d807
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/usb1-usb2.x86_64-latest.xml
@@ -0,0 +1,79 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'usb' index=3D'1' model=3D'ich9-ehci1'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x7'/>
+    </controller>
+    <controller type=3D'usb' index=3D'1' model=3D'ich9-uhci1'>
+      <master startport=3D'0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'usb' index=3D'1' model=3D'ich9-uhci2'>
+      <master startport=3D'2'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'1' model=3D'ich9-uhci3'>
+      <master startport=3D'4'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'usb' index=3D'2' model=3D'ich9-ehci1'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x7'/>
+    </controller>
+    <controller type=3D'usb' index=3D'2' model=3D'ich9-uhci1'>
+      <master startport=3D'0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'usb' index=3D'2' model=3D'ich9-uhci2'>
+      <master startport=3D'2'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'2' model=3D'ich9-uhci3'>
+      <master startport=3D'4'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'tablet' bus=3D'usb'>
+      <address type=3D'usb' bus=3D'0' port=3D'2'/>
+    </input>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <hostdev mode=3D'subsystem' type=3D'usb' managed=3D'no'>
+      <source>
+        <address bus=3D'14' device=3D'6'/>
+      </source>
+      <address type=3D'usb' bus=3D'2' port=3D'1'/>
+    </hostdev>
+    <hostdev mode=3D'subsystem' type=3D'usb' managed=3D'no'>
+      <source>
+        <address bus=3D'14' device=3D'7'/>
+      </source>
+      <address type=3D'usb' bus=3D'2' port=3D'2'/>
+    </hostdev>
+    <hub type=3D'usb'>
+      <address type=3D'usb' bus=3D'1' port=3D'1'/>
+    </hub>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/user-aliases-usb.x86_64-latest.xml b/=
tests/qemuxml2xmloutdata/user-aliases-usb.x86_64-latest.xml
new file mode 100644
index 0000000000..18e90af12f
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/user-aliases-usb.x86_64-latest.xml
@@ -0,0 +1,88 @@
+<domain type=3D'kvm'>
+  <name>gentoo</name>
+  <uuid>a75aca4b-a02f-2bcb-4a91-c93cd848c34b</uuid>
+  <memory unit=3D'KiB'>4194304</memory>
+  <currentMemory unit=3D'KiB'>4194304</currentMemory>
+  <vcpu placement=3D'static'>4</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+    <boot dev=3D'cdrom'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <pm>
+    <suspend-to-mem enabled=3D'yes'/>
+    <suspend-to-disk enabled=3D'yes'/>
+  </pm>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'ich9-ehci1'>
+      <alias name=3D'ua-myUSB1'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x7'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'ich9-uhci1'>
+      <alias name=3D'ua-myUSB2'/>
+      <master startport=3D'0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'ich9-uhci2'>
+      <alias name=3D'ua-myUSB3'/>
+      <master startport=3D'2'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'ich9-uhci3'>
+      <alias name=3D'ua-myUSB4'/>
+      <master startport=3D'4'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'usb' index=3D'1' model=3D'ich9-ehci1'>
+      <alias name=3D'ua-myUSB5'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x7'/>
+    </controller>
+    <controller type=3D'usb' index=3D'1' model=3D'ich9-uhci1'>
+      <alias name=3D'ua-myUSB6'/>
+      <master startport=3D'0'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'usb' index=3D'1' model=3D'ich9-uhci2'>
+      <alias name=3D'ua-myUSB7'/>
+      <master startport=3D'2'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'1' model=3D'ich9-uhci3'>
+      <alias name=3D'ua-myUSB8'/>
+      <master startport=3D'4'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <hostdev mode=3D'subsystem' type=3D'usb' managed=3D'yes'>
+      <source>
+        <address bus=3D'14' device=3D'6'/>
+      </source>
+      <address type=3D'usb' bus=3D'0' port=3D'3'/>
+    </hostdev>
+    <hostdev mode=3D'subsystem' type=3D'usb' managed=3D'yes'>
+      <source>
+        <address bus=3D'15' device=3D'6'/>
+      </source>
+      <address type=3D'usb' bus=3D'1' port=3D'3'/>
+    </hostdev>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/user-aliases2.x86_64-latest.xml b/tes=
ts/qemuxml2xmloutdata/user-aliases2.x86_64-latest.xml
new file mode 100644
index 0000000000..22323215aa
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/user-aliases2.x86_64-latest.xml
@@ -0,0 +1,52 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'q35'>hvm</type>
+    <boot dev=3D'fd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'file' device=3D'floppy'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/tmp/firmware.img'/>
+      <target dev=3D'fda' bus=3D'fdc'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'>
+      <alias name=3D'ua-MySataController'/>
+    </controller>
+    <controller type=3D'fdc' index=3D'0'/>
+    <controller type=3D'usb' index=3D'0' model=3D'qemu-xhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/vhost-user-gpu-secondary.x86_64-lates=
t.xml b/tests/qemuxml2xmloutdata/vhost-user-gpu-secondary.x86_64-latest.xml
new file mode 100644
index 0000000000..1362326590
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/vhost-user-gpu-secondary.x86_64-latest.xml
@@ -0,0 +1,57 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <memoryBacking>
+    <source type=3D'memfd'/>
+    <access mode=3D'shared'/>
+  </memoryBacking>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+    <numa>
+      <cell id=3D'0' cpus=3D'0' memory=3D'219136' unit=3D'KiB'/>
+    </numa>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <driver name=3D'vhostuser'/>
+      <model type=3D'virtio' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <video>
+      <driver name=3D'vhostuser'/>
+      <model type=3D'virtio' heads=3D'1'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/vhost-user-vga.x86_64-latest.xml b/te=
sts/qemuxml2xmloutdata/vhost-user-vga.x86_64-latest.xml
new file mode 100644
index 0000000000..9a8bb9f92a
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/vhost-user-vga.x86_64-latest.xml
@@ -0,0 +1,52 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <memoryBacking>
+    <source type=3D'memfd'/>
+    <access mode=3D'shared'/>
+  </memoryBacking>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+    <numa>
+      <cell id=3D'0' cpus=3D'0' memory=3D'219136' unit=3D'KiB'/>
+    </numa>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <driver name=3D'vhostuser'/>
+      <model type=3D'virtio' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/video-bochs-display-device.x86_64-lat=
est.xml b/tests/qemuxml2xmloutdata/video-bochs-display-device.x86_64-latest=
.xml
new file mode 100644
index 0000000000..50b0fa5458
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/video-bochs-display-device.x86_64-latest.xml
@@ -0,0 +1,44 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2' cache=3D'none'/>
+      <source file=3D'/var/lib/libvirt/images/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <model type=3D'bochs' vram=3D'16384' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/video-qxl-device-vgamem.x86_64-latest=
.xml b/tests/qemuxml2xmloutdata/video-qxl-device-vgamem.x86_64-latest.xml
new file mode 100644
index 0000000000..ea9cb2b472
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/video-qxl-device-vgamem.x86_64-latest.xml
@@ -0,0 +1,44 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2' cache=3D'none'/>
+      <source file=3D'/var/lib/libvirt/images/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <model type=3D'qxl' ram=3D'65536' vram=3D'65536' vgamem=3D'16384' he=
ads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/video-qxl-device-vram64.x86_64-latest=
.xml b/tests/qemuxml2xmloutdata/video-qxl-device-vram64.x86_64-latest.xml
new file mode 100644
index 0000000000..380bfeee56
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/video-qxl-device-vram64.x86_64-latest.xml
@@ -0,0 +1,38 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <model type=3D'qxl' ram=3D'65536' vram=3D'65536' vram64=3D'131072' v=
gamem=3D'16384' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/video-qxl-device.x86_64-latest.xml b/=
tests/qemuxml2xmloutdata/video-qxl-device.x86_64-latest.xml
new file mode 100644
index 0000000000..ea9cb2b472
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/video-qxl-device.x86_64-latest.xml
@@ -0,0 +1,44 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2' cache=3D'none'/>
+      <source file=3D'/var/lib/libvirt/images/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <model type=3D'qxl' ram=3D'65536' vram=3D'65536' vgamem=3D'16384' he=
ads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/video-qxl-sec-device-vgamem.x86_64-la=
test.xml b/tests/qemuxml2xmloutdata/video-qxl-sec-device-vgamem.x86_64-late=
st.xml
new file mode 100644
index 0000000000..c9ad2b1e16
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/video-qxl-sec-device-vgamem.x86_64-latest.xml
@@ -0,0 +1,48 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2' cache=3D'none'/>
+      <source file=3D'/var/lib/libvirt/images/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <model type=3D'qxl' ram=3D'65536' vram=3D'65536' vgamem=3D'16384' he=
ads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <video>
+      <model type=3D'qxl' ram=3D'65536' vram=3D'65536' vgamem=3D'16384' he=
ads=3D'1'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/video-qxl-sec-device-vram64.x86_64-la=
test.xml b/tests/qemuxml2xmloutdata/video-qxl-sec-device-vram64.x86_64-late=
st.xml
new file mode 100644
index 0000000000..1301605046
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/video-qxl-sec-device-vram64.x86_64-latest.xml
@@ -0,0 +1,42 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <model type=3D'qxl' ram=3D'65536' vram=3D'65536' vgamem=3D'16384' he=
ads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <video>
+      <model type=3D'qxl' ram=3D'65536' vram=3D'65536' vram64=3D'131072' v=
gamem=3D'16384' heads=3D'1'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/video-qxl-sec-device.x86_64-latest.xm=
l b/tests/qemuxml2xmloutdata/video-qxl-sec-device.x86_64-latest.xml
new file mode 100644
index 0000000000..c9ad2b1e16
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/video-qxl-sec-device.x86_64-latest.xml
@@ -0,0 +1,48 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2' cache=3D'none'/>
+      <source file=3D'/var/lib/libvirt/images/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <model type=3D'qxl' ram=3D'65536' vram=3D'65536' vgamem=3D'16384' he=
ads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <video>
+      <model type=3D'qxl' ram=3D'65536' vram=3D'65536' vgamem=3D'16384' he=
ads=3D'1'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/video-ramfb-display-device.x86_64-lat=
est.xml b/tests/qemuxml2xmloutdata/video-ramfb-display-device.x86_64-latest=
.xml
new file mode 100644
index 0000000000..4fd7dfc8e3
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/video-ramfb-display-device.x86_64-latest.xml
@@ -0,0 +1,43 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2' cache=3D'none'/>
+      <source file=3D'/var/lib/libvirt/images/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <model type=3D'ramfb' heads=3D'1' primary=3D'yes'/>
+    </video>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/video-vga-device-vgamem.x86_64-latest=
.xml b/tests/qemuxml2xmloutdata/video-vga-device-vgamem.x86_64-latest.xml
new file mode 100644
index 0000000000..8d1e4f7507
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/video-vga-device-vgamem.x86_64-latest.xml
@@ -0,0 +1,44 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2' cache=3D'none'/>
+      <source file=3D'/var/lib/libvirt/images/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <model type=3D'vga' vram=3D'16384' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/video-vga-device.x86_64-latest.xml b/=
tests/qemuxml2xmloutdata/video-vga-device.x86_64-latest.xml
new file mode 100644
index 0000000000..8d1e4f7507
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/video-vga-device.x86_64-latest.xml
@@ -0,0 +1,44 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2' cache=3D'none'/>
+      <source file=3D'/var/lib/libvirt/images/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <model type=3D'vga' vram=3D'16384' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/video-vga-qxl-heads.x86_64-latest.xml=
 b/tests/qemuxml2xmloutdata/video-vga-qxl-heads.x86_64-latest.xml
new file mode 100644
index 0000000000..6d93ba1330
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/video-vga-qxl-heads.x86_64-latest.xml
@@ -0,0 +1,52 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <model type=3D'qxl' ram=3D'65536' vram=3D'65536' vgamem=3D'8192' hea=
ds=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <video>
+      <model type=3D'qxl' ram=3D'65536' vram=3D'32768' vgamem=3D'8192' hea=
ds=3D'3'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </video>
+    <video>
+      <model type=3D'qxl' ram=3D'65536' vram=3D'65536' vgamem=3D'8192' hea=
ds=3D'7'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/video-virtio-vga.x86_64-latest.xml b/=
tests/qemuxml2xmloutdata/video-virtio-vga.x86_64-latest.xml
new file mode 100644
index 0000000000..0c31cfb927
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/video-virtio-vga.x86_64-latest.xml
@@ -0,0 +1,44 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>1048576</memory>
+  <currentMemory unit=3D'KiB'>1048576</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2' cache=3D'none'/>
+      <source file=3D'/var/lib/libvirt/images/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <model type=3D'virtio' heads=3D'1' primary=3D'yes'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-options-controller-ats.x86_64-=
latest.xml b/tests/qemuxml2xmloutdata/virtio-options-controller-ats.x86_64-=
latest.xml
new file mode 100644
index 0000000000..1c66ebe8d1
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-options-controller-ats.x86_64-latest.=
xml
@@ -0,0 +1,47 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'scsi' index=3D'0' model=3D'virtio-scsi'>
+      <driver ats=3D'on'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'1' model=3D'virtio-scsi'>
+      <driver ats=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <driver ats=3D'on'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'virtio-serial' index=3D'1'>
+      <driver ats=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-options-controller-iommu.x86_6=
4-latest.xml b/tests/qemuxml2xmloutdata/virtio-options-controller-iommu.x86=
_64-latest.xml
new file mode 100644
index 0000000000..f8b18cd085
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-options-controller-iommu.x86_64-lates=
t.xml
@@ -0,0 +1,47 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'scsi' index=3D'0' model=3D'virtio-scsi'>
+      <driver iommu=3D'on'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'1' model=3D'virtio-scsi'>
+      <driver iommu=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <driver iommu=3D'on'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'virtio-serial' index=3D'1'>
+      <driver iommu=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-options-controller-packed.x86_=
64-latest.xml b/tests/qemuxml2xmloutdata/virtio-options-controller-packed.x=
86_64-latest.xml
new file mode 100644
index 0000000000..6cce620cdb
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-options-controller-packed.x86_64-late=
st.xml
@@ -0,0 +1,47 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'scsi' index=3D'0' model=3D'virtio-scsi'>
+      <driver packed=3D'on'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'1' model=3D'virtio-scsi'>
+      <driver packed=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <driver packed=3D'on'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'virtio-serial' index=3D'1'>
+      <driver packed=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-options-disk-ats.x86_64-latest=
.xml b/tests/qemuxml2xmloutdata/virtio-options-disk-ats.x86_64-latest.xml
new file mode 100644
index 0000000000..1667f45d9e
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-options-disk-ats.x86_64-latest.xml
@@ -0,0 +1,43 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw' ats=3D'on'/>
+      <source file=3D'/var/lib/libvirt/images/img1'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw' ats=3D'off'/>
+      <source file=3D'/var/lib/libvirt/images/img2'/>
+      <target dev=3D'vdb' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-options-disk-iommu.x86_64-late=
st.xml b/tests/qemuxml2xmloutdata/virtio-options-disk-iommu.x86_64-latest.x=
ml
new file mode 100644
index 0000000000..1b467bd38c
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-options-disk-iommu.x86_64-latest.xml
@@ -0,0 +1,43 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw' iommu=3D'on'/>
+      <source file=3D'/var/lib/libvirt/images/img1'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw' iommu=3D'off'/>
+      <source file=3D'/var/lib/libvirt/images/img2'/>
+      <target dev=3D'vdb' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-options-disk-packed.x86_64-lat=
est.xml b/tests/qemuxml2xmloutdata/virtio-options-disk-packed.x86_64-latest=
.xml
new file mode 100644
index 0000000000..aff93a0d17
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-options-disk-packed.x86_64-latest.xml
@@ -0,0 +1,43 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw' packed=3D'on'/>
+      <source file=3D'/var/lib/libvirt/images/img1'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </disk>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw' packed=3D'off'/>
+      <source file=3D'/var/lib/libvirt/images/img2'/>
+      <target dev=3D'vdb' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-options-fs-ats.x86_64-latest.x=
ml b/tests/qemuxml2xmloutdata/virtio-options-fs-ats.x86_64-latest.xml
new file mode 100644
index 0000000000..20b0444622
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-options-fs-ats.x86_64-latest.xml
@@ -0,0 +1,43 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <filesystem type=3D'mount' accessmode=3D'passthrough'>
+      <driver ats=3D'on'/>
+      <source dir=3D'/export/fs1'/>
+      <target dir=3D'fs1'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </filesystem>
+    <filesystem type=3D'mount' accessmode=3D'passthrough'>
+      <driver ats=3D'off'/>
+      <source dir=3D'/export/fs2'/>
+      <target dir=3D'fs2'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </filesystem>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-options-fs-iommu.x86_64-latest=
.xml b/tests/qemuxml2xmloutdata/virtio-options-fs-iommu.x86_64-latest.xml
new file mode 100644
index 0000000000..9cdebabe30
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-options-fs-iommu.x86_64-latest.xml
@@ -0,0 +1,43 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <filesystem type=3D'mount' accessmode=3D'passthrough'>
+      <driver iommu=3D'on'/>
+      <source dir=3D'/export/fs1'/>
+      <target dir=3D'fs1'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </filesystem>
+    <filesystem type=3D'mount' accessmode=3D'passthrough'>
+      <driver iommu=3D'off'/>
+      <source dir=3D'/export/fs2'/>
+      <target dir=3D'fs2'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </filesystem>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-options-fs-packed.x86_64-lates=
t.xml b/tests/qemuxml2xmloutdata/virtio-options-fs-packed.x86_64-latest.xml
new file mode 100644
index 0000000000..c43b5a1190
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-options-fs-packed.x86_64-latest.xml
@@ -0,0 +1,43 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <filesystem type=3D'mount' accessmode=3D'passthrough'>
+      <driver packed=3D'on'/>
+      <source dir=3D'/export/fs1'/>
+      <target dir=3D'fs1'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </filesystem>
+    <filesystem type=3D'mount' accessmode=3D'passthrough'>
+      <driver packed=3D'off'/>
+      <source dir=3D'/export/fs2'/>
+      <target dir=3D'fs2'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </filesystem>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-options-input-ats.x86_64-lates=
t.xml b/tests/qemuxml2xmloutdata/virtio-options-input-ats.x86_64-latest.xml
new file mode 100644
index 0000000000..0e56a771b0
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-options-input-ats.x86_64-latest.xml
@@ -0,0 +1,39 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'virtio'>
+      <driver ats=3D'on'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </input>
+    <input type=3D'keyboard' bus=3D'virtio'>
+      <driver ats=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </input>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-options-input-iommu.x86_64-lat=
est.xml b/tests/qemuxml2xmloutdata/virtio-options-input-iommu.x86_64-latest=
.xml
new file mode 100644
index 0000000000..bda176cd97
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-options-input-iommu.x86_64-latest.xml
@@ -0,0 +1,39 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'virtio'>
+      <driver iommu=3D'on'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </input>
+    <input type=3D'keyboard' bus=3D'virtio'>
+      <driver iommu=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </input>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-options-input-packed.x86_64-la=
test.xml b/tests/qemuxml2xmloutdata/virtio-options-input-packed.x86_64-late=
st.xml
new file mode 100644
index 0000000000..a0861f5df6
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-options-input-packed.x86_64-latest.xml
@@ -0,0 +1,39 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'virtio'>
+      <driver packed=3D'on'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </input>
+    <input type=3D'keyboard' bus=3D'virtio'>
+      <driver packed=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </input>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-options-memballoon-ats.x86_64-=
latest.xml b/tests/qemuxml2xmloutdata/virtio-options-memballoon-ats.x86_64-=
latest.xml
new file mode 100644
index 0000000000..6c6330c7ad
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-options-memballoon-ats.x86_64-latest.=
xml
@@ -0,0 +1,32 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+      <driver ats=3D'on'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-options-memballoon-freepage-re=
porting.x86_64-latest.xml b/tests/qemuxml2xmloutdata/virtio-options-memball=
oon-freepage-reporting.x86_64-latest.xml
new file mode 100644
index 0000000000..8c4a65caf1
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-options-memballoon-freepage-reporting=
.x86_64-latest.xml
@@ -0,0 +1,31 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio' freePageReporting=3D'on'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-options-memballoon-iommu.x86_6=
4-latest.xml b/tests/qemuxml2xmloutdata/virtio-options-memballoon-iommu.x86=
_64-latest.xml
new file mode 100644
index 0000000000..9b211e6a23
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-options-memballoon-iommu.x86_64-lates=
t.xml
@@ -0,0 +1,32 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+      <driver iommu=3D'on'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-options-memballoon-packed.x86_=
64-latest.xml b/tests/qemuxml2xmloutdata/virtio-options-memballoon-packed.x=
86_64-latest.xml
new file mode 100644
index 0000000000..d45eba7578
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-options-memballoon-packed.x86_64-late=
st.xml
@@ -0,0 +1,32 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+      <driver packed=3D'on'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-options-net-ats.x86_64-latest.=
xml b/tests/qemuxml2xmloutdata/virtio-options-net-ats.x86_64-latest.xml
new file mode 100644
index 0000000000..57749d785a
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-options-net-ats.x86_64-latest.xml
@@ -0,0 +1,43 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:56:58:5a:5c'/>
+      <model type=3D'virtio'/>
+      <driver ats=3D'on'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </interface>
+    <interface type=3D'user'>
+      <mac address=3D'62:64:66:68:6a:6c'/>
+      <model type=3D'virtio'/>
+      <driver ats=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </interface>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-options-net-iommu.x86_64-lates=
t.xml b/tests/qemuxml2xmloutdata/virtio-options-net-iommu.x86_64-latest.xml
new file mode 100644
index 0000000000..db1c061193
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-options-net-iommu.x86_64-latest.xml
@@ -0,0 +1,43 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:56:58:5a:5c'/>
+      <model type=3D'virtio'/>
+      <driver iommu=3D'on'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </interface>
+    <interface type=3D'user'>
+      <mac address=3D'62:64:66:68:6a:6c'/>
+      <model type=3D'virtio'/>
+      <driver iommu=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </interface>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-options-net-packed.x86_64-late=
st.xml b/tests/qemuxml2xmloutdata/virtio-options-net-packed.x86_64-latest.x=
ml
new file mode 100644
index 0000000000..b9ae388432
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-options-net-packed.x86_64-latest.xml
@@ -0,0 +1,43 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:56:58:5a:5c'/>
+      <model type=3D'virtio'/>
+      <driver packed=3D'on'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </interface>
+    <interface type=3D'user'>
+      <mac address=3D'62:64:66:68:6a:6c'/>
+      <model type=3D'virtio'/>
+      <driver packed=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </interface>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-options-rng-ats.x86_64-latest.=
xml b/tests/qemuxml2xmloutdata/virtio-options-rng-ats.x86_64-latest.xml
new file mode 100644
index 0000000000..1922bea8b0
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-options-rng-ats.x86_64-latest.xml
@@ -0,0 +1,41 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+    <rng model=3D'virtio'>
+      <backend model=3D'random'>/dev/random</backend>
+      <driver ats=3D'on'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </rng>
+    <rng model=3D'virtio'>
+      <backend model=3D'random'>/dev/random</backend>
+      <driver ats=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </rng>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-options-rng-iommu.x86_64-lates=
t.xml b/tests/qemuxml2xmloutdata/virtio-options-rng-iommu.x86_64-latest.xml
new file mode 100644
index 0000000000..7e57779caa
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-options-rng-iommu.x86_64-latest.xml
@@ -0,0 +1,41 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+    <rng model=3D'virtio'>
+      <backend model=3D'random'>/dev/random</backend>
+      <driver iommu=3D'on'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </rng>
+    <rng model=3D'virtio'>
+      <backend model=3D'random'>/dev/random</backend>
+      <driver iommu=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </rng>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-options-rng-packed.x86_64-late=
st.xml b/tests/qemuxml2xmloutdata/virtio-options-rng-packed.x86_64-latest.x=
ml
new file mode 100644
index 0000000000..5f00a92528
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-options-rng-packed.x86_64-latest.xml
@@ -0,0 +1,41 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+    <rng model=3D'virtio'>
+      <backend model=3D'random'>/dev/random</backend>
+      <driver packed=3D'on'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </rng>
+    <rng model=3D'virtio'>
+      <backend model=3D'random'>/dev/random</backend>
+      <driver packed=3D'off'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </rng>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-options-video-ats.x86_64-lates=
t.xml b/tests/qemuxml2xmloutdata/virtio-options-video-ats.x86_64-latest.xml
new file mode 100644
index 0000000000..228ace3fa5
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-options-video-ats.x86_64-latest.xml
@@ -0,0 +1,45 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <driver ats=3D'on' name=3D'vhostuser'/>
+      <model type=3D'virtio' heads=3D'1' primary=3D'yes'>
+        <acceleration accel3d=3D'yes' rendernode=3D'/dev/dri/test'/>
+      </model>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <video>
+      <driver ats=3D'off' name=3D'vhostuser'/>
+      <model type=3D'virtio' heads=3D'1'>
+        <acceleration accel3d=3D'yes' rendernode=3D'/dev/dri/test'/>
+      </model>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-options-video-iommu.x86_64-lat=
est.xml b/tests/qemuxml2xmloutdata/virtio-options-video-iommu.x86_64-latest=
.xml
new file mode 100644
index 0000000000..971cab51e7
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-options-video-iommu.x86_64-latest.xml
@@ -0,0 +1,45 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <driver iommu=3D'on' name=3D'vhostuser'/>
+      <model type=3D'virtio' heads=3D'1' primary=3D'yes'>
+        <acceleration accel3d=3D'yes' rendernode=3D'/dev/dri/test'/>
+      </model>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <video>
+      <driver iommu=3D'off' name=3D'vhostuser'/>
+      <model type=3D'virtio' heads=3D'1'>
+        <acceleration accel3d=3D'yes' rendernode=3D'/dev/dri/test'/>
+      </model>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-options-video-packed.x86_64-la=
test.xml b/tests/qemuxml2xmloutdata/virtio-options-video-packed.x86_64-late=
st.xml
new file mode 100644
index 0000000000..26856e5e45
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-options-video-packed.x86_64-latest.xml
@@ -0,0 +1,45 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <video>
+      <driver packed=3D'on' name=3D'vhostuser'/>
+      <model type=3D'virtio' heads=3D'1' primary=3D'yes'>
+        <acceleration accel3d=3D'yes' rendernode=3D'/dev/dri/test'/>
+      </model>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </video>
+    <video>
+      <driver packed=3D'off' name=3D'vhostuser'/>
+      <model type=3D'virtio' heads=3D'1'>
+        <acceleration accel3d=3D'yes' rendernode=3D'/dev/dri/test'/>
+      </model>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </video>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-rng-builtin.x86_64-5.2.0.xml b=
/tests/qemuxml2xmloutdata/virtio-rng-builtin.x86_64-5.2.0.xml
new file mode 100644
index 0000000000..6c48695fd6
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-rng-builtin.x86_64-5.2.0.xml
@@ -0,0 +1,35 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+    <rng model=3D'virtio'>
+      <backend model=3D'builtin'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </rng>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-rng-ccw.s390x-latest.xml b/tes=
ts/qemuxml2xmloutdata/virtio-rng-ccw.s390x-latest.xml
new file mode 100644
index 0000000000..21a8447d6c
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-rng-ccw.s390x-latest.xml
@@ -0,0 +1,43 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D's390x' machine=3D's390-ccw-virtio'>hvm</type>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'virtio'/>
+      <boot order=3D'1'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0000'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0001'/>
+    </controller>
+    <console type=3D'pty'>
+      <target type=3D'virtio' port=3D'0'/>
+    </console>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x000a'/>
+    </memballoon>
+    <rng model=3D'virtio'>
+      <backend model=3D'random'>/dev/hwrng</backend>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0002'/>
+    </rng>
+    <panic model=3D's390'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-rng-default.x86_64-latest.xml =
b/tests/qemuxml2xmloutdata/virtio-rng-default.x86_64-latest.xml
new file mode 100644
index 0000000000..aae653b967
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-rng-default.x86_64-latest.xml
@@ -0,0 +1,35 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static' cpuset=3D'1-4,8-20,525'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+    <rng model=3D'virtio'>
+      <backend model=3D'random'>/dev/random</backend>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x07' f=
unction=3D'0x0'/>
+    </rng>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-rng-egd-unix.x86_64-5.2.0.xml =
b/tests/qemuxml2xmloutdata/virtio-rng-egd-unix.x86_64-5.2.0.xml
new file mode 100644
index 0000000000..fcc0ce0d7e
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-rng-egd-unix.x86_64-5.2.0.xml
@@ -0,0 +1,37 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc-i440fx-5.2'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+    <rng model=3D'virtio'>
+      <backend model=3D'egd' type=3D'unix'>
+        <source mode=3D'bind' path=3D'/tmp/rng.socket'/>
+      </backend>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </rng>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-rng-egd-unix.x86_64-latest.xml=
 b/tests/qemuxml2xmloutdata/virtio-rng-egd-unix.x86_64-latest.xml
new file mode 100644
index 0000000000..9680015f8f
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-rng-egd-unix.x86_64-latest.xml
@@ -0,0 +1,37 @@
+<domain type=3D'kvm'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+    <rng model=3D'virtio'>
+      <backend model=3D'egd' type=3D'unix'>
+        <source mode=3D'bind' path=3D'/tmp/rng.socket'/>
+      </backend>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </rng>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-rng-multiple.x86_64-latest.xml=
 b/tests/qemuxml2xmloutdata/virtio-rng-multiple.x86_64-latest.xml
new file mode 100644
index 0000000000..1b9115f55f
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/virtio-rng-multiple.x86_64-latest.xml
@@ -0,0 +1,42 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static' cpuset=3D'1-4,8-20,525'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+    <rng model=3D'virtio'>
+      <backend model=3D'random'>/dev/random</backend>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x07' f=
unction=3D'0x0'/>
+    </rng>
+    <rng model=3D'virtio'>
+      <backend model=3D'egd' type=3D'tcp'>
+        <source mode=3D'connect' host=3D'1.2.3.4' service=3D'1234'/>
+        <protocol type=3D'raw'/>
+      </backend>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </rng>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/watchdog-device.x86_64-latest.xml b/t=
ests/qemuxml2xmloutdata/watchdog-device.x86_64-latest.xml
new file mode 100644
index 0000000000..9b6371bd6f
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/watchdog-device.x86_64-latest.xml
@@ -0,0 +1,43 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'i6300esb' action=3D'poweroff'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </watchdog>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/watchdog-diag288.s390x-latest.xml b/t=
ests/qemuxml2xmloutdata/watchdog-diag288.s390x-latest.xml
new file mode 100644
index 0000000000..265ebd6372
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/watchdog-diag288.s390x-latest.xml
@@ -0,0 +1,34 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D's390x' machine=3D's390-ccw-virtio'>hvm</type>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'virtio'/>
+      <boot order=3D'1'/>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0000'/>
+    </disk>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'diag288' action=3D'inject-nmi'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'ccw' cssid=3D'0xfe' ssid=3D'0x0' devno=3D'0x0001'/>
+    </memballoon>
+    <panic model=3D's390'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/watchdog-dump.x86_64-latest.xml b/tes=
ts/qemuxml2xmloutdata/watchdog-dump.x86_64-latest.xml
new file mode 100644
index 0000000000..0535228670
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/watchdog-dump.x86_64-latest.xml
@@ -0,0 +1,41 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'ib700' action=3D'dump'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/watchdog-injectnmi.x86_64-latest.xml =
b/tests/qemuxml2xmloutdata/watchdog-injectnmi.x86_64-latest.xml
new file mode 100644
index 0000000000..7c630d6302
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/watchdog-injectnmi.x86_64-latest.xml
@@ -0,0 +1,41 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'ib700' action=3D'inject-nmi'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
--=20
2.43.0
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org