From nobody Sat Apr 20 09:48:06 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 170.10.129.124 as permitted sender) client-ip=170.10.129.124;
 envelope-from=libvir-list-bounces@redhat.com;
 helo=us-smtp-delivery-124.mimecast.com;
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1683650226; cv=none;
	d=zohomail.com; s=zohoarc;
	b=S6oiR5sjGXfLPOvTeO12rUh89GfwX4/4vZXNbJJpaOvd86qMgZKF7BSi6Gko9m5s8x+VjfwkQitNv7I3VUrgLArrrTCV57wdjdJbF3wU0hP2O+vCEf+FuK5OX1qYLQOY28Xi/hWtJG/sfpcCPRoY08/g+utjp5ZsP4utJwWY6wY=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1683650226;
 h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
	bh=x2dm7WLqXzlEKLjkNlM0U/g9hKZTfX3zJk4GpzT+7es=;
	b=GX+kepq9Bsa8KkPIetAq8bZIm2Sdh5gLea4+3N4edIBddsuguZyC6H6nRRMviB5+qnmmjRs1xX6VaJR5dQvHCW+Fmn7K4Kgvovjh0onL/VoAZiOAHIVo86UZqTHnpjh5Xiwjpk3C1P8kAE3/g5DZ0oQYx2lHqOjdht3svMadItE=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<pkrempa@redhat.com> (p=none dis=none)
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com
	with SMTPS id 1683650226311442.210276803386;
 Tue, 9 May 2023 09:37:06 -0700 (PDT)
Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com
 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 us-mta-611-fEThnUgyMIGObgJxITd_Qw-1; Tue, 09 May 2023 12:35:39 -0400
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com
 [10.11.54.7])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6C75B1C27D8B;
	Tue,  9 May 2023 16:35:36 +0000 (UTC)
Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com
 (unknown [10.30.29.100])
	by smtp.corp.redhat.com (Postfix) with ESMTP id D241F1410F23;
	Tue,  9 May 2023 16:35:34 +0000 (UTC)
Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com
 (localhost [IPv6:::1])
	by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id 9AC1A19451C2;
	Tue,  9 May 2023 16:35:34 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com
 [10.11.54.4])
 by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id 546EC19466DF for <libvir-list@listman.corp.redhat.com>;
 Tue,  9 May 2023 16:35:33 +0000 (UTC)
Received: by smtp.corp.redhat.com (Postfix)
 id 35DDC2026D16; Tue,  9 May 2023 16:35:33 +0000 (UTC)
Received: from speedmetal.redhat.com (unknown [10.45.242.12])
 by smtp.corp.redhat.com (Postfix) with ESMTP id 6E1E62024CDC
 for <libvir-list@redhat.com>; Tue,  9 May 2023 16:35:32 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1683650224;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:mime-version:mime-version:
	 content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding:
	 in-reply-to:in-reply-to:references:references:list-id:list-help:
	 list-unsubscribe:list-subscribe:list-post;
	bh=x2dm7WLqXzlEKLjkNlM0U/g9hKZTfX3zJk4GpzT+7es=;
	b=I3gblKLUmOQucKRQkijQEsYawrwqwGTSyjUJXg4e6wy5FS8076BaFiKMpxUsk7ETFvgqcq
	db0AvO4Uj1z4sOicJxL+1S8/wy8f/vLKkuYCYYb1mb8yj4WFeDwnHM60O8FBJXObtMsKOU
	CmjAWCzY0MyA2niZuGb1LRh921R++JE=
X-MC-Unique: fEThnUgyMIGObgJxITd_Qw-1
X-Original-To: libvir-list@listman.corp.redhat.com
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Subject: [PATCH 1/3] qemuxml2xmlout: Replace symlinks of all 'audio-' tests by
 real files
Date: Tue,  9 May 2023 18:35:28 +0200
Message-Id: 
 <5ea6c503ee8bd938c83fd6d1681fb4c3c79cd819.1683650075.git.pkrempa@redhat.com>
In-Reply-To: <cover.1683650075.git.pkrempa@redhat.com>
References: <cover.1683650075.git.pkrempa@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <libvir-list.redhat.com>
List-Unsubscribe: <https://listman.redhat.com/mailman/options/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <http://listman.redhat.com/archives/libvir-list/>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://listman.redhat.com/mailman/listinfo/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=subscribe>
Errors-To: libvir-list-bounces@redhat.com
Sender: "libvir-list" <libvir-list-bounces@redhat.com>
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
X-ZohoMail-DKIM: pass (identity @redhat.com)
X-ZM-MESSAGEID: 1683650228602100001
Content-Type: text/plain; charset="utf-8"

Symlinks are hard to maintain and especially un-cool when attempting to
test against real capapbilities.

Replace symlinks by real files first so that we can switch to real caps
and see the difference.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 tests/qemuxml2xmloutdata/audio-alsa-best.xml  | 44 ++++++++++++-
 tests/qemuxml2xmloutdata/audio-alsa-full.xml  | 44 ++++++++++++-
 .../qemuxml2xmloutdata/audio-alsa-minimal.xml | 37 ++++++++++-
 .../audio-coreaudio-best.xml                  | 44 ++++++++++++-
 .../audio-coreaudio-full.xml                  | 44 ++++++++++++-
 .../audio-coreaudio-minimal.xml               | 37 ++++++++++-
 tests/qemuxml2xmloutdata/audio-file-best.xml  | 44 ++++++++++++-
 tests/qemuxml2xmloutdata/audio-file-full.xml  | 44 ++++++++++++-
 .../qemuxml2xmloutdata/audio-file-minimal.xml | 37 ++++++++++-
 tests/qemuxml2xmloutdata/audio-jack-full.xml  | 44 ++++++++++++-
 .../audio-many-backends.x86_64-latest.xml     | 61 ++++++++++++++++++-
 tests/qemuxml2xmloutdata/audio-none-best.xml  | 44 ++++++++++++-
 tests/qemuxml2xmloutdata/audio-none-full.xml  | 44 ++++++++++++-
 .../qemuxml2xmloutdata/audio-none-minimal.xml | 37 ++++++++++-
 tests/qemuxml2xmloutdata/audio-oss-best.xml   | 44 ++++++++++++-
 tests/qemuxml2xmloutdata/audio-oss-full.xml   | 44 ++++++++++++-
 .../qemuxml2xmloutdata/audio-oss-minimal.xml  | 37 ++++++++++-
 .../audio-pulseaudio-best.xml                 | 44 ++++++++++++-
 .../audio-pulseaudio-full.xml                 | 44 ++++++++++++-
 .../audio-pulseaudio-minimal.xml              | 37 ++++++++++-
 tests/qemuxml2xmloutdata/audio-sdl-best.xml   | 44 ++++++++++++-
 tests/qemuxml2xmloutdata/audio-sdl-full.xml   | 44 ++++++++++++-
 .../qemuxml2xmloutdata/audio-sdl-minimal.xml  | 37 ++++++++++-
 tests/qemuxml2xmloutdata/audio-spice-best.xml | 51 +++++++++++++++-
 tests/qemuxml2xmloutdata/audio-spice-full.xml | 51 +++++++++++++++-
 .../audio-spice-minimal.xml                   | 44 ++++++++++++-
 26 files changed, 1100 insertions(+), 26 deletions(-)
 mode change 120000 =3D> 100644 tests/qemuxml2xmloutdata/audio-alsa-best.xml
 mode change 120000 =3D> 100644 tests/qemuxml2xmloutdata/audio-alsa-full.xml
 mode change 120000 =3D> 100644 tests/qemuxml2xmloutdata/audio-alsa-minimal=
.xml
 mode change 120000 =3D> 100644 tests/qemuxml2xmloutdata/audio-coreaudio-be=
st.xml
 mode change 120000 =3D> 100644 tests/qemuxml2xmloutdata/audio-coreaudio-fu=
ll.xml
 mode change 120000 =3D> 100644 tests/qemuxml2xmloutdata/audio-coreaudio-mi=
nimal.xml
 mode change 120000 =3D> 100644 tests/qemuxml2xmloutdata/audio-file-best.xml
 mode change 120000 =3D> 100644 tests/qemuxml2xmloutdata/audio-file-full.xml
 mode change 120000 =3D> 100644 tests/qemuxml2xmloutdata/audio-file-minimal=
.xml
 mode change 120000 =3D> 100644 tests/qemuxml2xmloutdata/audio-jack-full.xml
 mode change 120000 =3D> 100644 tests/qemuxml2xmloutdata/audio-many-backend=
s.x86_64-latest.xml
 mode change 120000 =3D> 100644 tests/qemuxml2xmloutdata/audio-none-best.xml
 mode change 120000 =3D> 100644 tests/qemuxml2xmloutdata/audio-none-full.xml
 mode change 120000 =3D> 100644 tests/qemuxml2xmloutdata/audio-none-minimal=
.xml
 mode change 120000 =3D> 100644 tests/qemuxml2xmloutdata/audio-oss-best.xml
 mode change 120000 =3D> 100644 tests/qemuxml2xmloutdata/audio-oss-full.xml
 mode change 120000 =3D> 100644 tests/qemuxml2xmloutdata/audio-oss-minimal.=
xml
 mode change 120000 =3D> 100644 tests/qemuxml2xmloutdata/audio-pulseaudio-b=
est.xml
 mode change 120000 =3D> 100644 tests/qemuxml2xmloutdata/audio-pulseaudio-f=
ull.xml
 mode change 120000 =3D> 100644 tests/qemuxml2xmloutdata/audio-pulseaudio-m=
inimal.xml
 mode change 120000 =3D> 100644 tests/qemuxml2xmloutdata/audio-sdl-best.xml
 mode change 120000 =3D> 100644 tests/qemuxml2xmloutdata/audio-sdl-full.xml
 mode change 120000 =3D> 100644 tests/qemuxml2xmloutdata/audio-sdl-minimal.=
xml
 mode change 120000 =3D> 100644 tests/qemuxml2xmloutdata/audio-spice-best.x=
ml
 mode change 120000 =3D> 100644 tests/qemuxml2xmloutdata/audio-spice-full.x=
ml
 mode change 120000 =3D> 100644 tests/qemuxml2xmloutdata/audio-spice-minima=
l.xml

diff --git a/tests/qemuxml2xmloutdata/audio-alsa-best.xml b/tests/qemuxml2x=
mloutdata/audio-alsa-best.xml
deleted file mode 120000
index 2d0865c8ee..0000000000
--- a/tests/qemuxml2xmloutdata/audio-alsa-best.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/audio-alsa-best.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/audio-alsa-best.xml b/tests/qemuxml2x=
mloutdata/audio-alsa-best.xml
new file mode 100644
index 0000000000..29283ab7d2
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-alsa-best.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'cdrom'/>
+  </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-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'>
+      <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'alsa' timerPeriod=3D'50'>
+      <input mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'1' dev=
=3D'/dev/dsp0'>
+        <settings frequency=3D'44100' channels=3D'2' format=3D's16'/>
+      </input>
+      <output mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'2' dev=
=3D'/dev/dsp1'>
+        <settings frequency=3D'22050' channels=3D'4' format=3D'f32'/>
+      </output>
+    </audio>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/audio-alsa-full.xml b/tests/qemuxml2x=
mloutdata/audio-alsa-full.xml
deleted file mode 120000
index 61de7e7b33..0000000000
--- a/tests/qemuxml2xmloutdata/audio-alsa-full.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/audio-alsa-full.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/audio-alsa-full.xml b/tests/qemuxml2x=
mloutdata/audio-alsa-full.xml
new file mode 100644
index 0000000000..4205ecde89
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-alsa-full.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'cdrom'/>
+  </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-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'>
+      <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'alsa'>
+      <input mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'1' buffe=
rLength=3D'100' dev=3D'/dev/dsp0'>
+        <settings frequency=3D'44100' channels=3D'2' format=3D's16'/>
+      </input>
+      <output mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'2' buff=
erLength=3D'200' dev=3D'/dev/dsp1'>
+        <settings frequency=3D'22050' channels=3D'4' format=3D'f32'/>
+      </output>
+    </audio>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/audio-alsa-minimal.xml b/tests/qemuxm=
l2xmloutdata/audio-alsa-minimal.xml
deleted file mode 120000
index c4f64da11f..0000000000
--- a/tests/qemuxml2xmloutdata/audio-alsa-minimal.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/audio-alsa-minimal.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/audio-alsa-minimal.xml b/tests/qemuxm=
l2xmloutdata/audio-alsa-minimal.xml
new file mode 100644
index 0000000000..57ff9d2bf0
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-alsa-minimal.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'cdrom'/>
+  </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-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'>
+      <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'alsa'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/audio-coreaudio-best.xml b/tests/qemu=
xml2xmloutdata/audio-coreaudio-best.xml
deleted file mode 120000
index 13e96938d9..0000000000
--- a/tests/qemuxml2xmloutdata/audio-coreaudio-best.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/audio-coreaudio-best.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/audio-coreaudio-best.xml b/tests/qemu=
xml2xmloutdata/audio-coreaudio-best.xml
new file mode 100644
index 0000000000..d171cc752f
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-coreaudio-best.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'cdrom'/>
+  </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-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'>
+      <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'coreaudio' timerPeriod=3D'50'>
+      <input mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'1'>
+        <settings frequency=3D'44100' channels=3D'2' format=3D's16'/>
+      </input>
+      <output mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'2' buff=
erLength=3D'200' bufferCount=3D'42'>
+        <settings frequency=3D'22050' channels=3D'4' format=3D'f32'/>
+      </output>
+    </audio>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/audio-coreaudio-full.xml b/tests/qemu=
xml2xmloutdata/audio-coreaudio-full.xml
deleted file mode 120000
index b00cc14e29..0000000000
--- a/tests/qemuxml2xmloutdata/audio-coreaudio-full.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/audio-coreaudio-full.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/audio-coreaudio-full.xml b/tests/qemu=
xml2xmloutdata/audio-coreaudio-full.xml
new file mode 100644
index 0000000000..b6427a6e9f
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-coreaudio-full.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'cdrom'/>
+  </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-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'>
+      <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'coreaudio'>
+      <input mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'1' buffe=
rLength=3D'100' bufferCount=3D'50'>
+        <settings frequency=3D'44100' channels=3D'2' format=3D's16'/>
+      </input>
+      <output mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'2' buff=
erLength=3D'200' bufferCount=3D'42'>
+        <settings frequency=3D'22050' channels=3D'4' format=3D'f32'/>
+      </output>
+    </audio>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/audio-coreaudio-minimal.xml b/tests/q=
emuxml2xmloutdata/audio-coreaudio-minimal.xml
deleted file mode 120000
index 3d3078850f..0000000000
--- a/tests/qemuxml2xmloutdata/audio-coreaudio-minimal.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/audio-coreaudio-minimal.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/audio-coreaudio-minimal.xml b/tests/q=
emuxml2xmloutdata/audio-coreaudio-minimal.xml
new file mode 100644
index 0000000000..dac55ecbce
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-coreaudio-minimal.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'cdrom'/>
+  </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-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'>
+      <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'coreaudio'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/audio-file-best.xml b/tests/qemuxml2x=
mloutdata/audio-file-best.xml
deleted file mode 120000
index bb836545a0..0000000000
--- a/tests/qemuxml2xmloutdata/audio-file-best.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/audio-file-best.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/audio-file-best.xml b/tests/qemuxml2x=
mloutdata/audio-file-best.xml
new file mode 100644
index 0000000000..9946ad9e3d
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-file-best.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'cdrom'/>
+  </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-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'>
+      <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'file' timerPeriod=3D'50' path=3D'audio.wav'>
+      <input mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'1'>
+        <settings frequency=3D'44100' channels=3D'2' format=3D's16'/>
+      </input>
+      <output mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'2'>
+        <settings frequency=3D'22050' channels=3D'4' format=3D'f32'/>
+      </output>
+    </audio>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/audio-file-full.xml b/tests/qemuxml2x=
mloutdata/audio-file-full.xml
deleted file mode 120000
index 6e4b032b40..0000000000
--- a/tests/qemuxml2xmloutdata/audio-file-full.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/audio-file-full.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/audio-file-full.xml b/tests/qemuxml2x=
mloutdata/audio-file-full.xml
new file mode 100644
index 0000000000..1e4c50f44a
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-file-full.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'cdrom'/>
+  </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-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'>
+      <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'file' path=3D'audio.wav'>
+      <input mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'1' buffe=
rLength=3D'100'>
+        <settings frequency=3D'44100' channels=3D'2' format=3D's16'/>
+      </input>
+      <output mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'2' buff=
erLength=3D'200'>
+        <settings frequency=3D'22050' channels=3D'4' format=3D'f32'/>
+      </output>
+    </audio>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/audio-file-minimal.xml b/tests/qemuxm=
l2xmloutdata/audio-file-minimal.xml
deleted file mode 120000
index 0b187008a6..0000000000
--- a/tests/qemuxml2xmloutdata/audio-file-minimal.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/audio-file-minimal.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/audio-file-minimal.xml b/tests/qemuxm=
l2xmloutdata/audio-file-minimal.xml
new file mode 100644
index 0000000000..65f2c56a90
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-file-minimal.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'cdrom'/>
+  </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-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'>
+      <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'file'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/audio-jack-full.xml b/tests/qemuxml2x=
mloutdata/audio-jack-full.xml
deleted file mode 120000
index 813ccded71..0000000000
--- a/tests/qemuxml2xmloutdata/audio-jack-full.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/audio-jack-full.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/audio-jack-full.xml b/tests/qemuxml2x=
mloutdata/audio-jack-full.xml
new file mode 100644
index 0000000000..0583a305b1
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-jack-full.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'cdrom'/>
+  </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-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'>
+      <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'>
+      <input mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'1' buffe=
rLength=3D'100' serverName=3D'fish' clientName=3D'food' connectPorts=3D'yum=
'>
+        <settings frequency=3D'44100' channels=3D'2' format=3D's16'/>
+      </input>
+      <output mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'2' buff=
erLength=3D'200' serverName=3D'fish' clientName=3D'food' connectPorts=3D'yu=
m'>
+        <settings frequency=3D'22050' channels=3D'4' format=3D'f32'/>
+      </output>
+    </audio>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/audio-many-backends.x86_64-latest.xml=
 b/tests/qemuxml2xmloutdata/audio-many-backends.x86_64-latest.xml
deleted file mode 120000
index 5f949f13e3..0000000000
--- a/tests/qemuxml2xmloutdata/audio-many-backends.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/audio-many-backends.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/audio-many-backends.x86_64-latest.xml=
 b/tests/qemuxml2xmloutdata/audio-many-backends.x86_64-latest.xml
new file mode 100644
index 0000000000..c681784526
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-many-backends.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'>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'/>
+    <graphics type=3D'vnc' port=3D'-1' autoport=3D'yes'>
+      <listen type=3D'address'/>
+      <audio id=3D'2'/>
+    </graphics>
+    <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'>
+      <audio id=3D'2'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </sound>
+    <sound model=3D'es1370'>
+      <audio id=3D'3'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x0'/>
+    </sound>
+    <audio id=3D'1' type=3D'none'/>
+    <audio id=3D'2' type=3D'alsa'/>
+    <audio id=3D'3' type=3D'pulseaudio'/>
+    <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-none-best.xml b/tests/qemuxml2x=
mloutdata/audio-none-best.xml
deleted file mode 120000
index 7606228da6..0000000000
--- a/tests/qemuxml2xmloutdata/audio-none-best.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/audio-none-best.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/audio-none-best.xml b/tests/qemuxml2x=
mloutdata/audio-none-best.xml
new file mode 100644
index 0000000000..98c3b17a84
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-none-best.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'cdrom'/>
+  </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-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'>
+      <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' timerPeriod=3D'50'>
+      <input mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'1'>
+        <settings frequency=3D'44100' channels=3D'2' format=3D's16'/>
+      </input>
+      <output mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'2'>
+        <settings frequency=3D'22050' channels=3D'4' format=3D'f32'/>
+      </output>
+    </audio>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/audio-none-full.xml b/tests/qemuxml2x=
mloutdata/audio-none-full.xml
deleted file mode 120000
index a5a7ec6932..0000000000
--- a/tests/qemuxml2xmloutdata/audio-none-full.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/audio-none-full.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/audio-none-full.xml b/tests/qemuxml2x=
mloutdata/audio-none-full.xml
new file mode 100644
index 0000000000..85437c67f2
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-none-full.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'cdrom'/>
+  </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-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'>
+      <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'>
+      <input mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'1' buffe=
rLength=3D'100'>
+        <settings frequency=3D'44100' channels=3D'2' format=3D's16'/>
+      </input>
+      <output mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'2' buff=
erLength=3D'200'>
+        <settings frequency=3D'22050' channels=3D'4' format=3D'f32'/>
+      </output>
+    </audio>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/audio-none-minimal.xml b/tests/qemuxm=
l2xmloutdata/audio-none-minimal.xml
deleted file mode 120000
index ce0a93c3e4..0000000000
--- a/tests/qemuxml2xmloutdata/audio-none-minimal.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/audio-none-minimal.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/audio-none-minimal.xml b/tests/qemuxm=
l2xmloutdata/audio-none-minimal.xml
new file mode 100644
index 0000000000..4666777e56
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-none-minimal.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'cdrom'/>
+  </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-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'>
+      <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/audio-oss-best.xml b/tests/qemuxml2xm=
loutdata/audio-oss-best.xml
deleted file mode 120000
index e716f61f72..0000000000
--- a/tests/qemuxml2xmloutdata/audio-oss-best.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/audio-oss-best.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/audio-oss-best.xml b/tests/qemuxml2xm=
loutdata/audio-oss-best.xml
new file mode 100644
index 0000000000..cf0eac2fdf
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-oss-best.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'cdrom'/>
+  </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-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'>
+      <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'oss' timerPeriod=3D'50'>
+      <input mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'1' dev=
=3D'/dev/dsp0' bufferCount=3D'30' tryPoll=3D'yes'>
+        <settings frequency=3D'44100' channels=3D'2' format=3D's16'/>
+      </input>
+      <output mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'2' dev=
=3D'/dev/dsp1' bufferCount=3D'30' tryPoll=3D'no'>
+        <settings frequency=3D'22050' channels=3D'4' format=3D'f32'/>
+      </output>
+    </audio>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/audio-oss-full.xml b/tests/qemuxml2xm=
loutdata/audio-oss-full.xml
deleted file mode 120000
index 6073f438a0..0000000000
--- a/tests/qemuxml2xmloutdata/audio-oss-full.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/audio-oss-full.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/audio-oss-full.xml b/tests/qemuxml2xm=
loutdata/audio-oss-full.xml
new file mode 100644
index 0000000000..b9acccff36
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-oss-full.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'cdrom'/>
+  </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-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'>
+      <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'oss' tryMMap=3D'yes' exclusive=3D'yes' dspPoli=
cy=3D'3'>
+      <input mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'1' buffe=
rLength=3D'100' dev=3D'/dev/dsp0' bufferCount=3D'50' tryPoll=3D'yes'>
+        <settings frequency=3D'44100' channels=3D'2' format=3D's16'/>
+      </input>
+      <output mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'2' buff=
erLength=3D'200' dev=3D'/dev/dsp1' bufferCount=3D'30' tryPoll=3D'no'>
+        <settings frequency=3D'22050' channels=3D'4' format=3D'f32'/>
+      </output>
+    </audio>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/audio-oss-minimal.xml b/tests/qemuxml=
2xmloutdata/audio-oss-minimal.xml
deleted file mode 120000
index d30a208e69..0000000000
--- a/tests/qemuxml2xmloutdata/audio-oss-minimal.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/audio-oss-minimal.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/audio-oss-minimal.xml b/tests/qemuxml=
2xmloutdata/audio-oss-minimal.xml
new file mode 100644
index 0000000000..47da331bab
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-oss-minimal.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'cdrom'/>
+  </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-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'>
+      <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'oss'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/audio-pulseaudio-best.xml b/tests/qem=
uxml2xmloutdata/audio-pulseaudio-best.xml
deleted file mode 120000
index d77efcd7bf..0000000000
--- a/tests/qemuxml2xmloutdata/audio-pulseaudio-best.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/audio-pulseaudio-best.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/audio-pulseaudio-best.xml b/tests/qem=
uxml2xmloutdata/audio-pulseaudio-best.xml
new file mode 100644
index 0000000000..1a4609e9ed
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-pulseaudio-best.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'cdrom'/>
+  </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-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'>
+      <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'pulseaudio' timerPeriod=3D'50' serverName=3D'a=
cme.example.org'>
+      <input mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'1' buffe=
rLength=3D'200' name=3D'fish'>
+        <settings frequency=3D'44100' channels=3D'2' format=3D's16'/>
+      </input>
+      <output mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'2' buff=
erLength=3D'200' name=3D'fish'>
+        <settings frequency=3D'22050' channels=3D'4' format=3D'f32'/>
+      </output>
+    </audio>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/audio-pulseaudio-full.xml b/tests/qem=
uxml2xmloutdata/audio-pulseaudio-full.xml
deleted file mode 120000
index c12f36702d..0000000000
--- a/tests/qemuxml2xmloutdata/audio-pulseaudio-full.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/audio-pulseaudio-full.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/audio-pulseaudio-full.xml b/tests/qem=
uxml2xmloutdata/audio-pulseaudio-full.xml
new file mode 100644
index 0000000000..e15098e1e8
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-pulseaudio-full.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'cdrom'/>
+  </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-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'>
+      <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'pulseaudio' serverName=3D'acme.example.org'>
+      <input mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'1' buffe=
rLength=3D'100' name=3D'fish' streamName=3D'food' latency=3D'100'>
+        <settings frequency=3D'44100' channels=3D'2' format=3D's16'/>
+      </input>
+      <output mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'2' buff=
erLength=3D'200' name=3D'fish' streamName=3D'food' latency=3D'200'>
+        <settings frequency=3D'22050' channels=3D'4' format=3D'f32'/>
+      </output>
+    </audio>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.xml b/tests/=
qemuxml2xmloutdata/audio-pulseaudio-minimal.xml
deleted file mode 120000
index 9cba6b5f00..0000000000
--- a/tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/audio-pulseaudio-minimal.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.xml b/tests/=
qemuxml2xmloutdata/audio-pulseaudio-minimal.xml
new file mode 100644
index 0000000000..6a947c0239
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.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'cdrom'/>
+  </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-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'>
+      <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'pulseaudio'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/audio-sdl-best.xml b/tests/qemuxml2xm=
loutdata/audio-sdl-best.xml
deleted file mode 120000
index 0c90810974..0000000000
--- a/tests/qemuxml2xmloutdata/audio-sdl-best.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/audio-sdl-best.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/audio-sdl-best.xml b/tests/qemuxml2xm=
loutdata/audio-sdl-best.xml
new file mode 100644
index 0000000000..84f810c61a
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-sdl-best.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'cdrom'/>
+  </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-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'>
+      <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'sdl' timerPeriod=3D'50' driver=3D'pulseaudio'>
+      <input mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'1'>
+        <settings frequency=3D'44100' channels=3D'2' format=3D's16'/>
+      </input>
+      <output mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'2' buff=
erLength=3D'200'>
+        <settings frequency=3D'22050' channels=3D'4' format=3D'f32'/>
+      </output>
+    </audio>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/audio-sdl-full.xml b/tests/qemuxml2xm=
loutdata/audio-sdl-full.xml
deleted file mode 120000
index faeeb0ef35..0000000000
--- a/tests/qemuxml2xmloutdata/audio-sdl-full.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/audio-sdl-full.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/audio-sdl-full.xml b/tests/qemuxml2xm=
loutdata/audio-sdl-full.xml
new file mode 100644
index 0000000000..c96182e9fb
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-sdl-full.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'cdrom'/>
+  </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-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'>
+      <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'sdl' driver=3D'pulseaudio'>
+      <input mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'1' buffe=
rLength=3D'100' bufferCount=3D'40'>
+        <settings frequency=3D'44100' channels=3D'2' format=3D's16'/>
+      </input>
+      <output mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'2' buff=
erLength=3D'200' bufferCount=3D'50'>
+        <settings frequency=3D'22050' channels=3D'4' format=3D'f32'/>
+      </output>
+    </audio>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/audio-sdl-minimal.xml b/tests/qemuxml=
2xmloutdata/audio-sdl-minimal.xml
deleted file mode 120000
index 787b220f0a..0000000000
--- a/tests/qemuxml2xmloutdata/audio-sdl-minimal.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/audio-sdl-minimal.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/audio-sdl-minimal.xml b/tests/qemuxml=
2xmloutdata/audio-sdl-minimal.xml
new file mode 100644
index 0000000000..23793b6155
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-sdl-minimal.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'cdrom'/>
+  </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-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'>
+      <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'sdl'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/audio-spice-best.xml b/tests/qemuxml2=
xmloutdata/audio-spice-best.xml
deleted file mode 120000
index 0e52fb5460..0000000000
--- a/tests/qemuxml2xmloutdata/audio-spice-best.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/audio-spice-best.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/audio-spice-best.xml b/tests/qemuxml2=
xmloutdata/audio-spice-best.xml
new file mode 100644
index 0000000000..80594ebca6
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-spice-best.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'cdrom'/>
+  </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-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'>
+      <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' timerPeriod=3D'50'>
+      <input mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'1'>
+        <settings frequency=3D'44100' channels=3D'2' format=3D's16'/>
+      </input>
+      <output mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'2'>
+        <settings frequency=3D'22050' channels=3D'4' format=3D'f32'/>
+      </output>
+    </audio>
+    <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-spice-full.xml b/tests/qemuxml2=
xmloutdata/audio-spice-full.xml
deleted file mode 120000
index 088605f0bc..0000000000
--- a/tests/qemuxml2xmloutdata/audio-spice-full.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/audio-spice-full.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/audio-spice-full.xml b/tests/qemuxml2=
xmloutdata/audio-spice-full.xml
new file mode 100644
index 0000000000..c9f00f8c8c
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-spice-full.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'cdrom'/>
+  </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-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'>
+      <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'>
+      <input mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'1' buffe=
rLength=3D'100'>
+        <settings frequency=3D'44100' channels=3D'2' format=3D's16'/>
+      </input>
+      <output mixingEngine=3D'yes' fixedSettings=3D'yes' voices=3D'2' buff=
erLength=3D'200'>
+        <settings frequency=3D'22050' channels=3D'4' format=3D'f32'/>
+      </output>
+    </audio>
+    <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-spice-minimal.xml b/tests/qemux=
ml2xmloutdata/audio-spice-minimal.xml
deleted file mode 120000
index 5f07fd844a..0000000000
--- a/tests/qemuxml2xmloutdata/audio-spice-minimal.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/audio-spice-minimal.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/audio-spice-minimal.xml b/tests/qemux=
ml2xmloutdata/audio-spice-minimal.xml
new file mode 100644
index 0000000000..d5fd97b9ac
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-spice-minimal.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'cdrom'/>
+  </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-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'>
+      <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>
--=20
2.40.1
From nobody Sat Apr 20 09:48:06 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 170.10.129.124 as permitted sender) client-ip=170.10.129.124;
 envelope-from=libvir-list-bounces@redhat.com;
 helo=us-smtp-delivery-124.mimecast.com;
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1683650231; cv=none;
	d=zohomail.com; s=zohoarc;
	b=ElRyrBtvPWPV8SY8dXh5AC31FE1tAbp6UlWPqABH8+Xu+0gnWLDe7yl1p/VJRDxErCOaFrjAu4mwodk2v4f5RJzLOsWZDHLSvnbJPNNq6mqq4k6KeuWy/BQao2j7/FPqTk1cA4PPc8God3n8Aaej6+I4f63Y3a43yIA6M66UKNw=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1683650231;
 h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
	bh=TAacvIseOx1WptkrcvCMTiY0H+6aChKgRGpH+40GlEc=;
	b=bMZ+7IcTFQPvA0MIlOGOVti6fRZTVDfn4pNmus/VgS3Irl/uEdf9x2mLRe5bE8MGDlJ0Rany8Kiv58kz/Udn907jd5Sh6JpkzPQ0nnZqkCv8O5aZyFvSGpSe4ilM+XSMxIeTriescgOotv36bGnL7ZUA1Kg+X4P6QKoDOPd9nAk=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<pkrempa@redhat.com> (p=none dis=none)
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com
	with SMTPS id 1683650231578586.9142431443463;
 Tue, 9 May 2023 09:37:11 -0700 (PDT)
Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com
 [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 us-mta-252-7Zm0qrwRPGaalEnVHylHIQ-1; Tue, 09 May 2023 12:35:40 -0400
Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com
 [10.11.54.10])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 68DED885622;
	Tue,  9 May 2023 16:35:36 +0000 (UTC)
Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com
 (unknown [10.30.29.100])
	by smtp.corp.redhat.com (Postfix) with ESMTP id D033A492C13;
	Tue,  9 May 2023 16:35:34 +0000 (UTC)
Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com
 (localhost [IPv6:::1])
	by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id 9E0B119451C4;
	Tue,  9 May 2023 16:35:34 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com
 [10.11.54.4])
 by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id 4B9BF19465BC for <libvir-list@listman.corp.redhat.com>;
 Tue,  9 May 2023 16:35:34 +0000 (UTC)
Received: by smtp.corp.redhat.com (Postfix)
 id 3B57920268FD; Tue,  9 May 2023 16:35:34 +0000 (UTC)
Received: from speedmetal.redhat.com (unknown [10.45.242.12])
 by smtp.corp.redhat.com (Postfix) with ESMTP id B0A382026D16
 for <libvir-list@redhat.com>; Tue,  9 May 2023 16:35:33 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1683650230;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:mime-version:mime-version:
	 content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding:
	 in-reply-to:in-reply-to:references:references:list-id:list-help:
	 list-unsubscribe:list-subscribe:list-post;
	bh=TAacvIseOx1WptkrcvCMTiY0H+6aChKgRGpH+40GlEc=;
	b=gk19XzFD7sBJGgMcA8IKgax4o57Ce6kI69oKCBXK8YZOWPtklUm3NryHVgi9WWcl2XGftV
	l71D3cpJd0tGspA1WsnXAeZx8W0tgqmoWcYeY4176nykQfWnY2ln4T4rW9SspHeI4m/+my
	xf+khCW4GEmjDH1AIkY0int8fxRYb7E=
X-MC-Unique: 7Zm0qrwRPGaalEnVHylHIQ-1
X-Original-To: libvir-list@listman.corp.redhat.com
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Subject: [PATCH 2/3] qemuxml2argvtest: Use real caps instead of fake caps for
 'audio-default-*' cases
Date: Tue,  9 May 2023 18:35:29 +0200
Message-Id: 
 <4a5fd35abb8271cff9a44601fbe05839cfaaecd6.1683650075.git.pkrempa@redhat.com>
In-Reply-To: <cover.1683650075.git.pkrempa@redhat.com>
References: <cover.1683650075.git.pkrempa@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <libvir-list.redhat.com>
List-Unsubscribe: <https://listman.redhat.com/mailman/options/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <http://listman.redhat.com/archives/libvir-list/>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://listman.redhat.com/mailman/listinfo/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=subscribe>
Errors-To: libvir-list-bounces@redhat.com
Sender: "libvir-list" <libvir-list-bounces@redhat.com>
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
X-ZohoMail-DKIM: pass (identity @redhat.com)
X-ZM-MESSAGEID: 1683650233002100001
Content-Type: text/plain; charset="utf-8"

Convert all of the 'audio-default-*' cases to use capabilities from
qemu-4.2 instead of the fake caps.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 ...default-sdl.args =3D> audio-default-sdl.x86_64-4.2.0.args} | 6 ++++--
 ...ult-spice.args =3D> audio-default-spice.x86_64-4.2.0.args} | 6 ++++--
 ...default-vnc.args =3D> audio-default-vnc.x86_64-4.2.0.args} | 6 ++++--
 tests/qemuxml2argvtest.c                                    | 6 +++---
 4 files changed, 15 insertions(+), 9 deletions(-)
 rename tests/qemuxml2argvdata/{audio-default-sdl.args =3D> audio-default-s=
dl.x86_64-4.2.0.args} (86%)
 rename tests/qemuxml2argvdata/{audio-default-spice.args =3D> audio-default=
-spice.x86_64-4.2.0.args} (86%)
 rename tests/qemuxml2argvdata/{audio-default-vnc.args =3D> audio-default-v=
nc.x86_64-4.2.0.args} (86%)

diff --git a/tests/qemuxml2argvdata/audio-default-sdl.args b/tests/qemuxml2=
argvdata/audio-default-sdl.x86_64-4.2.0.args
similarity index 86%
rename from tests/qemuxml2argvdata/audio-default-sdl.args
rename to tests/qemuxml2argvdata/audio-default-sdl.x86_64-4.2.0.args
index 4fc9d3cd9a..7a45ba182f 100644
--- a/tests/qemuxml2argvdata/audio-default-sdl.args
+++ b/tests/qemuxml2argvdata/audio-default-sdl.x86_64-4.2.0.args
@@ -11,8 +11,9 @@ SDL_AUDIODRIVER=3Desd \
 -name guest=3DQEMUGuest1,debug-threads=3Don \
 -S \
 -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine pc,usb=3Doff,dump-guest-core=3Doff \
+-machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff \
 -accel tcg \
+-cpu qemu64 \
 -m 214 \
 -overcommit mem-lock=3Doff \
 -smp 1,sockets=3D1,cores=3D1,threads=3D1 \
@@ -25,11 +26,12 @@ SDL_AUDIODRIVER=3Desd \
 -no-shutdown \
 -no-acpi \
 -boot strict=3Don \
--usb \
+-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \
 -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib=
virt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"=
,"file":"libvirt-1-storage"}' \
 -device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0=
,bootindex=3D1 \
 -audiodev '{"id":"audio1","driver":"sdl"}' \
 -display sdl \
 -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \
+-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/audio-default-spice.args b/tests/qemuxm=
l2argvdata/audio-default-spice.x86_64-4.2.0.args
similarity index 86%
rename from tests/qemuxml2argvdata/audio-default-spice.args
rename to tests/qemuxml2argvdata/audio-default-spice.x86_64-4.2.0.args
index 30b93a54c7..9f344cef42 100644
--- a/tests/qemuxml2argvdata/audio-default-spice.args
+++ b/tests/qemuxml2argvdata/audio-default-spice.x86_64-4.2.0.args
@@ -10,8 +10,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -name guest=3DQEMUGuest1,debug-threads=3Don \
 -S \
 -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine pc,usb=3Doff,dump-guest-core=3Doff \
+-machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff \
 -accel tcg \
+-cpu qemu64 \
 -m 214 \
 -overcommit mem-lock=3Doff \
 -smp 1,sockets=3D1,cores=3D1,threads=3D1 \
@@ -24,11 +25,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG=
uest1/.config \
 -no-shutdown \
 -no-acpi \
 -boot strict=3Don \
--usb \
+-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \
 -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib=
virt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"=
,"file":"libvirt-1-storage"}' \
 -device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0=
,bootindex=3D1 \
 -audiodev '{"id":"audio1","driver":"spice"}' \
 -spice port=3D0,seamless-migration=3Don \
 -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \
+-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/audio-default-vnc.args b/tests/qemuxml2=
argvdata/audio-default-vnc.x86_64-4.2.0.args
similarity index 86%
rename from tests/qemuxml2argvdata/audio-default-vnc.args
rename to tests/qemuxml2argvdata/audio-default-vnc.x86_64-4.2.0.args
index 3bb8de4a97..5aa7e82954 100644
--- a/tests/qemuxml2argvdata/audio-default-vnc.args
+++ b/tests/qemuxml2argvdata/audio-default-vnc.x86_64-4.2.0.args
@@ -10,8 +10,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -name guest=3DQEMUGuest1,debug-threads=3Don \
 -S \
 -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
--machine pc,usb=3Doff,dump-guest-core=3Doff \
+-machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff \
 -accel tcg \
+-cpu qemu64 \
 -m 214 \
 -overcommit mem-lock=3Doff \
 -smp 1,sockets=3D1,cores=3D1,threads=3D1 \
@@ -24,11 +25,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG=
uest1/.config \
 -no-shutdown \
 -no-acpi \
 -boot strict=3Don \
--usb \
+-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \
 -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib=
virt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"=
,"file":"libvirt-1-storage"}' \
 -device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0=
,bootindex=3D1 \
 -audiodev '{"id":"audio1","driver":"alsa"}' \
 -vnc 127.0.0.1:0,audiodev=3Daudio1 \
 -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \
+-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 3100078b54..1da4aaec90 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -995,19 +995,19 @@ mymain(void)
     /* Validate auto-creation of <audio> for legacy compat */
     g_setenv("QEMU_AUDIO_DRV", "sdl", TRUE);
     g_setenv("SDL_AUDIODRIVER", "esd", TRUE);
-    DO_TEST("audio-default-sdl", QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_SD=
L);
+    DO_TEST_CAPS_VER("audio-default-sdl", "4.2.0");
     DO_TEST_CAPS_LATEST("audio-default-sdl");
     g_unsetenv("QEMU_AUDIO_DRV");
     g_unsetenv("SDL_AUDIODRIVER");

     g_setenv("QEMU_AUDIO_DRV", "alsa", TRUE);
     driver.config->vncAllowHostAudio =3D true;
-    DO_TEST("audio-default-vnc",  QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_V=
GA);
+    DO_TEST_CAPS_VER("audio-default-vnc", "4.2.0");
     DO_TEST_CAPS_LATEST("audio-default-vnc");
     driver.config->vncAllowHostAudio =3D false;
     g_unsetenv("QEMU_AUDIO_DRV");

-    DO_TEST("audio-default-spice",  QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRR=
US_VGA);
+    DO_TEST_CAPS_VER("audio-default-spice", "4.2.0");
     DO_TEST_CAPS_LATEST("audio-default-spice");

     g_setenv("QEMU_AUDIO_DRV", "alsa", TRUE);
--=20
2.40.1
From nobody Sat Apr 20 09:48:06 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 170.10.133.124 as permitted sender) client-ip=170.10.133.124;
 envelope-from=libvir-list-bounces@redhat.com;
 helo=us-smtp-delivery-124.mimecast.com;
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1683650147; cv=none;
	d=zohomail.com; s=zohoarc;
	b=UA8X/dVN6Yxbzylpa+Qods6JYrKe/SERf8IqpZD4EAo8EN3qGtIWaPqS8utA3lIEI1XGrkY79Ll7X9PWFYDHRBSVXGpO04Nv+JISvpw8U6N2UxidxEMncxbON35JloLfrvRoJAXBYRT5KlkV0m2/yz9LcRgXBE2dj8GXLHcGTGA=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1683650147;
 h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
	bh=m7vhlWmirWtoZTFVk846N3sKEHwnIXEV0LMirs0TP3I=;
	b=C+JtX3i+mQgY6noRUmeTJ3gTEuumqYH6d3GzflKDJm6Jv2MEuLn822neyUSgVifFmYQxfy/F6eegffHwA9q+QotqGma0HD3vDwAKLsYa8eDEPx0H4LcAZOfVVTktyaLC3b/plzDTIhBtXpQsTzpOjnRi9Q+nb/MJWpc/G2jnA3A=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<pkrempa@redhat.com> (p=none dis=none)
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com
	with SMTPS id 168365014771099.8239283742763;
 Tue, 9 May 2023 09:35:47 -0700 (PDT)
Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com
 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 us-mta-56-K7pz8WqSNVq4NZZymJ4M-w-1; Tue, 09 May 2023 12:35:41 -0400
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com
 [10.11.54.7])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3125A1C27D92;
	Tue,  9 May 2023 16:35:37 +0000 (UTC)
Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com
 (unknown [10.30.29.100])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 1C31514171BC;
	Tue,  9 May 2023 16:35:37 +0000 (UTC)
Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com
 (localhost [IPv6:::1])
	by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id F086E19452C8;
	Tue,  9 May 2023 16:35:36 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com
 [10.11.54.4])
 by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id 3A93519452C5 for <libvir-list@listman.corp.redhat.com>;
 Tue,  9 May 2023 16:35:35 +0000 (UTC)
Received: by smtp.corp.redhat.com (Postfix)
 id 18A0A2028E9A; Tue,  9 May 2023 16:35:35 +0000 (UTC)
Received: from speedmetal.redhat.com (unknown [10.45.242.12])
 by smtp.corp.redhat.com (Postfix) with ESMTP id 896452028B5E
 for <libvir-list@redhat.com>; Tue,  9 May 2023 16:35:34 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1683650146;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:mime-version:mime-version:
	 content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding:
	 in-reply-to:in-reply-to:references:references:list-id:list-help:
	 list-unsubscribe:list-subscribe:list-post;
	bh=m7vhlWmirWtoZTFVk846N3sKEHwnIXEV0LMirs0TP3I=;
	b=H2gL5Hsdp9zvrycmfFyHBFGY6FTGCno6YYylGhQOOdPVvIwy1wXtmrAu390aMK6EC0qhtK
	JCGTA6giLMY25W/rxBvB5WGeUXkCu0opJqSe8UgNfIhZdQNJ6MRUkJlHYTf2Mfs91cia5M
	ajglxDzWoy8NK7UaTQ69eyauQXd9G8I=
X-MC-Unique: K7pz8WqSNVq4NZZymJ4M-w-1
X-Original-To: libvir-list@listman.corp.redhat.com
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Subject: [PATCH 3/3] qemuxml2xmltest: Modernize all 'audio-' cases
Date: Tue,  9 May 2023 18:35:30 +0200
Message-Id: 
 <eed39e95b74b9c82418b3ee34d34b6e2741fe670.1683650075.git.pkrempa@redhat.com>
In-Reply-To: <cover.1683650075.git.pkrempa@redhat.com>
References: <cover.1683650075.git.pkrempa@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <libvir-list.redhat.com>
List-Unsubscribe: <https://listman.redhat.com/mailman/options/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <http://listman.redhat.com/archives/libvir-list/>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://listman.redhat.com/mailman/listinfo/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=subscribe>
Errors-To: libvir-list-bounces@redhat.com
Sender: "libvir-list" <libvir-list-bounces@redhat.com>
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
X-ZohoMail-DKIM: pass (identity @redhat.com)
X-ZM-MESSAGEID: 1683650148317100003
Content-Type: text/plain; charset="utf-8"

Use DO_TEST_CAPS_LATEST to run with the latest capapbilities.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 ....xml =3D> audio-alsa-best.x86_64-latest.xml} |  5 +-
 ....xml =3D> audio-alsa-full.x86_64-latest.xml} |  5 +-
 ...l =3D> audio-alsa-minimal.x86_64-latest.xml} |  5 +-
 ...=3D> audio-coreaudio-best.x86_64-latest.xml} |  5 +-
 ...=3D> audio-coreaudio-full.x86_64-latest.xml} |  5 +-
 ...audio-coreaudio-minimal.x86_64-latest.xml} |  5 +-
 ....xml =3D> audio-file-best.x86_64-latest.xml} |  5 +-
 ....xml =3D> audio-file-full.x86_64-latest.xml} |  5 +-
 ...l =3D> audio-file-minimal.x86_64-latest.xml} |  5 +-
 ....xml =3D> audio-jack-full.x86_64-latest.xml} |  5 +-
 ....xml =3D> audio-none-best.x86_64-latest.xml} |  5 +-
 ....xml =3D> audio-none-full.x86_64-latest.xml} |  5 +-
 ...l =3D> audio-none-minimal.x86_64-latest.xml} |  5 +-
 ...t.xml =3D> audio-oss-best.x86_64-latest.xml} |  5 +-
 ...l.xml =3D> audio-oss-full.x86_64-latest.xml} |  5 +-
 ...ml =3D> audio-oss-minimal.x86_64-latest.xml} |  5 +-
 ...> audio-pulseaudio-best.x86_64-latest.xml} |  5 +-
 ...> audio-pulseaudio-full.x86_64-latest.xml} |  5 +-
 ...udio-pulseaudio-minimal.x86_64-latest.xml} |  5 +-
 ...t.xml =3D> audio-sdl-best.x86_64-latest.xml} |  5 +-
 ...l.xml =3D> audio-sdl-full.x86_64-latest.xml} |  5 +-
 ...ml =3D> audio-sdl-minimal.x86_64-latest.xml} |  5 +-
 ...xml =3D> audio-spice-best.x86_64-latest.xml} |  5 +-
 ...xml =3D> audio-spice-full.x86_64-latest.xml} |  5 +-
 ... =3D> audio-spice-minimal.x86_64-latest.xml} |  5 +-
 tests/qemuxml2xmltest.c                       | 56 +++++++++----------
 26 files changed, 125 insertions(+), 56 deletions(-)
 rename tests/qemuxml2xmloutdata/{audio-alsa-best.xml =3D> audio-alsa-best.=
x86_64-latest.xml} (90%)
 rename tests/qemuxml2xmloutdata/{audio-alsa-full.xml =3D> audio-alsa-full.=
x86_64-latest.xml} (90%)
 rename tests/qemuxml2xmloutdata/{audio-alsa-minimal.xml =3D> audio-alsa-mi=
nimal.x86_64-latest.xml} (88%)
 rename tests/qemuxml2xmloutdata/{audio-coreaudio-best.xml =3D> audio-corea=
udio-best.x86_64-latest.xml} (90%)
 rename tests/qemuxml2xmloutdata/{audio-coreaudio-full.xml =3D> audio-corea=
udio-full.x86_64-latest.xml} (90%)
 rename tests/qemuxml2xmloutdata/{audio-coreaudio-minimal.xml =3D> audio-co=
reaudio-minimal.x86_64-latest.xml} (88%)
 rename tests/qemuxml2xmloutdata/{audio-file-best.xml =3D> audio-file-best.=
x86_64-latest.xml} (90%)
 rename tests/qemuxml2xmloutdata/{audio-file-full.xml =3D> audio-file-full.=
x86_64-latest.xml} (90%)
 rename tests/qemuxml2xmloutdata/{audio-file-minimal.xml =3D> audio-file-mi=
nimal.x86_64-latest.xml} (88%)
 rename tests/qemuxml2xmloutdata/{audio-jack-full.xml =3D> audio-jack-full.=
x86_64-latest.xml} (91%)
 rename tests/qemuxml2xmloutdata/{audio-none-best.xml =3D> audio-none-best.=
x86_64-latest.xml} (90%)
 rename tests/qemuxml2xmloutdata/{audio-none-full.xml =3D> audio-none-full.=
x86_64-latest.xml} (90%)
 rename tests/qemuxml2xmloutdata/{audio-none-minimal.xml =3D> audio-none-mi=
nimal.x86_64-latest.xml} (88%)
 rename tests/qemuxml2xmloutdata/{audio-oss-best.xml =3D> audio-oss-best.x8=
6_64-latest.xml} (91%)
 rename tests/qemuxml2xmloutdata/{audio-oss-full.xml =3D> audio-oss-full.x8=
6_64-latest.xml} (91%)
 rename tests/qemuxml2xmloutdata/{audio-oss-minimal.xml =3D> audio-oss-mini=
mal.x86_64-latest.xml} (88%)
 rename tests/qemuxml2xmloutdata/{audio-pulseaudio-best.xml =3D> audio-puls=
eaudio-best.x86_64-latest.xml} (91%)
 rename tests/qemuxml2xmloutdata/{audio-pulseaudio-full.xml =3D> audio-puls=
eaudio-full.x86_64-latest.xml} (91%)
 rename tests/qemuxml2xmloutdata/{audio-pulseaudio-minimal.xml =3D> audio-p=
ulseaudio-minimal.x86_64-latest.xml} (88%)
 rename tests/qemuxml2xmloutdata/{audio-sdl-best.xml =3D> audio-sdl-best.x8=
6_64-latest.xml} (90%)
 rename tests/qemuxml2xmloutdata/{audio-sdl-full.xml =3D> audio-sdl-full.x8=
6_64-latest.xml} (90%)
 rename tests/qemuxml2xmloutdata/{audio-sdl-minimal.xml =3D> audio-sdl-mini=
mal.x86_64-latest.xml} (88%)
 rename tests/qemuxml2xmloutdata/{audio-spice-best.xml =3D> audio-spice-bes=
t.x86_64-latest.xml} (91%)
 rename tests/qemuxml2xmloutdata/{audio-spice-full.xml =3D> audio-spice-ful=
l.x86_64-latest.xml} (91%)
 rename tests/qemuxml2xmloutdata/{audio-spice-minimal.xml =3D> audio-spice-=
minimal.x86_64-latest.xml} (90%)

diff --git a/tests/qemuxml2xmloutdata/audio-alsa-best.xml b/tests/qemuxml2x=
mloutdata/audio-alsa-best.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-alsa-best.xml
rename to tests/qemuxml2xmloutdata/audio-alsa-best.x86_64-latest.xml
index 29283ab7d2..36e4b27257 100644
--- a/tests/qemuxml2xmloutdata/audio-alsa-best.xml
+++ b/tests/qemuxml2xmloutdata/audio-alsa-best.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <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>
@@ -21,7 +24,7 @@
       <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'>
+    <controller type=3D'usb' index=3D'0' model=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'>
diff --git a/tests/qemuxml2xmloutdata/audio-alsa-full.xml b/tests/qemuxml2x=
mloutdata/audio-alsa-full.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-alsa-full.xml
rename to tests/qemuxml2xmloutdata/audio-alsa-full.x86_64-latest.xml
index 4205ecde89..49a659de62 100644
--- a/tests/qemuxml2xmloutdata/audio-alsa-full.xml
+++ b/tests/qemuxml2xmloutdata/audio-alsa-full.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <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>
@@ -21,7 +24,7 @@
       <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'>
+    <controller type=3D'usb' index=3D'0' model=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'>
diff --git a/tests/qemuxml2xmloutdata/audio-alsa-minimal.xml b/tests/qemuxm=
l2xmloutdata/audio-alsa-minimal.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/audio-alsa-minimal.xml
rename to tests/qemuxml2xmloutdata/audio-alsa-minimal.x86_64-latest.xml
index 57ff9d2bf0..e48452b186 100644
--- a/tests/qemuxml2xmloutdata/audio-alsa-minimal.xml
+++ b/tests/qemuxml2xmloutdata/audio-alsa-minimal.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <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>
@@ -21,7 +24,7 @@
       <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'>
+    <controller type=3D'usb' index=3D'0' model=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'>
diff --git a/tests/qemuxml2xmloutdata/audio-coreaudio-best.xml b/tests/qemu=
xml2xmloutdata/audio-coreaudio-best.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-coreaudio-best.xml
rename to tests/qemuxml2xmloutdata/audio-coreaudio-best.x86_64-latest.xml
index d171cc752f..4fc32f5e73 100644
--- a/tests/qemuxml2xmloutdata/audio-coreaudio-best.xml
+++ b/tests/qemuxml2xmloutdata/audio-coreaudio-best.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <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>
@@ -21,7 +24,7 @@
       <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'>
+    <controller type=3D'usb' index=3D'0' model=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'>
diff --git a/tests/qemuxml2xmloutdata/audio-coreaudio-full.xml b/tests/qemu=
xml2xmloutdata/audio-coreaudio-full.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-coreaudio-full.xml
rename to tests/qemuxml2xmloutdata/audio-coreaudio-full.x86_64-latest.xml
index b6427a6e9f..b874bbb48e 100644
--- a/tests/qemuxml2xmloutdata/audio-coreaudio-full.xml
+++ b/tests/qemuxml2xmloutdata/audio-coreaudio-full.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <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>
@@ -21,7 +24,7 @@
       <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'>
+    <controller type=3D'usb' index=3D'0' model=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'>
diff --git a/tests/qemuxml2xmloutdata/audio-coreaudio-minimal.xml b/tests/q=
emuxml2xmloutdata/audio-coreaudio-minimal.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/audio-coreaudio-minimal.xml
rename to tests/qemuxml2xmloutdata/audio-coreaudio-minimal.x86_64-latest.xml
index dac55ecbce..f9209782b5 100644
--- a/tests/qemuxml2xmloutdata/audio-coreaudio-minimal.xml
+++ b/tests/qemuxml2xmloutdata/audio-coreaudio-minimal.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <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>
@@ -21,7 +24,7 @@
       <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'>
+    <controller type=3D'usb' index=3D'0' model=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'>
diff --git a/tests/qemuxml2xmloutdata/audio-file-best.xml b/tests/qemuxml2x=
mloutdata/audio-file-best.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-file-best.xml
rename to tests/qemuxml2xmloutdata/audio-file-best.x86_64-latest.xml
index 9946ad9e3d..c86beb619b 100644
--- a/tests/qemuxml2xmloutdata/audio-file-best.xml
+++ b/tests/qemuxml2xmloutdata/audio-file-best.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <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>
@@ -21,7 +24,7 @@
       <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'>
+    <controller type=3D'usb' index=3D'0' model=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'>
diff --git a/tests/qemuxml2xmloutdata/audio-file-full.xml b/tests/qemuxml2x=
mloutdata/audio-file-full.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-file-full.xml
rename to tests/qemuxml2xmloutdata/audio-file-full.x86_64-latest.xml
index 1e4c50f44a..5479958a93 100644
--- a/tests/qemuxml2xmloutdata/audio-file-full.xml
+++ b/tests/qemuxml2xmloutdata/audio-file-full.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <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>
@@ -21,7 +24,7 @@
       <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'>
+    <controller type=3D'usb' index=3D'0' model=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'>
diff --git a/tests/qemuxml2xmloutdata/audio-file-minimal.xml b/tests/qemuxm=
l2xmloutdata/audio-file-minimal.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/audio-file-minimal.xml
rename to tests/qemuxml2xmloutdata/audio-file-minimal.x86_64-latest.xml
index 65f2c56a90..6b6269886d 100644
--- a/tests/qemuxml2xmloutdata/audio-file-minimal.xml
+++ b/tests/qemuxml2xmloutdata/audio-file-minimal.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <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>
@@ -21,7 +24,7 @@
       <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'>
+    <controller type=3D'usb' index=3D'0' model=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'>
diff --git a/tests/qemuxml2xmloutdata/audio-jack-full.xml b/tests/qemuxml2x=
mloutdata/audio-jack-full.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/audio-jack-full.xml
rename to tests/qemuxml2xmloutdata/audio-jack-full.x86_64-latest.xml
index 0583a305b1..35308678e3 100644
--- a/tests/qemuxml2xmloutdata/audio-jack-full.xml
+++ b/tests/qemuxml2xmloutdata/audio-jack-full.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <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>
@@ -21,7 +24,7 @@
       <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'>
+    <controller type=3D'usb' index=3D'0' model=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'>
diff --git a/tests/qemuxml2xmloutdata/audio-none-best.xml b/tests/qemuxml2x=
mloutdata/audio-none-best.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-none-best.xml
rename to tests/qemuxml2xmloutdata/audio-none-best.x86_64-latest.xml
index 98c3b17a84..77373cfb2b 100644
--- a/tests/qemuxml2xmloutdata/audio-none-best.xml
+++ b/tests/qemuxml2xmloutdata/audio-none-best.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <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>
@@ -21,7 +24,7 @@
       <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'>
+    <controller type=3D'usb' index=3D'0' model=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'>
diff --git a/tests/qemuxml2xmloutdata/audio-none-full.xml b/tests/qemuxml2x=
mloutdata/audio-none-full.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-none-full.xml
rename to tests/qemuxml2xmloutdata/audio-none-full.x86_64-latest.xml
index 85437c67f2..d1383142a0 100644
--- a/tests/qemuxml2xmloutdata/audio-none-full.xml
+++ b/tests/qemuxml2xmloutdata/audio-none-full.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <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>
@@ -21,7 +24,7 @@
       <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'>
+    <controller type=3D'usb' index=3D'0' model=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'>
diff --git a/tests/qemuxml2xmloutdata/audio-none-minimal.xml b/tests/qemuxm=
l2xmloutdata/audio-none-minimal.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/audio-none-minimal.xml
rename to tests/qemuxml2xmloutdata/audio-none-minimal.x86_64-latest.xml
index 4666777e56..8589f05399 100644
--- a/tests/qemuxml2xmloutdata/audio-none-minimal.xml
+++ b/tests/qemuxml2xmloutdata/audio-none-minimal.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <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>
@@ -21,7 +24,7 @@
       <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'>
+    <controller type=3D'usb' index=3D'0' model=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'>
diff --git a/tests/qemuxml2xmloutdata/audio-oss-best.xml b/tests/qemuxml2xm=
loutdata/audio-oss-best.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/audio-oss-best.xml
rename to tests/qemuxml2xmloutdata/audio-oss-best.x86_64-latest.xml
index cf0eac2fdf..b0e068c832 100644
--- a/tests/qemuxml2xmloutdata/audio-oss-best.xml
+++ b/tests/qemuxml2xmloutdata/audio-oss-best.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <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>
@@ -21,7 +24,7 @@
       <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'>
+    <controller type=3D'usb' index=3D'0' model=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'>
diff --git a/tests/qemuxml2xmloutdata/audio-oss-full.xml b/tests/qemuxml2xm=
loutdata/audio-oss-full.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/audio-oss-full.xml
rename to tests/qemuxml2xmloutdata/audio-oss-full.x86_64-latest.xml
index b9acccff36..c90e710681 100644
--- a/tests/qemuxml2xmloutdata/audio-oss-full.xml
+++ b/tests/qemuxml2xmloutdata/audio-oss-full.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <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>
@@ -21,7 +24,7 @@
       <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'>
+    <controller type=3D'usb' index=3D'0' model=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'>
diff --git a/tests/qemuxml2xmloutdata/audio-oss-minimal.xml b/tests/qemuxml=
2xmloutdata/audio-oss-minimal.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/audio-oss-minimal.xml
rename to tests/qemuxml2xmloutdata/audio-oss-minimal.x86_64-latest.xml
index 47da331bab..ce0d2cb8e7 100644
--- a/tests/qemuxml2xmloutdata/audio-oss-minimal.xml
+++ b/tests/qemuxml2xmloutdata/audio-oss-minimal.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <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>
@@ -21,7 +24,7 @@
       <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'>
+    <controller type=3D'usb' index=3D'0' model=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'>
diff --git a/tests/qemuxml2xmloutdata/audio-pulseaudio-best.xml b/tests/qem=
uxml2xmloutdata/audio-pulseaudio-best.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/audio-pulseaudio-best.xml
rename to tests/qemuxml2xmloutdata/audio-pulseaudio-best.x86_64-latest.xml
index 1a4609e9ed..76adca9482 100644
--- a/tests/qemuxml2xmloutdata/audio-pulseaudio-best.xml
+++ b/tests/qemuxml2xmloutdata/audio-pulseaudio-best.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <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>
@@ -21,7 +24,7 @@
       <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'>
+    <controller type=3D'usb' index=3D'0' model=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'>
diff --git a/tests/qemuxml2xmloutdata/audio-pulseaudio-full.xml b/tests/qem=
uxml2xmloutdata/audio-pulseaudio-full.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/audio-pulseaudio-full.xml
rename to tests/qemuxml2xmloutdata/audio-pulseaudio-full.x86_64-latest.xml
index e15098e1e8..87258c3d69 100644
--- a/tests/qemuxml2xmloutdata/audio-pulseaudio-full.xml
+++ b/tests/qemuxml2xmloutdata/audio-pulseaudio-full.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <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>
@@ -21,7 +24,7 @@
       <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'>
+    <controller type=3D'usb' index=3D'0' model=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'>
diff --git a/tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.xml b/tests/=
qemuxml2xmloutdata/audio-pulseaudio-minimal.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.xml
rename to tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.x86_64-latest.x=
ml
index 6a947c0239..c53d0dc1f4 100644
--- a/tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.xml
+++ b/tests/qemuxml2xmloutdata/audio-pulseaudio-minimal.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <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>
@@ -21,7 +24,7 @@
       <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'>
+    <controller type=3D'usb' index=3D'0' model=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'>
diff --git a/tests/qemuxml2xmloutdata/audio-sdl-best.xml b/tests/qemuxml2xm=
loutdata/audio-sdl-best.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-sdl-best.xml
rename to tests/qemuxml2xmloutdata/audio-sdl-best.x86_64-latest.xml
index 84f810c61a..79a8538c86 100644
--- a/tests/qemuxml2xmloutdata/audio-sdl-best.xml
+++ b/tests/qemuxml2xmloutdata/audio-sdl-best.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <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>
@@ -21,7 +24,7 @@
       <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'>
+    <controller type=3D'usb' index=3D'0' model=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'>
diff --git a/tests/qemuxml2xmloutdata/audio-sdl-full.xml b/tests/qemuxml2xm=
loutdata/audio-sdl-full.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-sdl-full.xml
rename to tests/qemuxml2xmloutdata/audio-sdl-full.x86_64-latest.xml
index c96182e9fb..13c6d7d1e2 100644
--- a/tests/qemuxml2xmloutdata/audio-sdl-full.xml
+++ b/tests/qemuxml2xmloutdata/audio-sdl-full.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <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>
@@ -21,7 +24,7 @@
       <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'>
+    <controller type=3D'usb' index=3D'0' model=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'>
diff --git a/tests/qemuxml2xmloutdata/audio-sdl-minimal.xml b/tests/qemuxml=
2xmloutdata/audio-sdl-minimal.x86_64-latest.xml
similarity index 88%
rename from tests/qemuxml2xmloutdata/audio-sdl-minimal.xml
rename to tests/qemuxml2xmloutdata/audio-sdl-minimal.x86_64-latest.xml
index 23793b6155..5bf3196a35 100644
--- a/tests/qemuxml2xmloutdata/audio-sdl-minimal.xml
+++ b/tests/qemuxml2xmloutdata/audio-sdl-minimal.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <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>
@@ -21,7 +24,7 @@
       <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'>
+    <controller type=3D'usb' index=3D'0' model=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'>
diff --git a/tests/qemuxml2xmloutdata/audio-spice-best.xml b/tests/qemuxml2=
xmloutdata/audio-spice-best.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/audio-spice-best.xml
rename to tests/qemuxml2xmloutdata/audio-spice-best.x86_64-latest.xml
index 80594ebca6..9017277a70 100644
--- a/tests/qemuxml2xmloutdata/audio-spice-best.xml
+++ b/tests/qemuxml2xmloutdata/audio-spice-best.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <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>
@@ -21,7 +24,7 @@
       <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'>
+    <controller type=3D'usb' index=3D'0' model=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'>
diff --git a/tests/qemuxml2xmloutdata/audio-spice-full.xml b/tests/qemuxml2=
xmloutdata/audio-spice-full.x86_64-latest.xml
similarity index 91%
rename from tests/qemuxml2xmloutdata/audio-spice-full.xml
rename to tests/qemuxml2xmloutdata/audio-spice-full.x86_64-latest.xml
index c9f00f8c8c..6db1f6889d 100644
--- a/tests/qemuxml2xmloutdata/audio-spice-full.xml
+++ b/tests/qemuxml2xmloutdata/audio-spice-full.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <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>
@@ -21,7 +24,7 @@
       <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'>
+    <controller type=3D'usb' index=3D'0' model=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'>
diff --git a/tests/qemuxml2xmloutdata/audio-spice-minimal.xml b/tests/qemux=
ml2xmloutdata/audio-spice-minimal.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/audio-spice-minimal.xml
rename to tests/qemuxml2xmloutdata/audio-spice-minimal.x86_64-latest.xml
index d5fd97b9ac..e9cba5a772 100644
--- a/tests/qemuxml2xmloutdata/audio-spice-minimal.xml
+++ b/tests/qemuxml2xmloutdata/audio-spice-minimal.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <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>
@@ -21,7 +24,7 @@
       <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'>
+    <controller type=3D'usb' index=3D'0' model=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'>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 93202e8e18..0f9d642730 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1170,41 +1170,35 @@ mymain(void)
     DO_TEST_NOCAPS("downscript");

     /* Simplest possible <audio>, all supported with ENV */
-    DO_TEST_NOCAPS("audio-none-minimal");
-    DO_TEST_NOCAPS("audio-alsa-minimal");
-    DO_TEST_NOCAPS("audio-coreaudio-minimal");
-    DO_TEST_NOCAPS("audio-oss-minimal");
-    DO_TEST_NOCAPS("audio-pulseaudio-minimal");
-    DO_TEST_NOCAPS("audio-sdl-minimal");
-    DO_TEST("audio-spice-minimal",
-            QEMU_CAPS_SPICE,
-            QEMU_CAPS_DEVICE_CIRRUS_VGA);
-    DO_TEST_NOCAPS("audio-file-minimal");
+    DO_TEST_CAPS_LATEST("audio-none-minimal");
+    DO_TEST_CAPS_LATEST("audio-alsa-minimal");
+    DO_TEST_CAPS_LATEST("audio-coreaudio-minimal");
+    DO_TEST_CAPS_LATEST("audio-oss-minimal");
+    DO_TEST_CAPS_LATEST("audio-pulseaudio-minimal");
+    DO_TEST_CAPS_LATEST("audio-sdl-minimal");
+    DO_TEST_CAPS_LATEST("audio-spice-minimal");
+    DO_TEST_CAPS_LATEST("audio-file-minimal");

     /* Best <audio> still compat with old ENV */
-    DO_TEST_NOCAPS("audio-none-best");
-    DO_TEST_NOCAPS("audio-alsa-best");
-    DO_TEST_NOCAPS("audio-coreaudio-best");
-    DO_TEST_NOCAPS("audio-oss-best");
-    DO_TEST_NOCAPS("audio-pulseaudio-best");
-    DO_TEST_NOCAPS("audio-sdl-best");
-    DO_TEST("audio-spice-best",
-            QEMU_CAPS_SPICE,
-            QEMU_CAPS_DEVICE_CIRRUS_VGA);
-    DO_TEST_NOCAPS("audio-file-best");
+    DO_TEST_CAPS_LATEST("audio-none-best");
+    DO_TEST_CAPS_LATEST("audio-alsa-best");
+    DO_TEST_CAPS_LATEST("audio-coreaudio-best");
+    DO_TEST_CAPS_LATEST("audio-oss-best");
+    DO_TEST_CAPS_LATEST("audio-pulseaudio-best");
+    DO_TEST_CAPS_LATEST("audio-sdl-best");
+    DO_TEST_CAPS_LATEST("audio-spice-best");
+    DO_TEST_CAPS_LATEST("audio-file-best");

     /* Full <audio> only compat with new QEMU -audiodev args */
-    DO_TEST_NOCAPS("audio-none-full");
-    DO_TEST_NOCAPS("audio-alsa-full");
-    DO_TEST_NOCAPS("audio-coreaudio-full");
-    DO_TEST_NOCAPS("audio-jack-full");
-    DO_TEST_NOCAPS("audio-oss-full");
-    DO_TEST_NOCAPS("audio-pulseaudio-full");
-    DO_TEST_NOCAPS("audio-sdl-full");
-    DO_TEST("audio-spice-full",
-            QEMU_CAPS_SPICE,
-            QEMU_CAPS_DEVICE_CIRRUS_VGA);
-    DO_TEST_NOCAPS("audio-file-full");
+    DO_TEST_CAPS_LATEST("audio-none-full");
+    DO_TEST_CAPS_LATEST("audio-alsa-full");
+    DO_TEST_CAPS_LATEST("audio-coreaudio-full");
+    DO_TEST_CAPS_LATEST("audio-jack-full");
+    DO_TEST_CAPS_LATEST("audio-oss-full");
+    DO_TEST_CAPS_LATEST("audio-pulseaudio-full");
+    DO_TEST_CAPS_LATEST("audio-sdl-full");
+    DO_TEST_CAPS_LATEST("audio-spice-full");
+    DO_TEST_CAPS_LATEST("audio-file-full");

     DO_TEST_CAPS_LATEST("audio-many-backends");

--=20
2.40.1