From nobody Sat May  4 08:42:13 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=1641284107; cv=none;
	d=zohomail.com; s=zohoarc;
	b=gTeWjEu4fNOQ/Pz1Mjdq1BENg4O3TxVUB5e1Fc5HZI77hoQ3gq5R2VwYyEJw0TYoX5se/xmmPSao+F9LlyZjvUL0Qfeg9L/ZVRJ+8vM/UIT+shCxvX6knt1/7tbR4YLuu99AJ2fLdVE+hsh38SD4bPah+R5Xt8nZ+B+UnA+TSgU=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1641284107;
 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=GmC9kjQZQCcTNPBMNn2j69q0w0yppdW1GbgLqSpsGu0=;
	b=D8SLClVmWG9Bvf8wVNAbhFWbI0CfNSAaLV5Ukl4VNwGAx+Z7sHr8SE6P+755bw9AzN7PxxEOHrpKzjQlKKj28Mml5HtXTfzdbLkLy4gMeY/mJ/l7aQb67MyHo0E2HRXKFxg/OXBvH+otHYgo+wE5Ddf6+RWjyjls4E8UFh848gM=
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=<mprivozn@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 1641284107693252.8581381167627;
 Tue, 4 Jan 2022 00:15:07 -0800 (PST)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 us-mta-408-4CHRgqnsN2SlZW3-9edzww-1; Tue, 04 Jan 2022 03:14:38 -0500
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
 [10.5.11.13])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1874C1018721;
	Tue,  4 Jan 2022 08:14:34 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 91FE77D93E;
	Tue,  4 Jan 2022 08:14:33 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2E3774BB7C;
	Tue,  4 Jan 2022 08:14:33 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com
	[10.5.11.14])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 2048EWAk027085 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 4 Jan 2022 03:14:32 -0500
Received: by smtp.corp.redhat.com (Postfix)
	id ABC175F936; Tue,  4 Jan 2022 08:14:32 +0000 (UTC)
Received: from maggie.redhat.com (unknown [10.43.2.64])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 36A905ED4D
	for <libvir-list@redhat.com>; Tue,  4 Jan 2022 08:14:32 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1641284106;
	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=GmC9kjQZQCcTNPBMNn2j69q0w0yppdW1GbgLqSpsGu0=;
	b=HLw1j8IZvf3i7+Y+womfHm69ny2FVckNmz0auV2TDTYkv7OnTu+4iVVjiDmgbRflRHZB2H
	c83VHwktIT6/IUTaK8jKvMBLil3EfNxfb3hCoHxhgN7N04MktVvtTrddjnJTcOr7z/Ep5D
	O/czabG9AcH7z6BRu2tbvCf5yj588+4=
X-MC-Unique: 4CHRgqnsN2SlZW3-9edzww-1
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Subject: [PATCH 1/4] qemuxml2xmltest: Introduce tpm-emulator-spapr test
Date: Tue,  4 Jan 2022 09:14:27 +0100
Message-Id: 
 <9c341ab5db1d2c6c2b36dfdb3c5df21208ccb4b3.1641283978.git.mprivozn@redhat.com>
In-Reply-To: <cover.1641283978.git.mprivozn@redhat.com>
References: <cover.1641283978.git.mprivozn@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14
X-loop: libvir-list@redhat.com
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://listman.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://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>
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
Authentication-Results: relay.mimecast.com;
	auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com
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: 1641284108651100001
Content-Type: text/plain; charset="utf-8"

We already have the input xml because of xml2arg test. However,
the corresponding xml2xml test case is missing. Make the expected
XML a symlink to the input XML and clean the latter up a bit.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 tests/qemuxml2argvdata/tpm-emulator-spapr.xml | 74 +++++++++++--------
 .../tpm-emulator-spapr.ppc64-latest.xml       |  1 +
 tests/qemuxml2xmltest.c                       |  1 +
 3 files changed, 44 insertions(+), 32 deletions(-)
 create mode 120000 tests/qemuxml2xmloutdata/tpm-emulator-spapr.ppc64-lates=
t.xml

diff --git a/tests/qemuxml2argvdata/tpm-emulator-spapr.xml b/tests/qemuxml2=
argvdata/tpm-emulator-spapr.xml
index f9cda19727..1b4b825e2c 100644
--- a/tests/qemuxml2argvdata/tpm-emulator-spapr.xml
+++ b/tests/qemuxml2argvdata/tpm-emulator-spapr.xml
@@ -12,49 +12,59 @@
   <features>
     <acpi/>
   </features>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>POWER9</model>
+  </cpu>
   <clock offset=3D'utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-ppc64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/tmp/scsidisk.img'/>
+      <target dev=3D'sda' bus=3D'scsi'/>
+      <address type=3D'drive' controller=3D'1' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'scsi' index=3D'0' model=3D'ibmvscsi'>
+      <address type=3D'spapr-vio' reg=3D'0x00002000'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'1' model=3D'ibmvscsi'>
+      <address type=3D'spapr-vio' reg=3D'0x00003000'/>
+    </controller>
+    <controller type=3D'usb' index=3D'0' model=3D'pci-ohci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'>
+      <model name=3D'spapr-pci-host-bridge'/>
+      <target index=3D'0'/>
+    </controller>
+    <serial type=3D'pty'>
+      <target type=3D'spapr-vio-serial' port=3D'0'>
+        <model name=3D'spapr-vty'/>
+      </target>
+      <address type=3D'spapr-vio' reg=3D'0x30000000'/>
+    </serial>
+    <serial type=3D'pty'>
+      <target type=3D'spapr-vio-serial' port=3D'1'>
+        <model name=3D'spapr-vty'/>
+      </target>
+      <address type=3D'spapr-vio' reg=3D'0x30001000'/>
+    </serial>
     <console type=3D'pty'>
-      <address type=3D"spapr-vio"/>
+      <target type=3D'serial' port=3D'0'/>
+      <address type=3D'spapr-vio' reg=3D'0x30000000'/>
     </console>
-
-    <!-- Two serials, first is the console -->
-    <serial type=3D"pty">
-      <address type=3D"spapr-vio"/>
-    </serial>
-    <serial type=3D"pty">
-      <address type=3D"spapr-vio"/>
-    </serial>
-
-    <!-- One disk -->
-    <disk type=3D"file" device=3D"disk">
-      <driver name=3D"qemu" type=3D"raw"/>
-      <source file=3D"/tmp/scsidisk.img"/>
-      <target dev=3D"sda" bus=3D"scsi"/>
-      <address type=3D"drive" controller=3D"1"/>
-    </disk>
-
-    <!-- Two SCSI controllers -->
-    <controller type=3D"scsi" index=3D"1">
-      <address type=3D"spapr-vio"/>
-    </controller>
-    <controller type=3D"scsi" index=3D"0">
-      <address type=3D"spapr-vio"/>
-    </controller>
-
-    <nvram>
-      <address type=3D'spapr-vio' reg=3D'0x4000'/>
-    </nvram>
-
-    <!-- TPM emulator -->
     <tpm model=3D'tpm-spapr'>
       <backend type=3D'emulator' version=3D'2.0'/>
+      <address type=3D'spapr-vio' reg=3D'0x00005000'/>
     </tpm>
-
+    <audio id=3D'1' type=3D'none'/>
     <memballoon model=3D'none'/>
+    <nvram>
+      <address type=3D'spapr-vio' reg=3D'0x00004000'/>
+    </nvram>
+    <panic model=3D'pseries'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/tpm-emulator-spapr.ppc64-latest.xml b=
/tests/qemuxml2xmloutdata/tpm-emulator-spapr.ppc64-latest.xml
new file mode 120000
index 0000000000..d69355b81e
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/tpm-emulator-spapr.ppc64-latest.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/tpm-emulator-spapr.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 45e76bf9cc..c11d415e98 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -759,6 +759,7 @@ mymain(void)
     DO_TEST_CAPS_LATEST("tpm-passthrough");
     DO_TEST_CAPS_LATEST("tpm-passthrough-crb");
     DO_TEST_CAPS_LATEST("tpm-emulator");
+    DO_TEST_CAPS_ARCH_LATEST("tpm-emulator-spapr", "ppc64");
     DO_TEST_CAPS_LATEST("tpm-emulator-tpm2");
     DO_TEST_CAPS_LATEST("tpm-emulator-tpm2-enc");
     DO_TEST_CAPS_LATEST("tpm-emulator-tpm2-pstate");
--=20
2.34.1

From nobody Sat May  4 08:42:13 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=1641284085; cv=none;
	d=zohomail.com; s=zohoarc;
	b=al2jTTmArqInE8qX7WUgaldBhahBhe5qe0vR2OW3zH7mLoCC7XYelhgcERwxha8BOSTe+j5w6a+xLw+94dwYbqzyJnoqe2dAPxVo0HIo8WSrVO6P3H5Oo4bz70WgYO6JaYwB7szfJqcVPzx26k/H/xDvtcnn53qtUYVbJ5+1vEY=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1641284085;
 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=qKmdWjAIvdZ6jJB+EtJBK/Jpl0xn/WpES3/Zrp20QGw=;
	b=HaTXZwFr+ZCqi1/IDQ9ENYDP87NOnSGVC3LK/1uEp0nFLzetBg5GXzDoGx50Twk9s73lbekDDOrNoeWv4AlAyQpzbRy8mrBI4r+X4RddvFfGHniQr6vbjeW2S9wtmkkr8TCskUKGZ9Vqe8qJTj00a881RcBz0BWsTlUSaYxRbVA=
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=<mprivozn@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 16412840856758.535344932293015;
 Tue, 4 Jan 2022 00:14:45 -0800 (PST)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 us-mta-321-OGmoxPfaMp-YDYDhHFg1Ng-1; Tue, 04 Jan 2022 03:14:41 -0500
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
 [10.5.11.12])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D46901898291;
	Tue,  4 Jan 2022 08:14:35 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id B465C7B9FA;
	Tue,  4 Jan 2022 08:14:35 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8026C1809CB8;
	Tue,  4 Jan 2022 08:14:34 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com
	[10.5.11.14])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 2048EXjE027098 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 4 Jan 2022 03:14:33 -0500
Received: by smtp.corp.redhat.com (Postfix)
	id 9F63C5ED4D; Tue,  4 Jan 2022 08:14:33 +0000 (UTC)
Received: from maggie.redhat.com (unknown [10.43.2.64])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 0472D607AA
	for <libvir-list@redhat.com>; Tue,  4 Jan 2022 08:14:32 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1641284084;
	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=qKmdWjAIvdZ6jJB+EtJBK/Jpl0xn/WpES3/Zrp20QGw=;
	b=EGdnl4Kn2a72KpZt5eT4U20mZdwAosdR067qWLVel/fsHe4lHzQa6msk/TJG0I3Hx6Nr3x
	bUSk5TuRHcndUTVdqDqGfyXCE4hs/4ATS432cL6fQYFYvbg3W31z9X3k55r3A76R7E4ltL
	rmwaoUSAxzuIFnKyDQKdYmlTsC/7yos=
X-MC-Unique: OGmoxPfaMp-YDYDhHFg1Ng-1
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Subject: [PATCH 2/4] qemuxml2xmloutdata: Turn tpm-*.xml files into symlinks
Date: Tue,  4 Jan 2022 09:14:28 +0100
Message-Id: 
 <0e5a973604280a16cbf0487062e2436b185d625a.1641283978.git.mprivozn@redhat.com>
In-Reply-To: <cover.1641283978.git.mprivozn@redhat.com>
References: <cover.1641283978.git.mprivozn@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14
X-loop: libvir-list@redhat.com
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://listman.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://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>
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
Authentication-Results: relay.mimecast.com;
	auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com
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: 1641284087569100001
Content-Type: text/plain; charset="utf-8"

Make the tpm-*.xml files symlinks to their respective input XMLs
from qemuxml2argvdata/ directory. This uncovers a bug in our
<tpm/> formatter which formats an invalid XML if both
<encryption/> and <active_pcr_banks/> elements are present for
<backend/>. This is going to be addressed in the next commit.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 .../tpm-emulator-tpm2-enc.xml                 | 12 ++++-
 .../tpm-emulator-tpm2-pstate.xml              | 12 ++++-
 tests/qemuxml2argvdata/tpm-emulator-tpm2.xml  | 14 +++++-
 tests/qemuxml2argvdata/tpm-emulator.xml       | 12 ++++-
 .../qemuxml2argvdata/tpm-passthrough-crb.xml  | 12 ++++-
 tests/qemuxml2argvdata/tpm-passthrough.xml    | 12 ++++-
 .../tpm-emulator-tpm2-enc.x86_64-latest.xml   | 41 +----------------
 ...tpm-emulator-tpm2-pstate.x86_64-latest.xml | 39 +---------------
 .../tpm-emulator-tpm2.x86_64-latest.xml       | 44 +------------------
 .../tpm-emulator.x86_64-latest.xml            | 39 +---------------
 .../tpm-passthrough-crb.x86_64-latest.xml     | 41 +----------------
 .../tpm-passthrough.x86_64-latest.xml         | 41 +----------------
 12 files changed, 68 insertions(+), 251 deletions(-)
 mode change 100644 =3D> 120000 tests/qemuxml2xmloutdata/tpm-emulator-tpm2-=
enc.x86_64-latest.xml
 mode change 100644 =3D> 120000 tests/qemuxml2xmloutdata/tpm-emulator-tpm2-=
pstate.x86_64-latest.xml
 mode change 100644 =3D> 120000 tests/qemuxml2xmloutdata/tpm-emulator-tpm2.=
x86_64-latest.xml
 mode change 100644 =3D> 120000 tests/qemuxml2xmloutdata/tpm-emulator.x86_6=
4-latest.xml
 mode change 100644 =3D> 120000 tests/qemuxml2xmloutdata/tpm-passthrough-cr=
b.x86_64-latest.xml
 mode change 100644 =3D> 120000 tests/qemuxml2xmloutdata/tpm-passthrough.x8=
6_64-latest.xml

diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.xml b/tests/qemux=
ml2argvdata/tpm-emulator-tpm2-enc.xml
index d889aae4f6..9c2279b28b 100644
--- a/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.xml
+++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.xml
@@ -12,13 +12,18 @@
   <features>
     <acpi/>
   </features>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
   <clock offset=3D'utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type=3D'usb' index=3D'0'/>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
     <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
@@ -27,6 +32,9 @@
         <encryption secret=3D'32ee7e76-2178-47a1-ab7b-269e6e348015'/>
       </backend>
     </tpm>
-    <memballoon model=3D'virtio'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.xml b/tests/qe=
muxml2argvdata/tpm-emulator-tpm2-pstate.xml
index 45fc4c0e1a..42e93cfcbe 100644
--- a/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.xml
+++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.xml
@@ -12,19 +12,27 @@
   <features>
     <acpi/>
   </features>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
   <clock offset=3D'utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type=3D'usb' index=3D'0'/>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
     <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <tpm model=3D'tpm-tis'>
       <backend type=3D'emulator' version=3D'2.0' persistent_state=3D'yes'/>
     </tpm>
-    <memballoon model=3D'virtio'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2.xml b/tests/qemuxml2a=
rgvdata/tpm-emulator-tpm2.xml
index 68db8b9232..59dd68311f 100644
--- a/tests/qemuxml2argvdata/tpm-emulator-tpm2.xml
+++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2.xml
@@ -12,24 +12,34 @@
   <features>
     <acpi/>
   </features>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
   <clock offset=3D'utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type=3D'usb' index=3D'0'/>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
     <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <tpm model=3D'tpm-tis'>
       <backend type=3D'emulator' version=3D'2.0'>
+        <encryption secret=3D'b4a117f1-8af2-44a4-91b8-7f0d2d4d68a3'/>
+      >
         <active_pcr_banks>
           <sha256/>
           <sha512/>
         </active_pcr_banks>
       </backend>
     </tpm>
-    <memballoon model=3D'virtio'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2argvdata/tpm-emulator.xml b/tests/qemuxml2argvda=
ta/tpm-emulator.xml
index defc3789ad..b98a3693b7 100644
--- a/tests/qemuxml2argvdata/tpm-emulator.xml
+++ b/tests/qemuxml2argvdata/tpm-emulator.xml
@@ -12,19 +12,27 @@
   <features>
     <acpi/>
   </features>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
   <clock offset=3D'utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type=3D'usb' index=3D'0'/>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
     <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <tpm model=3D'tpm-tis'>
       <backend type=3D'emulator' version=3D'1.2'/>
     </tpm>
-    <memballoon model=3D'virtio'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2argvdata/tpm-passthrough-crb.xml b/tests/qemuxml=
2argvdata/tpm-passthrough-crb.xml
index 2fce5ca342..47c622bd84 100644
--- a/tests/qemuxml2argvdata/tpm-passthrough-crb.xml
+++ b/tests/qemuxml2argvdata/tpm-passthrough-crb.xml
@@ -12,13 +12,18 @@
   <features>
     <acpi/>
   </features>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
   <clock offset=3D'utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type=3D'usb' index=3D'0'/>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
     <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
@@ -27,6 +32,9 @@
         <device path=3D'/dev/tpm0'/>
       </backend>
     </tpm>
-    <memballoon model=3D'virtio'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2argvdata/tpm-passthrough.xml b/tests/qemuxml2arg=
vdata/tpm-passthrough.xml
index 036091d44f..1555de4e86 100644
--- a/tests/qemuxml2argvdata/tpm-passthrough.xml
+++ b/tests/qemuxml2argvdata/tpm-passthrough.xml
@@ -12,13 +12,18 @@
   <features>
     <acpi/>
   </features>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
   <clock offset=3D'utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type=3D'usb' index=3D'0'/>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
     <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
@@ -27,6 +32,9 @@
         <device path=3D'/dev/tpm0'/>
       </backend>
     </tpm>
-    <memballoon model=3D'virtio'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
+    </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.x86_64-latest.x=
ml b/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.x86_64-latest.xml
deleted file mode 100644
index 9c2279b28b..0000000000
--- a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.x86_64-latest.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<domain type=3D'qemu'>
-  <name>TPM-VM</name>
-  <uuid>11d7cd22-da89-3094-6212-079a48a309a1</uuid>
-  <memory unit=3D'KiB'>2097152</memory>
-  <currentMemory unit=3D'KiB'>512288</currentMemory>
-  <vcpu placement=3D'static'>1</vcpu>
-  <os>
-    <type arch=3D'x86_64' machine=3D'pc-i440fx-2.12'>hvm</type>
-    <boot dev=3D'hd'/>
-    <bootmenu enable=3D'yes'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
-    <model fallback=3D'forbid'>qemu64</model>
-  </cpu>
-  <clock offset=3D'utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
-    <input type=3D'mouse' bus=3D'ps2'/>
-    <input type=3D'keyboard' bus=3D'ps2'/>
-    <tpm model=3D'tpm-tis'>
-      <backend type=3D'emulator' version=3D'2.0'>
-        <encryption secret=3D'32ee7e76-2178-47a1-ab7b-269e6e348015'/>
-      </backend>
-    </tpm>
-    <audio id=3D'1' type=3D'none'/>
-    <memballoon model=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.x86_64-latest.x=
ml b/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.x86_64-latest.xml
new file mode 120000
index 0000000000..030f4f373d
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.x86_64-latest.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/tpm-emulator-tpm2-enc.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-pstate.x86_64-lates=
t.xml b/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-pstate.x86_64-latest.xml
deleted file mode 100644
index 42e93cfcbe..0000000000
--- a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-pstate.x86_64-latest.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<domain type=3D'qemu'>
-  <name>TPM-VM</name>
-  <uuid>11d7cd22-da89-3094-6212-079a48a309a1</uuid>
-  <memory unit=3D'KiB'>2097152</memory>
-  <currentMemory unit=3D'KiB'>512288</currentMemory>
-  <vcpu placement=3D'static'>1</vcpu>
-  <os>
-    <type arch=3D'x86_64' machine=3D'pc-i440fx-2.12'>hvm</type>
-    <boot dev=3D'hd'/>
-    <bootmenu enable=3D'yes'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
-    <model fallback=3D'forbid'>qemu64</model>
-  </cpu>
-  <clock offset=3D'utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
-    <input type=3D'mouse' bus=3D'ps2'/>
-    <input type=3D'keyboard' bus=3D'ps2'/>
-    <tpm model=3D'tpm-tis'>
-      <backend type=3D'emulator' version=3D'2.0' persistent_state=3D'yes'/>
-    </tpm>
-    <audio id=3D'1' type=3D'none'/>
-    <memballoon model=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-pstate.x86_64-lates=
t.xml b/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-pstate.x86_64-latest.xml
new file mode 120000
index 0000000000..eb65b59aac
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-pstate.x86_64-latest.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/tpm-emulator-tpm2-pstate.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2.x86_64-latest.xml b=
/tests/qemuxml2xmloutdata/tpm-emulator-tpm2.x86_64-latest.xml
deleted file mode 100644
index edab6db123..0000000000
--- a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2.x86_64-latest.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<domain type=3D'qemu'>
-  <name>TPM-VM</name>
-  <uuid>11d7cd22-da89-3094-6212-079a48a309a1</uuid>
-  <memory unit=3D'KiB'>2097152</memory>
-  <currentMemory unit=3D'KiB'>512288</currentMemory>
-  <vcpu placement=3D'static'>1</vcpu>
-  <os>
-    <type arch=3D'x86_64' machine=3D'pc-i440fx-2.12'>hvm</type>
-    <boot dev=3D'hd'/>
-    <bootmenu enable=3D'yes'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
-    <model fallback=3D'forbid'>qemu64</model>
-  </cpu>
-  <clock offset=3D'utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
-    <input type=3D'mouse' bus=3D'ps2'/>
-    <input type=3D'keyboard' bus=3D'ps2'/>
-    <tpm model=3D'tpm-tis'>
-      <backend type=3D'emulator' version=3D'2.0'>
-        <active_pcr_banks>
-          <sha256/>
-          <sha512/>
-        </active_pcr_banks>
-      </backend>
-    </tpm>
-    <audio id=3D'1' type=3D'none'/>
-    <memballoon model=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2.x86_64-latest.xml b=
/tests/qemuxml2xmloutdata/tpm-emulator-tpm2.x86_64-latest.xml
new file mode 120000
index 0000000000..b8f1123553
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/tpm-emulator-tpm2.x86_64-latest.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/tpm-emulator-tpm2.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/tpm-emulator.x86_64-latest.xml b/test=
s/qemuxml2xmloutdata/tpm-emulator.x86_64-latest.xml
deleted file mode 100644
index b98a3693b7..0000000000
--- a/tests/qemuxml2xmloutdata/tpm-emulator.x86_64-latest.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<domain type=3D'qemu'>
-  <name>TPM-VM</name>
-  <uuid>11d7cd22-da89-3094-6212-079a48a309a1</uuid>
-  <memory unit=3D'KiB'>2097152</memory>
-  <currentMemory unit=3D'KiB'>512288</currentMemory>
-  <vcpu placement=3D'static'>1</vcpu>
-  <os>
-    <type arch=3D'x86_64' machine=3D'pc-i440fx-2.12'>hvm</type>
-    <boot dev=3D'hd'/>
-    <bootmenu enable=3D'yes'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
-    <model fallback=3D'forbid'>qemu64</model>
-  </cpu>
-  <clock offset=3D'utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
-    <input type=3D'mouse' bus=3D'ps2'/>
-    <input type=3D'keyboard' bus=3D'ps2'/>
-    <tpm model=3D'tpm-tis'>
-      <backend type=3D'emulator' version=3D'1.2'/>
-    </tpm>
-    <audio id=3D'1' type=3D'none'/>
-    <memballoon model=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/tpm-emulator.x86_64-latest.xml b/test=
s/qemuxml2xmloutdata/tpm-emulator.x86_64-latest.xml
new file mode 120000
index 0000000000..3ddc89fc94
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/tpm-emulator.x86_64-latest.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/tpm-emulator.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/tpm-passthrough-crb.x86_64-latest.xml=
 b/tests/qemuxml2xmloutdata/tpm-passthrough-crb.x86_64-latest.xml
deleted file mode 100644
index 47c622bd84..0000000000
--- a/tests/qemuxml2xmloutdata/tpm-passthrough-crb.x86_64-latest.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<domain type=3D'qemu'>
-  <name>TPM-VM</name>
-  <uuid>11d7cd22-da89-3094-6212-079a48a309a1</uuid>
-  <memory unit=3D'KiB'>2097152</memory>
-  <currentMemory unit=3D'KiB'>512288</currentMemory>
-  <vcpu placement=3D'static'>1</vcpu>
-  <os>
-    <type arch=3D'x86_64' machine=3D'pc-i440fx-2.12'>hvm</type>
-    <boot dev=3D'hd'/>
-    <bootmenu enable=3D'yes'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
-    <model fallback=3D'forbid'>qemu64</model>
-  </cpu>
-  <clock offset=3D'utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
-    <input type=3D'mouse' bus=3D'ps2'/>
-    <input type=3D'keyboard' bus=3D'ps2'/>
-    <tpm model=3D'tpm-crb'>
-      <backend type=3D'passthrough'>
-        <device path=3D'/dev/tpm0'/>
-      </backend>
-    </tpm>
-    <audio id=3D'1' type=3D'none'/>
-    <memballoon model=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/tpm-passthrough-crb.x86_64-latest.xml=
 b/tests/qemuxml2xmloutdata/tpm-passthrough-crb.x86_64-latest.xml
new file mode 120000
index 0000000000..2f5f021ee6
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/tpm-passthrough-crb.x86_64-latest.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/tpm-passthrough-crb.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml b/t=
ests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml
deleted file mode 100644
index 1555de4e86..0000000000
--- a/tests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<domain type=3D'qemu'>
-  <name>TPM-VM</name>
-  <uuid>11d7cd22-da89-3094-6212-079a48a309a1</uuid>
-  <memory unit=3D'KiB'>2097152</memory>
-  <currentMemory unit=3D'KiB'>512288</currentMemory>
-  <vcpu placement=3D'static'>1</vcpu>
-  <os>
-    <type arch=3D'x86_64' machine=3D'pc-i440fx-2.12'>hvm</type>
-    <boot dev=3D'hd'/>
-    <bootmenu enable=3D'yes'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
-    <model fallback=3D'forbid'>qemu64</model>
-  </cpu>
-  <clock offset=3D'utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
-    <input type=3D'mouse' bus=3D'ps2'/>
-    <input type=3D'keyboard' bus=3D'ps2'/>
-    <tpm model=3D'tpm-tis'>
-      <backend type=3D'passthrough'>
-        <device path=3D'/dev/tpm0'/>
-      </backend>
-    </tpm>
-    <audio id=3D'1' type=3D'none'/>
-    <memballoon model=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml b/t=
ests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml
new file mode 120000
index 0000000000..2fbd46cad0
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/tpm-passthrough.xml
\ No newline at end of file
--=20
2.34.1

From nobody Sat May  4 08:42:13 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=1641284087; cv=none;
	d=zohomail.com; s=zohoarc;
	b=fgUu//O0DVT3+WKoBU3b2TN2USGQ934BtvvpEE4LuQcJc/lsyCotgZXyhvs9GUGV8sfqPAVCPUQJO91JtRtYn7gegUe9VVr9r0jxEn+Ohi+YbXgt/yRUaO1FN8+AxOVlRoaA7KZGFupkebezyNXiRAHn365HLhD/mlkCQHFB0YU=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1641284087;
 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=w9OndzZHA5ajoeB6TBDYGBTekjJmn439OE6halbuxFc=;
	b=BLrkiBbG7tfgx5xYQYTGmzIxM+ww/H2F0lYwbNFUhp38R9KOQ870g13ntJAmWi5/8UUoQgD/oS9owK2uXDhvdqToRimj3ils8xzQPiSrw2Qhwky/EgYfAbbpXhLepyHCAKxal7bux1rOd1Id6Nf7euZiY9c8CHt1fuNzMVmyEjk=
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=<mprivozn@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 1641284087401573.7664882251752;
 Tue, 4 Jan 2022 00:14:47 -0800 (PST)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 us-mta-484-WHSrMvgfNsCtShClDSxVnA-1; Tue, 04 Jan 2022 03:14:44 -0500
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com
 [10.5.11.15])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 270F381CCD4;
	Tue,  4 Jan 2022 08:14:40 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 031BB6F12A;
	Tue,  4 Jan 2022 08:14:40 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id C59294A707;
	Tue,  4 Jan 2022 08:14:39 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com
	[10.5.11.14])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 2048EYl9027105 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 4 Jan 2022 03:14:34 -0500
Received: by smtp.corp.redhat.com (Postfix)
	id 6C85A5F936; Tue,  4 Jan 2022 08:14:34 +0000 (UTC)
Received: from maggie.redhat.com (unknown [10.43.2.64])
	by smtp.corp.redhat.com (Postfix) with ESMTP id EB9365ED4D
	for <libvir-list@redhat.com>; Tue,  4 Jan 2022 08:14:33 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1641284086;
	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=w9OndzZHA5ajoeB6TBDYGBTekjJmn439OE6halbuxFc=;
	b=V3/OtMKrC2lzViyKMAi9pINFAiwi5ch9Fg72Zp27mU7OujNhu+Q1WgsB+fC7aTlOuag6Ac
	363hSUFHNJ4eVpIvRLBEl9d5Ok2RdqjFWKr02ExIvZWa2mvb9xAeEw38qt8PKhoI8L+Y9E
	/wov0izlGMP0z2qcPJnUNzpHOScHZJg=
X-MC-Unique: WHSrMvgfNsCtShClDSxVnA-1
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Subject: [PATCH 3/4] conf: Rework <tpm/> formatting
Date: Tue,  4 Jan 2022 09:14:29 +0100
Message-Id: 
 <34acdf27b39ce3a71dce259d65b330e4ce97a8c3.1641283978.git.mprivozn@redhat.com>
In-Reply-To: <cover.1641283978.git.mprivozn@redhat.com>
References: <cover.1641283978.git.mprivozn@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14
X-loop: libvir-list@redhat.com
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://listman.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://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>
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15
Authentication-Results: relay.mimecast.com;
	auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com
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: 1641284087884100003
Content-Type: text/plain; charset="utf-8"

The <tpm/> element formatting is handled in
virDomainTPMDefFormat() which uses the "old style" - appending
strings directly into the output buffer. With this, it's easy to
get conditions that tell when an element has ended wrong. In this
particular case, if both <encryption/> and <active_pcr_banks/>
are to be formatted the current code puts a stray '>' into the
output buffer, resulting in invalid XML.

Rewrite the function to use virXMLFormatElement() which is more
clever.

https://bugzilla.redhat.com/show_bug.cgi?id=3D2016599#c15

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---
 src/conf/domain_conf.c                       | 53 ++++++++------------
 tests/qemuxml2argvdata/tpm-emulator-tpm2.xml |  1 -
 2 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 716c6d2240..b8fef8586c 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -25481,63 +25481,54 @@ virDomainTPMDefFormat(virBuffer *buf,
                       virDomainTPMDef *def,
                       unsigned int flags)
 {
-    virBufferAsprintf(buf, "<tpm model=3D'%s'>\n",
+    g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) childBuf =3D VIR_BUFFER_INIT_CHILD(buf);
+    g_auto(virBuffer) backendAttrBuf =3D VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) backendBuf =3D VIR_BUFFER_INIT_CHILD(&childBuf);
+
+    virBufferAsprintf(&attrBuf, " model=3D'%s'",
                       virDomainTPMModelTypeToString(def->model));
-    virBufferAdjustIndent(buf, 2);
-    virBufferAsprintf(buf, "<backend type=3D'%s'",
+
+    virBufferAsprintf(&backendAttrBuf, " type=3D'%s'",
                       virDomainTPMBackendTypeToString(def->type));
=20
     switch (def->type) {
     case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH:
-        virBufferAddLit(buf, ">\n");
-        virBufferAdjustIndent(buf, 2);
-        virBufferEscapeString(buf, "<device path=3D'%s'/>\n",
+        virBufferEscapeString(&backendBuf, "<device path=3D'%s'/>\n",
                               def->data.passthrough.source->data.file.path=
);
-        virBufferAdjustIndent(buf, -2);
-        virBufferAddLit(buf, "</backend>\n");
         break;
     case VIR_DOMAIN_TPM_TYPE_EMULATOR:
-        virBufferAsprintf(buf, " version=3D'%s'",
+        virBufferAsprintf(&backendAttrBuf, " version=3D'%s'",
                           virDomainTPMVersionTypeToString(def->version));
         if (def->data.emulator.persistent_state)
-            virBufferAddLit(buf, " persistent_state=3D'yes'");
+            virBufferAddLit(&backendAttrBuf, " persistent_state=3D'yes'");
         if (def->data.emulator.hassecretuuid) {
             char uuidstr[VIR_UUID_STRING_BUFLEN];
-            virBufferAddLit(buf, ">\n");
-            virBufferAdjustIndent(buf, 2);
-            virBufferAsprintf(buf, "<encryption secret=3D'%s'/>\n",
-                virUUIDFormat(def->data.emulator.secretuuid, uuidstr));
-            virBufferAdjustIndent(buf, -2);
+
+            virBufferAsprintf(&backendBuf, "<encryption secret=3D'%s'/>\n",
+                              virUUIDFormat(def->data.emulator.secretuuid,=
 uuidstr));
         }
         if (def->data.emulator.activePcrBanks) {
+            g_auto(virBuffer) activePcrBanksBuf =3D VIR_BUFFER_INIT_CHILD(=
&backendBuf);
             size_t i;
-            virBufferAddLit(buf, ">\n");
-            virBufferAdjustIndent(buf, 2);
-            virBufferAddLit(buf, "<active_pcr_banks>\n");
-            virBufferAdjustIndent(buf, 2);
+
             for (i =3D VIR_DOMAIN_TPM_PCR_BANK_SHA1; i < VIR_DOMAIN_TPM_PC=
R_BANK_LAST; i++) {
                 if ((def->data.emulator.activePcrBanks & (1 << i)))
-                    virBufferAsprintf(buf, "<%s/>\n",
+                    virBufferAsprintf(&activePcrBanksBuf, "<%s/>\n",
                                       virDomainTPMPcrBankTypeToString(i));
             }
-            virBufferAdjustIndent(buf, -2);
-            virBufferAddLit(buf, "</active_pcr_banks>\n");
-            virBufferAdjustIndent(buf, -2);
+
+            virXMLFormatElement(&backendBuf, "active_pcr_banks", NULL, &ac=
tivePcrBanksBuf);
         }
-        if (def->data.emulator.hassecretuuid ||
-            def->data.emulator.activePcrBanks)
-            virBufferAddLit(buf, "</backend>\n");
-        else
-            virBufferAddLit(buf, "/>\n");
         break;
     case VIR_DOMAIN_TPM_TYPE_LAST:
         break;
     }
=20
-    virDomainDeviceInfoFormat(buf, &def->info, flags);
+    virXMLFormatElement(&childBuf, "backend", &backendAttrBuf, &backendBuf=
);
+    virDomainDeviceInfoFormat(&childBuf, &def->info, flags);
=20
-    virBufferAdjustIndent(buf, -2);
-    virBufferAddLit(buf, "</tpm>\n");
+    virXMLFormatElement(buf, "tpm", &attrBuf, &childBuf);
=20
     return 0;
 }
diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2.xml b/tests/qemuxml2a=
rgvdata/tpm-emulator-tpm2.xml
index 59dd68311f..79acde218b 100644
--- a/tests/qemuxml2argvdata/tpm-emulator-tpm2.xml
+++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2.xml
@@ -30,7 +30,6 @@
     <tpm model=3D'tpm-tis'>
       <backend type=3D'emulator' version=3D'2.0'>
         <encryption secret=3D'b4a117f1-8af2-44a4-91b8-7f0d2d4d68a3'/>
-      >
         <active_pcr_banks>
           <sha256/>
           <sha512/>
--=20
2.34.1

From nobody Sat May  4 08:42:13 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=1641284089; cv=none;
	d=zohomail.com; s=zohoarc;
	b=V5U1ZV5xNHCPcBdEGZPrWWVJR1ryZbrEtSlWwXU8ef9wwYBMXOzsTEBGFfRFkSfH3jIEN5IRLhk7CpjfKQ+WxoV9Pa/le/cQiHRfkKDhvPoSKytg2SSSPl7wpFli1s+ymSiUy4jAUr9fAhwEpzm3Ed7xd0nGUme7m8nc0Hlbf7s=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1641284089;
 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=SbV7jPw5PXdYUNd1bwE1Goa5Z4tYp0UTqeZ+LfzWOkw=;
	b=X81Zz6+le3/H6SQNLyiR8UoBTu7k71y7rHb6yVbjtdw2V/tNWIniaQusAHcwV8cws+vOgP7sTx3aZFH3Sk2AXy0NfPx/MDDz8pS4UVdZUQFIrGFLWqA+MkyeaSd/omlqHb02vbM4WOj2F3eAw1TL/kBUnpK0aGzuteFEZI3u/aE=
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=<mprivozn@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 1641284089013266.2066392485533;
 Tue, 4 Jan 2022 00:14:49 -0800 (PST)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 us-mta-53-2AZtYT4TOV6CIzf3W9fb_Q-1; Tue, 04 Jan 2022 03:14:46 -0500
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com
 [10.5.11.15])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9A4DB100D84E;
	Tue,  4 Jan 2022 08:14:40 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 7AD986F12F;
	Tue,  4 Jan 2022 08:14:40 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 437B11809C87;
	Tue,  4 Jan 2022 08:14:40 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com
	[10.5.11.14])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 2048EZct027115 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 4 Jan 2022 03:14:35 -0500
Received: by smtp.corp.redhat.com (Postfix)
	id 3A60D5ED4D; Tue,  4 Jan 2022 08:14:35 +0000 (UTC)
Received: from maggie.redhat.com (unknown [10.43.2.64])
	by smtp.corp.redhat.com (Postfix) with ESMTP id B8E79607AA
	for <libvir-list@redhat.com>; Tue,  4 Jan 2022 08:14:34 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1641284088;
	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=SbV7jPw5PXdYUNd1bwE1Goa5Z4tYp0UTqeZ+LfzWOkw=;
	b=HIz5DcZjMLmg910MDm5G263fPju7HDgf22rnhocbfRB2v69YijsLVwwEXyOs2Wq/I/CfYX
	Ir9aViYNTmtxuiDyticNEiFa1k+mnoBj60IMMWvCWOSDJcH4t0vGKAZH8TYclYYZzw2qXo
	FPj+A4ima6Lk2MyvbLbKQHynQ1hzB1o=
X-MC-Unique: 2AZtYT4TOV6CIzf3W9fb_Q-1
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Subject: [PATCH 4/4] conf: Make virDomainTPMDefFormat() return void
Date: Tue,  4 Jan 2022 09:14:30 +0100
Message-Id: 
 <d7f5c470f6afd47a1959de36a8831d9eb384249e.1641283978.git.mprivozn@redhat.com>
In-Reply-To: <cover.1641283978.git.mprivozn@redhat.com>
References: <cover.1641283978.git.mprivozn@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14
X-loop: libvir-list@redhat.com
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://listman.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://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>
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15
Authentication-Results: relay.mimecast.com;
	auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com
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: 1641284090073100001
Content-Type: text/plain; charset="utf-8"

The virDomainTPMDefFormat() function can't fail really. There's
no point in it returning an integer then. Make it return void and
fix both places which check for its retval.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---
 src/conf/domain_conf.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index b8fef8586c..509f74c092 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -25476,9 +25476,9 @@ virDomainSoundCodecDefFormat(virBuffer *buf,
     return 0;
 }
=20
-static int
+static void
 virDomainTPMDefFormat(virBuffer *buf,
-                      virDomainTPMDef *def,
+                      const virDomainTPMDef *def,
                       unsigned int flags)
 {
     g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER;
@@ -25529,8 +25529,6 @@ virDomainTPMDefFormat(virBuffer *buf,
     virDomainDeviceInfoFormat(&childBuf, &def->info, flags);
=20
     virXMLFormatElement(buf, "tpm", &attrBuf, &childBuf);
-
-    return 0;
 }
=20
=20
@@ -28517,8 +28515,7 @@ virDomainDefFormatInternalSetRootName(virDomainDef =
*def,
     }
=20
     for (n =3D 0; n < def->ntpms; n++) {
-        if (virDomainTPMDefFormat(buf, def->tpms[n], flags) < 0)
-            return -1;
+        virDomainTPMDefFormat(buf, def->tpms[n], flags);
     }
=20
     for (n =3D 0; n < def->ngraphics; n++) {
@@ -29748,7 +29745,8 @@ virDomainDeviceDefCopy(virDomainDeviceDef *src,
         rc =3D virDomainChrDefFormat(&buf, src->data.chr, flags);
         break;
     case VIR_DOMAIN_DEVICE_TPM:
-        rc =3D virDomainTPMDefFormat(&buf, src->data.tpm, flags);
+        virDomainTPMDefFormat(&buf, src->data.tpm, flags);
+        rc =3D 0;
         break;
     case VIR_DOMAIN_DEVICE_PANIC:
         virDomainPanicDefFormat(&buf, src->data.panic);
--=20
2.34.1