From nobody Sat May 11 13:26:56 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=1648805406; cv=none;
	d=zohomail.com; s=zohoarc;
	b=hO3Pf3nFNDcIXSpobF0/5t6quc2z1W4fy61gXSaXbiT2kMrJjUh/KWep+R/rvVorVzmeZtklVhE4q8iIPl3wBTyr6s965TEDp3ZLrGeZM+4dEgVEXRcsEdXe5qh4BuoxIhRWXK63rfW50ImaHx1hRkzBs5rcVUYt3taad14CtO0=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1648805406;
 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=+d2GVgMpBQE9O72r9MdQbMwRSjMfZ6y4e8L6PGfpgz0=;
	b=k0zHCHKrIYgOvt4rheOnTzA9szlpkCRvAn2BjXJreIWEBG6o7zOeFCEssR+WEgV2m6LjlkDQY1eEa1KOmISXrWvOAm7pCK1Qp8hN0dj8XTo5JcOULUxehFIR6/yf+87TYbAYhpbF7s7C9WPim11QHjXl1StuuD+PbgObdzKlhhQ=
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=<abologna@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 1648805406027658.8924653702592;
 Fri, 1 Apr 2022 02:30:06 -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-260-9TA4NKMcOICI5TGWAMPyUg-1; Fri, 01 Apr 2022 05:29:49 -0400
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com
 [10.11.54.2])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F23291010362;
	Fri,  1 Apr 2022 09:29:46 +0000 (UTC)
Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com
 (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100])
	by smtp.corp.redhat.com (Postfix) with ESMTP id DBFA6400F8FE;
	Fri,  1 Apr 2022 09:29:46 +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 90C211947BBF;
	Fri,  1 Apr 2022 09:29:46 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com
 [10.11.54.5])
 by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id 0C7C31947BBE for <libvir-list@listman.corp.redhat.com>;
 Fri,  1 Apr 2022 09:29:45 +0000 (UTC)
Received: by smtp.corp.redhat.com (Postfix)
 id D2CA253D0; Fri,  1 Apr 2022 09:29:44 +0000 (UTC)
Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown
 [10.40.193.28])
 by smtp.corp.redhat.com (Postfix) with ESMTPS id 6253C53CE
 for <libvir-list@redhat.com>; Fri,  1 Apr 2022 09:29:44 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1648805405;
	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=+d2GVgMpBQE9O72r9MdQbMwRSjMfZ6y4e8L6PGfpgz0=;
	b=VNot93vnkGmfIVrRGR7ZQob3QhZglXAi//dafkWph7Q9/6vwg3s+yobDgpuYLBQblNY4CK
	ESLE6cfjEUYAGPbBXKh9EpAeFLcfo4SsnrqydoO7v7R1KZUyGdH6sNgxDnndDYoJPsAhbn
	LXzXCfSi0+q3xbaJMmj3cBLvE49PKYk=
X-MC-Unique: 9TA4NKMcOICI5TGWAMPyUg-1
X-Original-To: libvir-list@listman.corp.redhat.com
From: Andrea Bolognani <abologna@redhat.com>
To: libvir-list@redhat.com
Subject: [libvirt PATCH 1/3] tests: Update capabilities for QEMU 7.0.0 on
 x86_64
Date: Fri,  1 Apr 2022 11:29:31 +0200
Message-Id: <20220401092933.468338-2-abologna@redhat.com>
In-Reply-To: <20220401092933.468338-1-abologna@redhat.com>
References: <20220401092933.468338-1-abologna@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5
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 2.84 on 10.11.54.2
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: 1648805406797100001
Content-Type: text/plain; charset="utf-8"; x-default="true"

The QEMU binary is built from the v7.0.0-rc2 tag.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml  |    1 +
 tests/domaincapsdata/qemu_7.0.0.x86_64.xml    |    1 +
 .../caps_7.0.0.x86_64.replies                 | 2211 +++++++++--------
 .../caps_7.0.0.x86_64.xml                     |   90 +-
 .../cpu-host-model.x86_64-latest.args         |    2 +-
 5 files changed, 1305 insertions(+), 1000 deletions(-)

diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domainc=
apsdata/qemu_7.0.0-q35.x86_64.xml
index 6a660a02b7..1f56616587 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -56,6 +56,7 @@
       <feature policy=3D'require' name=3D'invtsc'/>
       <feature policy=3D'require' name=3D'amd-ssbd'/>
       <feature policy=3D'require' name=3D'virt-ssbd'/>
+      <feature policy=3D'require' name=3D'tsc-scale'/>
       <feature policy=3D'require' name=3D'svme-addr-chk'/>
       <feature policy=3D'require' name=3D'rdctl-no'/>
       <feature policy=3D'require' name=3D'skip-l1dfl-vmentry'/>
diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsd=
ata/qemu_7.0.0.x86_64.xml
index 2a325e3e32..71532ad0ed 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -55,6 +55,7 @@
       <feature policy=3D'require' name=3D'invtsc'/>
       <feature policy=3D'require' name=3D'amd-ssbd'/>
       <feature policy=3D'require' name=3D'virt-ssbd'/>
+      <feature policy=3D'require' name=3D'tsc-scale'/>
       <feature policy=3D'require' name=3D'svme-addr-chk'/>
       <feature policy=3D'require' name=3D'rdctl-no'/>
       <feature policy=3D'require' name=3D'skip-l1dfl-vmentry'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies b/tests/q=
emucapabilitiesdata/caps_7.0.0.x86_64.replies
index 82ccbab6eb..f8973143dd 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies
@@ -17,11 +17,11 @@
 {
   "return": {
     "qemu": {
-      "micro": 50,
+      "micro": 92,
       "minor": 2,
       "major": 6
     },
-    "package": "v6.2.0-2347-gd9ccf33f94"
+    "package": "v7.0.0-rc2"
   },
   "id": "libvirt-2"
 }
[...]
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemuc=
apabilitiesdata/caps_7.0.0.x86_64.xml
index 5227e3ee0b..3f42e67d0b 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -245,10 +245,10 @@
   <flag name=3D'dirtyrate-param.mode'/>
   <flag name=3D'blockdev.nbd.tls-hostname'/>
   <flag name=3D'memory-backend-file.prealloc-threads'/>
-  <version>6002050</version>
+  <version>6002092</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100243</microcodeVersion>
-  <package>v6.2.0-2347-gd9ccf33f94</package>
+  <package>v7.0.0-rc2</package>
   <arch>x86_64</arch>
   <hostCPU type=3D'kvm' model=3D'base' migratability=3D'yes'>
     <property name=3D'vmx-entry-load-rtit-ctl' type=3D'boolean' value=3D'f=
alse'/>
[...]
diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args b/tes=
ts/qemuxml2argvdata/cpu-host-model.x86_64-latest.args
index 7ed0ee28b8..fef92b02ba 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm=
p/lib/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \
 -accel kvm \
--cpu EPYC-Rome,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=3D=
on,stibp=3Don,arch-capabilities=3Don,ssbd=3Don,xsaves=3Don,cmp-legacy=3Don,=
amd-ssbd=3Don,virt-ssbd=3Don,svme-addr-chk=3Don,rdctl-no=3Don,skip-l1dfl-vm=
entry=3Don,mds-no=3Don,pschange-mc-no=3Don \
+-cpu EPYC-Rome,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=3D=
on,stibp=3Don,arch-capabilities=3Don,ssbd=3Don,xsaves=3Don,cmp-legacy=3Don,=
amd-ssbd=3Don,virt-ssbd=3Don,tsc-scale=3Don,svme-addr-chk=3Don,rdctl-no=3Do=
n,skip-l1dfl-vmentry=3Don,mds-no=3Don,pschange-mc-no=3Don \
 -m 214 \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
 -overcommit mem-lock=3Doff \
--=20
2.35.1
From nobody Sat May 11 13:26:56 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=1648805393; cv=none;
	d=zohomail.com; s=zohoarc;
	b=DqCtOoS8ukvmjAlOhXazrkz+FjZwEKSeNje1119TQ1gu2nG62gBhj/aeQWkI2YDP9eHvIREU9EYMScpT9NqVLFGCSk/3hk0hlHo7W6QGiLozuOVmXiAO8Knr4fyQpK+METr1ixuo2TcgJ08g2yKVCGoTuj+DiueAUjeOMHe1Sf4=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1648805393;
 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=vFtZFbHOSemwkx5k2b0/SrCTHl6rtRuiLMZV5gC/05w=;
	b=IIodFKaZoZmbCF9mgJ91NmbeTRV+jl7qwFd+/iwQwZr2wZiAjAx81ZyfDO3Np5fUhrYGH8tWDEyZbaofK0HccA24+TViX+4JQuin4FfCOpymWlBkW9qJxyFqtMpru9CDjo4ja0nB6wO4ZcdM/1kZGhDoXQRJQhOWB5XtbELoKRg=
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=<abologna@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 1648805393421821.7485625017456;
 Fri, 1 Apr 2022 02:29:53 -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-367-UJWqg_1jOKyxOTFgDCJpHw-1; Fri, 01 Apr 2022 05:29:49 -0400
Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com
 [10.11.54.9])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5875F1C0785E;
	Fri,  1 Apr 2022 09:29:47 +0000 (UTC)
Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com
 (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 416145E1A57;
	Fri,  1 Apr 2022 09:29:47 +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 DF19A1940351;
	Fri,  1 Apr 2022 09:29:46 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com
 [10.11.54.5])
 by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id CDC581947BBE for <libvir-list@listman.corp.redhat.com>;
 Fri,  1 Apr 2022 09:29:45 +0000 (UTC)
Received: by smtp.corp.redhat.com (Postfix)
 id BCF6253D0; Fri,  1 Apr 2022 09:29:45 +0000 (UTC)
Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown
 [10.40.193.28])
 by smtp.corp.redhat.com (Postfix) with ESMTPS id 285A753CE
 for <libvir-list@redhat.com>; Fri,  1 Apr 2022 09:29:45 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1648805392;
	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=vFtZFbHOSemwkx5k2b0/SrCTHl6rtRuiLMZV5gC/05w=;
	b=SK7isJwFLHuuKvMkkZ/ERQLnHQq6cC2exMCejCfNpjJFEOM5d1vdrWOBQxEMNZ83FfJlE7
	LgPtTobsNj3NyVGtq7AaJmSCtKGykbtSGnJ80aR6s5AimR2OW+Jr1jEuLExhoNofozxXkD
	qbLUcqdEvffSuc94ByDSOIpdwTQWyCg=
X-MC-Unique: UJWqg_1jOKyxOTFgDCJpHw-1
X-Original-To: libvir-list@listman.corp.redhat.com
From: Andrea Bolognani <abologna@redhat.com>
To: libvir-list@redhat.com
Subject: [libvirt PATCH 2/3] tests: Update capabilities for QEMU 7.0.0 on
 ppc64
Date: Fri,  1 Apr 2022 11:29:32 +0200
Message-Id: <20220401092933.468338-3-abologna@redhat.com>
In-Reply-To: <20220401092933.468338-1-abologna@redhat.com>
References: <20220401092933.468338-1-abologna@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5
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 2.85 on 10.11.54.9
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: 1648806296276100001
Content-Type: text/plain; charset="utf-8"; x-default="true"

The QEMU binary is built from the v7.0.0-rc2 tag.

Some of the additional capabilities that show up are a
consequence of more features being enabled in this build than
in the one used to generate the replies initially rather than
the QEMU version being newer.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 tests/domaincapsdata/qemu_7.0.0.ppc64.xml     |    2 +
 .../caps_7.0.0.ppc64.replies                  | 2400 ++++++++++-------
 .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml |   27 +-
 ...default-video-type-ppc64.ppc64-latest.args |    1 +
 ...ault-cpu-kvm-pseries-2.7.ppc64-latest.args |    1 +
 ...ault-cpu-kvm-pseries-3.1.ppc64-latest.args |    1 +
 ...ault-cpu-kvm-pseries-4.2.ppc64-latest.args |    1 +
 ...ault-cpu-tcg-pseries-2.7.ppc64-latest.args |    1 +
 ...ault-cpu-tcg-pseries-3.1.ppc64-latest.args |    1 +
 ...ault-cpu-tcg-pseries-4.2.ppc64-latest.args |    1 +
 .../ppc64-pseries-graphics.ppc64-latest.args  |    1 +
 .../ppc64-pseries-headless.ppc64-latest.args  |    1 +
 .../ppc64-tpmproxy-single.ppc64-latest.args   |    1 +
 .../ppc64-tpmproxy-with-tpm.ppc64-latest.args |    1 +
 .../tpm-emulator-spapr.ppc64-latest.args      |    1 +
 15 files changed, 1461 insertions(+), 980 deletions(-)

diff --git a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml b/tests/domaincapsda=
ta/qemu_7.0.0.ppc64.xml
index 0f98870bf7..942c721afd 100644
--- a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml
@@ -73,7 +73,9 @@
     </disk>
     <graphics supported=3D'yes'>
       <enum name=3D'type'>
+        <value>sdl</value>
         <value>vnc</value>
+        <value>egl-headless</value>
       </enum>
     </graphics>
     <video supported=3D'yes'>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.replies b/tests/qe=
mucapabilitiesdata/caps_7.0.0.ppc64.replies
index d935e74dff..2283e8e4c8 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.replies
@@ -17,11 +17,11 @@
 {
   "return": {
     "qemu": {
-      "micro": 50,
+      "micro": 92,
       "minor": 2,
       "major": 6
     },
-    "package": "v6.2.0-886-g6621441db5"
+    "package": "v7.0.0-rc2"
   },
   "id": "libvirt-2"
 }
[...]
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemuca=
pabilitiesdata/caps_7.0.0.ppc64.xml
index 8aba3329ad..766e6c866c 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -4,7 +4,10 @@
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
   <flag name=3D'kvm'/>
+  <flag name=3D'sdl'/>
   <flag name=3D'hda-duplex'/>
+  <flag name=3D'ccid-emulated'/>
+  <flag name=3D'ccid-passthru'/>
   <flag name=3D'virtio-tx-alg'/>
   <flag name=3D'piix3-usb-uhci'/>
   <flag name=3D'piix4-usb-uhci'/>
@@ -12,6 +15,7 @@
   <flag name=3D'ich9-usb-ehci1'/>
   <flag name=3D'vt82c686b-usb-uhci'/>
   <flag name=3D'pci-ohci'/>
+  <flag name=3D'usb-redir'/>
   <flag name=3D'usb-hub'/>
   <flag name=3D'ich9-ahci'/>
   <flag name=3D'virtio-blk-pci.scsi'/>
@@ -25,8 +29,10 @@
   <flag name=3D'blockio'/>
   <flag name=3D'disable-s3'/>
   <flag name=3D'disable-s4'/>
+  <flag name=3D'usb-redir.filter'/>
   <flag name=3D'ide-drive.wwn'/>
   <flag name=3D'scsi-disk.wwn'/>
+  <flag name=3D'seccomp-sandbox'/>
   <flag name=3D'vnc'/>
   <flag name=3D'VGA'/>
   <flag name=3D'cirrus-vga'/>
@@ -123,12 +129,14 @@
   <flag name=3D'machine.pseries.cap-hpt-max-page-size'/>
   <flag name=3D'machine.pseries.cap-htm'/>
   <flag name=3D'usb-storage.werror'/>
+  <flag name=3D'egl-headless'/>
   <flag name=3D'vfio-pci.display'/>
   <flag name=3D'blockdev'/>
   <flag name=3D'memory-backend-memfd'/>
   <flag name=3D'memory-backend-memfd.hugetlb'/>
   <flag name=3D'iothread.poll-max-ns'/>
   <flag name=3D'machine.pseries.cap-nested-hv'/>
+  <flag name=3D'egl-headless.rendernode'/>
   <flag name=3D'memory-backend-file.align'/>
   <flag name=3D'nvdimm.unarmed'/>
   <flag name=3D'scsi-disk.device_id'/>
@@ -160,6 +168,7 @@
   <flag name=3D'fsdev.multidevs'/>
   <flag name=3D'virtio.packed'/>
   <flag name=3D'pcie-root-port.hotplug'/>
+  <flag name=3D'aio.io_uring'/>
   <flag name=3D'machine.pseries.cap-cfpc'/>
   <flag name=3D'machine.pseries.cap-sbbc'/>
   <flag name=3D'machine.pseries.cap-ibs'/>
@@ -172,6 +181,7 @@
   <flag name=3D'spapr-tpm-proxy'/>
   <flag name=3D'numa.hmat'/>
   <flag name=3D'blockdev-hostdev-scsi'/>
+  <flag name=3D'usb-host.hostdevice'/>
   <flag name=3D'virtio-balloon.free-page-reporting'/>
   <flag name=3D'block-export-add'/>
   <flag name=3D'netdev.vhost-vdpa'/>
@@ -202,11 +212,12 @@
   <flag name=3D'device.json+hotplug'/>
   <flag name=3D'calc-dirty-rate'/>
   <flag name=3D'dirtyrate-param.mode'/>
+  <flag name=3D'blockdev.nbd.tls-hostname'/>
   <flag name=3D'memory-backend-file.prealloc-threads'/>
-  <version>6002050</version>
+  <version>6002092</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900243</microcodeVersion>
-  <package>v6.2.0-886-g6621441db5</package>
+  <package>v7.0.0-rc2</package>
   <arch>ppc64</arch>
   <cpu type=3D'kvm' name=3D'default' typename=3D'604-powerpc64-cpu'/>
   <cpu type=3D'kvm' name=3D'ppc' typename=3D'604-powerpc64-cpu'/>
[...]
diff --git a/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.a=
rgs b/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args
index 25c5eb3140..63cbce5fc1 100644
--- a/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args
@@ -31,4 +31,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-default-video-type-p=
/.config \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -vnc 127.0.0.1:0,audiodev=3Daudio1 \
 -device '{"driver":"VGA","id":"video0","vgamem_mb":16,"bus":"pci.0","addr"=
:"0x2"}' \
+-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64=
-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc=
64-latest.args
index 65ba777f02..4ab2903ddb 100644
--- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest=
.args
+++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest=
.args
@@ -34,4 +34,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \
 -device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg=
":805306368}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add=
r":"0x3"}' \
+-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64=
-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc=
64-latest.args
index 0e01aa595d..ec7a82bd48 100644
--- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest=
.args
+++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest=
.args
@@ -34,4 +34,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \
 -device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg=
":805306368}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add=
r":"0x3"}' \
+-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64=
-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc=
64-latest.args
index a44dac6afd..199017d85c 100644
--- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest=
.args
+++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest=
.args
@@ -34,4 +34,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \
 -device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg=
":805306368}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add=
r":"0x3"}' \
+-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64=
-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc=
64-latest.args
index 029f2312cf..772fe7a83e 100644
--- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest=
.args
+++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest=
.args
@@ -34,4 +34,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \
 -device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg=
":805306368}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add=
r":"0x3"}' \
+-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64=
-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc=
64-latest.args
index 249d1c1a0b..a45e4e0c3b 100644
--- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest=
.args
+++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest=
.args
@@ -34,4 +34,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \
 -device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg=
":805306368}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add=
r":"0x3"}' \
+-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64=
-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc=
64-latest.args
index 2577b8e07d..e761ce475f 100644
--- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest=
.args
+++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest=
.args
@@ -34,4 +34,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \
 -device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg=
":805306368}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add=
r":"0x3"}' \
+-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.arg=
s b/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args
index 2a39ac718f..d52fe29324 100644
--- a/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args
@@ -44,4 +44,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add=
r":"0x5"}' \
 -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"=
}' \
 -device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci=
.0","addr":"0x6"}' \
+-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.arg=
s b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args
index b8b54b7b80..bd2785fa1e 100644
--- a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args
@@ -41,4 +41,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add=
r":"0x5"}' \
 -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"=
}' \
 -device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci=
.0","addr":"0x6"}' \
+-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args=
 b/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args
index 5ed0240e5e..e0d4e3edee 100644
--- a/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args
@@ -30,4 +30,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
 -device '{"driver":"spapr-tpm-proxy","id":"tpm0","host-path":"/dev/tpmrm0"=
}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add=
r":"0x6"}' \
+-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.ar=
gs b/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args
index 90a27ca1a8..6fa0baca7e 100644
--- a/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args
@@ -33,4 +33,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
 -device '{"driver":"tpm-spapr","tpmdev":"tpm-tpm1","id":"tpm1","reg":16384=
}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add=
r":"0x6"}' \
+-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args b/=
tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args
index 97d310d8dc..198ca21eea 100644
--- a/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args
@@ -41,4 +41,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-TPM-VM/.config \
 -device '{"driver":"tpm-spapr","tpmdev":"tpm-tpm0","id":"tpm0","reg":20480=
}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -global spapr-nvram.reg=3D0x4000 \
+-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
--=20
2.35.1
From nobody Sat May 11 13:26:56 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=1648805393; cv=none;
	d=zohomail.com; s=zohoarc;
	b=g8yzr6RbvLErPv5lClt2SDruNENv3BzZVLOxvhidk0Up6sSsMvmObGxx44VRqVFRsBhwawYQavHBVtuN8kikNmQ1c00GSxlF9Ld92xGF4VIyy0gg4x2nP4VPN+PBFBjtPIlt0SX4HSjelLMseywQ+Iiva5nQIgxLEhY8RxoM77k=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1648805393;
 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=gO/31ECV6SYtZqEjd0G5cIMJcYM6S00V3DUDeG4wrzo=;
	b=gJ3T4Qec+VRCHSoFB7ZPYq1jeXhgA0WrHwjB+4X0YJ/232iL3dZdlhAWSd+xh7BSfBkvRyY0uU4y0G0b2XUzqHDeuzxNMgZ7SP81N8Ihn1GLdrznVTs14ShotgrWs3R4cb6LsHXrHmiSSvVej62vFBM4Z9iogcORtPS7sI4fKOs=
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=<abologna@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 1648805393550842.7330558163236;
 Fri, 1 Apr 2022 02:29:53 -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-321-261egzU1O0mFaTVuWr7nWw-1; Fri, 01 Apr 2022 05:29:51 -0400
Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com
 [10.11.54.8])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3C2D528EC110;
	Fri,  1 Apr 2022 09:29:49 +0000 (UTC)
Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com
 (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 263EBC08099;
	Fri,  1 Apr 2022 09:29:49 +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 DE8441949761;
	Fri,  1 Apr 2022 09:29:48 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com
 [10.11.54.5])
 by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id B871E194034B for <libvir-list@listman.corp.redhat.com>;
 Fri,  1 Apr 2022 09:29:46 +0000 (UTC)
Received: by smtp.corp.redhat.com (Postfix)
 id A934E53D0; Fri,  1 Apr 2022 09:29:46 +0000 (UTC)
Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown
 [10.40.193.28])
 by smtp.corp.redhat.com (Postfix) with ESMTPS id 12D0C53CE
 for <libvir-list@redhat.com>; Fri,  1 Apr 2022 09:29:45 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1648805392;
	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=gO/31ECV6SYtZqEjd0G5cIMJcYM6S00V3DUDeG4wrzo=;
	b=UXHMWGJtslPxeABdSPSCjjBFgGgSMbcGd4g/wxeWxCiIVWhUUKlBQ4UidInJWAU/klzJt9
	q9zSlGpMAbCWA/dKlGpnCOru7ZiaAVoJv0QbnfuqKVBhcBlOWH+dMYvvfwhX2l0gJxlLbh
	rDyedFjvlj3U/1rvtarwRTAE/P/GrH4=
X-MC-Unique: 261egzU1O0mFaTVuWr7nWw-1
X-Original-To: libvir-list@listman.corp.redhat.com
From: Andrea Bolognani <abologna@redhat.com>
To: libvir-list@redhat.com
Subject: [libvirt PATCH 3/3] tests: Add capabilities for QEMU 7.0.0 on aarch64
Date: Fri,  1 Apr 2022 11:29:33 +0200
Message-Id: <20220401092933.468338-4-abologna@redhat.com>
In-Reply-To: <20220401092933.468338-1-abologna@redhat.com>
References: <20220401092933.468338-1-abologna@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5
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 2.85 on 10.11.54.8
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: 1648805394774100004
Content-Type: text/plain; charset="utf-8"; x-default="true"

The QEMU binary is built from the v7.0.0-rc2 tag.

This causes the argument to -device to be generated in JSON
format, same as what 1a691fe1c840 has done for x86_64.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 .../qemu_7.0.0-virt.aarch64.xml               |   193 +
 tests/domaincapsdata/qemu_7.0.0.aarch64.xml   |   187 +
 .../caps_7.0.0.aarch64.replies                | 32273 ++++++++++++++++
 .../caps_7.0.0.aarch64.xml                    |   552 +
 ...fault-cpu-kvm-virt-4.2.aarch64-latest.args |     6 +-
 ...fault-cpu-tcg-virt-4.2.aarch64-latest.args |     6 +-
 .../aarch64-tpm.aarch64-latest.args           |     2 +-
 .../aarch64-virt-graphics.aarch64-latest.args |    36 +-
 .../aarch64-virt-headless.aarch64-latest.args |    28 +-
 ...ult-video-type-aarch64.aarch64-latest.args |     6 +-
 .../disk-arm-virtio-sd.aarch64-latest.args    |     2 +-
 ...e-expander-bus-aarch64.aarch64-latest.args |     2 +-
 12 files changed, 33249 insertions(+), 44 deletions(-)
 create mode 100644 tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml
 create mode 100644 tests/domaincapsdata/qemu_7.0.0.aarch64.xml
 create mode 100644 tests/qemucapabilitiesdata/caps_7.0.0.aarch64.replies
 create mode 100644 tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml

diff --git a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml b/tests/domai=
ncapsdata/qemu_7.0.0-virt.aarch64.xml
new file mode 100644
index 0000000000..7a8cb9f113
--- /dev/null
+++ b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml
@@ -0,0 +1,193 @@
+<domainCapabilities>
+  <path>/usr/bin/qemu-system-aarch64</path>
+  <domain>kvm</domain>
+  <machine>virt-7.0</machine>
+  <arch>aarch64</arch>
[...]
diff --git a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml b/tests/domaincaps=
data/qemu_7.0.0.aarch64.xml
new file mode 100644
index 0000000000..d48c87dc3a
--- /dev/null
+++ b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml
@@ -0,0 +1,187 @@
+<domainCapabilities>
+  <path>/usr/bin/qemu-system-aarch64</path>
+  <domain>kvm</domain>
+  <machine>integratorcp</machine>
+  <arch>aarch64</arch>
[...]
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.replies b/tests/=
qemucapabilitiesdata/caps_7.0.0.aarch64.replies
new file mode 100644
index 0000000000..fa2b68c2b9
--- /dev/null
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.replies
@@ -0,0 +1,32273 @@
+{
+  "execute": "qmp_capabilities",
+  "id": "libvirt-1"
+}
+
+{
+  "return": {
+  },
+  "id": "libvirt-1"
+}
+
+{
+  "execute": "query-version",
+  "id": "libvirt-2"
+}
+
+{
+  "return": {
+    "qemu": {
+      "micro": 92,
+      "minor": 2,
+      "major": 6
+    },
+    "package": "v7.0.0-rc2"
+  },
+  "id": "libvirt-2"
+}
+
+{
+  "execute": "query-target",
+  "id": "libvirt-3"
+}
+
+{
+  "return": {
+    "arch": "aarch64"
+  },
+  "id": "libvirt-3"
+}
[...]
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemu=
capabilitiesdata/caps_7.0.0.aarch64.xml
new file mode 100644
index 0000000000..53dea889df
--- /dev/null
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -0,0 +1,552 @@
+<qemuCaps>
+  <emulator>/usr/bin/qemu-system-aarch64</emulator>
+  <qemuctime>0</qemuctime>
+  <selfctime>0</selfctime>
+  <selfvers>0</selfvers>
+  <flag name=3D'kvm'/>
+  <flag name=3D'sdl'/>
+  <flag name=3D'spice'/>
+  <flag name=3D'hda-duplex'/>
+  <flag name=3D'ccid-emulated'/>
+  <flag name=3D'ccid-passthru'/>
+  <flag name=3D'virtio-tx-alg'/>
+  <flag name=3D'piix3-usb-uhci'/>
+  <flag name=3D'piix4-usb-uhci'/>
+  <flag name=3D'usb-ehci'/>
+  <flag name=3D'ich9-usb-ehci1'/>
+  <flag name=3D'pci-ohci'/>
+  <flag name=3D'usb-redir'/>
+  <flag name=3D'usb-hub'/>
+  <flag name=3D'ich9-ahci'/>
+  <flag name=3D'no-acpi'/>
+  <flag name=3D'virtio-blk-pci.scsi'/>
+  <flag name=3D'scsi-disk.channel'/>
+  <flag name=3D'scsi-block'/>
+  <flag name=3D'hda-micro'/>
+  <flag name=3D'dump-guest-memory'/>
+  <flag name=3D'nec-usb-xhci'/>
+  <flag name=3D'lsi'/>
+  <flag name=3D'virtio-scsi-pci'/>
+  <flag name=3D'blockio'/>
+  <flag name=3D'usb-redir.filter'/>
+  <flag name=3D'ide-drive.wwn'/>
+  <flag name=3D'scsi-disk.wwn'/>
+  <flag name=3D'seccomp-sandbox'/>
+  <flag name=3D'vnc'/>
+  <flag name=3D'VGA'/>
+  <flag name=3D'cirrus-vga'/>
+  <flag name=3D'vmware-svga'/>
+  <flag name=3D'usb-serial'/>
+  <flag name=3D'nbd-server'/>
+  <flag name=3D'virtio-rng'/>
+  <flag name=3D'rng-random'/>
+  <flag name=3D'rng-egd'/>
+  <flag name=3D'megasas'/>
+  <flag name=3D'tpm-passthrough'/>
+  <flag name=3D'tpm-tis'/>
+  <flag name=3D'pci-bridge'/>
+  <flag name=3D'vfio-pci'/>
+  <flag name=3D'drive-discard'/>
+  <flag name=3D'dmi-to-pci-bridge'/>
+  <flag name=3D'usb-storage'/>
+  <flag name=3D'usb-storage.removable'/>
+  <flag name=3D'virtio-mmio'/>
+  <flag name=3D'ich9-intel-hda'/>
+  <flag name=3D'usb-kbd'/>
+  <flag name=3D'active-commit'/>
+  <flag name=3D'change-backing-file'/>
+  <flag name=3D'memory-backend-ram'/>
+  <flag name=3D'numa'/>
+  <flag name=3D'memory-backend-file'/>
+  <flag name=3D'usb-audio'/>
+  <flag name=3D'iothread'/>
+  <flag name=3D'migrate-rdma'/>
+  <flag name=3D'VGA.vgamem_mb'/>
+  <flag name=3D'vmware-svga.vgamem_mb'/>
+  <flag name=3D'pc-dimm'/>
+  <flag name=3D'pci-serial'/>
+  <flag name=3D'aarch64-off'/>
+  <flag name=3D'migration-event'/>
+  <flag name=3D'gpex-pcihost'/>
+  <flag name=3D'ioh3420'/>
+  <flag name=3D'x3130-upstream'/>
+  <flag name=3D'xio3130-downstream'/>
+  <flag name=3D'rtl8139'/>
+  <flag name=3D'e1000'/>
+  <flag name=3D'virtio-net'/>
+  <flag name=3D'gic-version'/>
+  <flag name=3D'incoming-defer'/>
+  <flag name=3D'virtio-gpu'/>
+  <flag name=3D'virtio-keyboard'/>
+  <flag name=3D'virtio-mouse'/>
+  <flag name=3D'virtio-tablet'/>
+  <flag name=3D'virtio-input-host'/>
+  <flag name=3D'chardev-file-append'/>
+  <flag name=3D'vserport-change-event'/>
+  <flag name=3D'virtio-balloon-pci.deflate-on-oom'/>
+  <flag name=3D'mptsas1068'/>
+  <flag name=3D'spice-gl'/>
+  <flag name=3D'chardev-logfile'/>
+  <flag name=3D'pxb'/>
+  <flag name=3D'pxb-pcie'/>
+  <flag name=3D'nec-usb-xhci-ports'/>
+  <flag name=3D'virtio-scsi-pci.iothread'/>
+  <flag name=3D'drive-detect-zeroes'/>
+  <flag name=3D'virtio-pci-disable-legacy'/>
+  <flag name=3D'query-hotpluggable-cpus'/>
+  <flag name=3D'virtio-net.rx_queue_size'/>
+  <flag name=3D'ivshmem-plain'/>
+  <flag name=3D'ivshmem-doorbell'/>
+  <flag name=3D'gluster.debug_level'/>
+  <flag name=3D'vhost-scsi'/>
+  <flag name=3D'query-cpu-model-expansion'/>
+  <flag name=3D'virtio-net.host_mtu'/>
+  <flag name=3D'spice-rendernode'/>
+  <flag name=3D'nvdimm'/>
+  <flag name=3D'pcie-root-port'/>
+  <flag name=3D'query-cpu-definitions'/>
+  <flag name=3D'block-write-threshold'/>
+  <flag name=3D'query-named-block-nodes'/>
+  <flag name=3D'qemu-xhci'/>
+  <flag name=3D'virtio-net.tx_queue_size'/>
+  <flag name=3D'chardev-reconnect'/>
+  <flag name=3D'virtio-blk.num-queues'/>
+  <flag name=3D'vmcoreinfo'/>
+  <flag name=3D'disk-share-rw'/>
+  <flag name=3D'pl011'/>
+  <flag name=3D'dump-completed'/>
+  <flag name=3D'qcow2-luks'/>
+  <flag name=3D'pcie-pci-bridge'/>
+  <flag name=3D'query-cpus-fast'/>
+  <flag name=3D'disk-write-cache'/>
+  <flag name=3D'nbd-tls'/>
+  <flag name=3D'pr-manager-helper'/>
+  <flag name=3D'qom-list-properties'/>
+  <flag name=3D'memory-backend-file.discard-data'/>
+  <flag name=3D'screendump_device'/>
+  <flag name=3D'hda-output'/>
+  <flag name=3D'blockdev-del'/>
+  <flag name=3D'vhost-vsock'/>
+  <flag name=3D'chardev-fd-pass'/>
+  <flag name=3D'tpm-emulator'/>
+  <flag name=3D'usb-storage.werror'/>
+  <flag name=3D'egl-headless'/>
+  <flag name=3D'vfio-pci.display'/>
+  <flag name=3D'blockdev'/>
+  <flag name=3D'memory-backend-memfd'/>
+  <flag name=3D'memory-backend-memfd.hugetlb'/>
+  <flag name=3D'iothread.poll-max-ns'/>
+  <flag name=3D'egl-headless.rendernode'/>
+  <flag name=3D'memory-backend-file.align'/>
+  <flag name=3D'nvdimm.unarmed'/>
+  <flag name=3D'scsi-disk.device_id'/>
+  <flag name=3D'virtio-pci-non-transitional'/>
+  <flag name=3D'overcommit'/>
+  <flag name=3D'query-current-machine'/>
+  <flag name=3D'machine.virt.iommu'/>
+  <flag name=3D'bitmap-merge'/>
+  <flag name=3D'nbd-bitmap'/>
+  <flag name=3D'bochs-display'/>
+  <flag name=3D'migration-file-drop-cache'/>
+  <flag name=3D'dbus-vmstate'/>
+  <flag name=3D'vhost-user-gpu'/>
+  <flag name=3D'incremental-backup'/>
+  <flag name=3D'ramfb'/>
+  <flag name=3D'arm-max-cpu'/>
+  <flag name=3D'blockdev-file-dynamic-auto-read-only'/>
+  <flag name=3D'savevm-monitor-nodes'/>
+  <flag name=3D'drive-nvme'/>
+  <flag name=3D'smp-dies'/>
+  <flag name=3D'rng-builtin'/>
+  <flag name=3D'virtio-net.failover'/>
+  <flag name=3D'cpu.kvm-no-adjvtime'/>
+  <flag name=3D'vhost-user-fs'/>
+  <flag name=3D'query-named-block-nodes.flat'/>
+  <flag name=3D'blockdev-snapshot.allow-write-only-overlay'/>
+  <flag name=3D'blockdev-reopen'/>
+  <flag name=3D'storage.werror'/>
+  <flag name=3D'fsdev.multidevs'/>
+  <flag name=3D'virtio.packed'/>
+  <flag name=3D'pcie-root-port.hotplug'/>
+  <flag name=3D'aio.io_uring'/>
+  <flag name=3D'tcg'/>
+  <flag name=3D'virtio-blk-pci.scsi.default.disabled'/>
+  <flag name=3D'pvscsi'/>
+  <flag name=3D'migration-param.bandwidth'/>
+  <flag name=3D'migration-param.downtime'/>
+  <flag name=3D'migration-param.xbzrle-cache-size'/>
+  <flag name=3D'numa.hmat'/>
+  <flag name=3D'blockdev-hostdev-scsi'/>
+  <flag name=3D'usb-host.hostdevice'/>
+  <flag name=3D'virtio-balloon.free-page-reporting'/>
+  <flag name=3D'block-export-add'/>
+  <flag name=3D'netdev.vhost-vdpa'/>
+  <flag name=3D'dc390'/>
+  <flag name=3D'am53c974'/>
+  <flag name=3D'vhost-user-fs.bootindex'/>
+  <flag name=3D'vhost-user-blk'/>
+  <flag name=3D'cpu-max'/>
+  <flag name=3D'memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
+  <flag name=3D'migration-param.block-bitmap-mapping'/>
+  <flag name=3D'vnc-power-control'/>
+  <flag name=3D'audiodev'/>
+  <flag name=3D'blockdev-backup'/>
+  <flag name=3D'object.qapified'/>
+  <flag name=3D'rotation-rate'/>
+  <flag name=3D'compat-deprecated'/>
+  <flag name=3D'acpi-index'/>
+  <flag name=3D'input-linux'/>
+  <flag name=3D'confidential-guest-support'/>
+  <flag name=3D'query-display-options'/>
+  <flag name=3D'set-action'/>
+  <flag name=3D'virtio-blk.queue-size'/>
+  <flag name=3D'virtio-mem-pci'/>
+  <flag name=3D'memory-backend-file.reserve'/>
+  <flag name=3D'query-dirty-rate'/>
+  <flag name=3D'rbd-encryption'/>
+  <flag name=3D'sev-guest-kernel-hashes'/>
+  <flag name=3D'device.json+hotplug'/>
+  <flag name=3D'virtio-mem-pci.prealloc'/>
+  <flag name=3D'calc-dirty-rate'/>
+  <flag name=3D'dirtyrate-param.mode'/>
+  <flag name=3D'blockdev.nbd.tls-hostname'/>
+  <flag name=3D'memory-backend-file.prealloc-threads'/>
+  <version>6002092</version>
+  <kvmVersion>0</kvmVersion>
+  <microcodeVersion>61700243</microcodeVersion>
+  <package>v7.0.0-rc2</package>
+  <arch>aarch64</arch>
[...]
diff --git a/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch6=
4-latest.args b/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aar=
ch64-latest.args
index d8598d8f5b..c17bcad5cf 100644
--- a/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-lates=
t.args
+++ b/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-lates=
t.args
@@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \
 -no-shutdown \
 -no-acpi \
 -boot strict=3Don \
--device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif=
unction=3Don,addr=3D0x1 \
--device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=
=3D0x1.0x1 \
+-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus=
":"pcie.0","multifunction":true,"addr":"0x1"}' \
+-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus=
":"pcie.0","addr":"0x1.0x1"}' \
 -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow=
2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}=
' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco=
w2","file":"libvirt-1-storage"}' \
--device virtio-blk-pci,bus=3Dpci.1,addr=3D0x0,drive=3Dlibvirt-1-format,id=
=3Dvirtio-disk0,bootindex=3D1 \
+-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x0","drive":"li=
bvirt-1-format","id":"virtio-disk0","bootindex":1}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch6=
4-latest.args b/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aar=
ch64-latest.args
index 6a2908bb34..12d80b1f02 100644
--- a/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-lates=
t.args
+++ b/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-lates=
t.args
@@ -27,11 +27,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \
 -no-shutdown \
 -no-acpi \
 -boot strict=3Don \
--device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif=
unction=3Don,addr=3D0x1 \
--device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=
=3D0x1.0x1 \
+-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus=
":"pcie.0","multifunction":true,"addr":"0x1"}' \
+-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus=
":"pcie.0","addr":"0x1.0x1"}' \
 -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow=
2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}=
' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco=
w2","file":"libvirt-1-storage"}' \
--device virtio-blk-pci,bus=3Dpci.1,addr=3D0x0,drive=3Dlibvirt-1-format,id=
=3Dvirtio-disk0,bootindex=3D1 \
+-device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x0","drive":"li=
bvirt-1-format","id":"virtio-disk0","bootindex":1}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args b/tests=
/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args
index f176bc4c20..3125460a95 100644
--- a/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args
@@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-aarch64test/.config \
 -boot strict=3Don \
 -chardev socket,id=3Dchrtpm,path=3D/dev/test \
 -tpmdev emulator,id=3Dtpm-tpm0,chardev=3Dchrtpm \
--device tpm-tis-device,tpmdev=3Dtpm-tpm0,id=3Dtpm0 \
+-device '{"driver":"tpm-tis-device","tpmdev":"tpm-tpm0","id":"tpm0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.ar=
gs b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args
index 6604d1e5bd..4d670b6663 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args
@@ -29,32 +29,32 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \
 -rtc base=3Dutc \
 -no-shutdown \
 -boot strict=3Don \
--device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif=
unction=3Don,addr=3D0x1 \
--device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=
=3D0x1.0x1 \
--device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=
=3D0x1.0x2 \
--device pcie-root-port,port=3D11,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr=
=3D0x1.0x3 \
--device pcie-root-port,port=3D12,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr=
=3D0x1.0x4 \
--device pcie-root-port,port=3D13,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr=
=3D0x1.0x5 \
--device pcie-root-port,port=3D14,chassis=3D7,id=3Dpci.7,bus=3Dpcie.0,addr=
=3D0x1.0x6 \
--device pcie-root-port,port=3D15,chassis=3D8,id=3Dpci.8,bus=3Dpcie.0,addr=
=3D0x1.0x7 \
--device qemu-xhci,p2=3D15,p3=3D15,id=3Dusb,bus=3Dpci.2,addr=3D0x0 \
--device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.3,addr=3D0x0 \
+-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus=
":"pcie.0","multifunction":true,"addr":"0x1"}' \
+-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus=
":"pcie.0","addr":"0x1.0x1"}' \
+-device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu=
s":"pcie.0","addr":"0x1.0x2"}' \
+-device '{"driver":"pcie-root-port","port":11,"chassis":4,"id":"pci.4","bu=
s":"pcie.0","addr":"0x1.0x3"}' \
+-device '{"driver":"pcie-root-port","port":12,"chassis":5,"id":"pci.5","bu=
s":"pcie.0","addr":"0x1.0x4"}' \
+-device '{"driver":"pcie-root-port","port":13,"chassis":6,"id":"pci.6","bu=
s":"pcie.0","addr":"0x1.0x5"}' \
+-device '{"driver":"pcie-root-port","port":14,"chassis":7,"id":"pci.7","bu=
s":"pcie.0","addr":"0x1.0x6"}' \
+-device '{"driver":"pcie-root-port","port":15,"chassis":8,"id":"pci.8","bu=
s":"pcie.0","addr":"0x1.0x7"}' \
+-device '{"driver":"qemu-xhci","p2":15,"p3":15,"id":"usb","bus":"pci.2","a=
ddr":"0x0"}' \
+-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.3"=
,"addr":"0x0"}' \
 -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow=
2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}=
' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco=
w2","file":"libvirt-1-storage"}' \
--device virtio-blk-pci,bus=3Dpci.4,addr=3D0x0,drive=3Dlibvirt-1-format,id=
=3Dvirtio-disk0,bootindex=3D1 \
+-device '{"driver":"virtio-blk-pci","bus":"pci.4","addr":"0x0","drive":"li=
bvirt-1-format","id":"virtio-disk0","bootindex":1}' \
 -netdev user,id=3Dhostnet0 \
--device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:53:45:a5=
,bus=3Dpci.1,addr=3D0x0 \
+-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":=
"52:54:00:53:45:a5","bus":"pci.1","addr":"0x0"}' \
 -chardev pty,id=3Dcharserial0 \
 -serial chardev:charserial0 \
 -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \
--device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel=
0,id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \
--device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1 \
--device usb-kbd,id=3Dinput1,bus=3Dusb.0,port=3D2 \
+-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard=
ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \
+-device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \
+-device '{"driver":"usb-kbd","id":"input1","bus":"usb.0","port":"2"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -vnc 127.0.0.1:0,audiodev=3Daudio1 \
--device virtio-gpu-pci,id=3Dvideo0,max_outputs=3D1,bus=3Dpci.7,addr=3D0x0 \
--device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.5,addr=3D0x0 \
+-device '{"driver":"virtio-gpu-pci","id":"video0","max_outputs":1,"bus":"p=
ci.7","addr":"0x0"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.5","add=
r":"0x0"}' \
 -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"=
}' \
--device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.6,addr=3D0x0 \
+-device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci=
.6","addr":"0x0"}' \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.ar=
gs b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args
index 0f78840cb3..37e3fdeeeb 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args
@@ -30,27 +30,27 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \
 -rtc base=3Dutc \
 -no-shutdown \
 -boot strict=3Don \
--device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif=
unction=3Don,addr=3D0x1 \
--device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=
=3D0x1.0x1 \
--device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=
=3D0x1.0x2 \
--device pcie-root-port,port=3D11,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr=
=3D0x1.0x3 \
--device pcie-root-port,port=3D12,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr=
=3D0x1.0x4 \
--device pcie-root-port,port=3D13,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr=
=3D0x1.0x5 \
--device pcie-root-port,port=3D14,chassis=3D7,id=3Dpci.7,bus=3Dpcie.0,addr=
=3D0x1.0x6 \
--device qemu-xhci,p2=3D15,p3=3D15,id=3Dusb,bus=3Dpci.2,addr=3D0x0 \
--device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.3,addr=3D0x0 \
+-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus=
":"pcie.0","multifunction":true,"addr":"0x1"}' \
+-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus=
":"pcie.0","addr":"0x1.0x1"}' \
+-device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu=
s":"pcie.0","addr":"0x1.0x2"}' \
+-device '{"driver":"pcie-root-port","port":11,"chassis":4,"id":"pci.4","bu=
s":"pcie.0","addr":"0x1.0x3"}' \
+-device '{"driver":"pcie-root-port","port":12,"chassis":5,"id":"pci.5","bu=
s":"pcie.0","addr":"0x1.0x4"}' \
+-device '{"driver":"pcie-root-port","port":13,"chassis":6,"id":"pci.6","bu=
s":"pcie.0","addr":"0x1.0x5"}' \
+-device '{"driver":"pcie-root-port","port":14,"chassis":7,"id":"pci.7","bu=
s":"pcie.0","addr":"0x1.0x6"}' \
+-device '{"driver":"qemu-xhci","p2":15,"p3":15,"id":"usb","bus":"pci.2","a=
ddr":"0x0"}' \
+-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.3"=
,"addr":"0x0"}' \
 -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow=
2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}=
' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco=
w2","file":"libvirt-1-storage"}' \
--device virtio-blk-pci,bus=3Dpci.4,addr=3D0x0,drive=3Dlibvirt-1-format,id=
=3Dvirtio-disk0,bootindex=3D1 \
+-device '{"driver":"virtio-blk-pci","bus":"pci.4","addr":"0x0","drive":"li=
bvirt-1-format","id":"virtio-disk0","bootindex":1}' \
 -netdev user,id=3Dhostnet0 \
--device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37=
,bus=3Dpci.1,addr=3D0x0 \
+-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":=
"52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \
 -chardev pty,id=3Dcharserial0 \
 -serial chardev:charserial0 \
 -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \
--device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel=
0,id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \
+-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard=
ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.5,addr=3D0x0 \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.5","add=
r":"0x0"}' \
 -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"=
}' \
--device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.6,addr=3D0x0 \
+-device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci=
.6","addr":"0x0"}' \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-late=
st.args b/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.=
args
index 567bbeb4d8..e13a2be3f0 100644
--- a/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args
@@ -25,10 +25,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-default-video-type=
-a/.config \
 -no-shutdown \
 -no-acpi \
 -boot strict=3Don \
--device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif=
unction=3Don,addr=3D0x1 \
--device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=
=3D0x1.0x1 \
+-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus=
":"pcie.0","multifunction":true,"addr":"0x1"}' \
+-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus=
":"pcie.0","addr":"0x1.0x1"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -vnc 127.0.0.1:0,audiodev=3Daudio1 \
--device virtio-gpu-pci,id=3Dvideo0,max_outputs=3D1,bus=3Dpci.1,addr=3D0x0 \
+-device '{"driver":"virtio-gpu-pci","id":"video0","max_outputs":1,"bus":"p=
ci.1","addr":"0x0"}' \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args =
b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args
index c4c7dd7b55..c51be77654 100644
--- a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args
@@ -35,7 +35,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-armtest/.config \
 -drive file=3D/arm-sd.qcow2,format=3Dqcow2,if=3Dsd,index=3D0 \
 -blockdev '{"driver":"file","filename":"/arm-virtio.qcow2","node-name":"li=
bvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco=
w2","file":"libvirt-1-storage"}' \
--device virtio-blk-device,drive=3Dlibvirt-1-format,id=3Dvirtio-disk0 \
+-device '{"driver":"virtio-blk-device","drive":"libvirt-1-format","id":"vi=
rtio-disk0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/pcie-expander-bus-aarch64.aarch64-lates=
t.args b/tests/qemuxml2argvdata/pcie-expander-bus-aarch64.aarch64-latest.ar=
gs
index 587d875384..4f4d5f9a08 100644
--- a/tests/qemuxml2argvdata/pcie-expander-bus-aarch64.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/pcie-expander-bus-aarch64.aarch64-latest.args
@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-pcie-expander-bus-te=
/.config \
 -no-shutdown \
 -no-acpi \
 -boot strict=3Don \
--device pxb-pcie,bus_nr=3D254,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1 \
+-device '{"driver":"pxb-pcie","bus_nr":254,"id":"pci.1","bus":"pcie.0","ad=
dr":"0x1"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
--=20
2.35.1