From nobody Mon Feb 9 09:08:40 2026 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=1677853782; cv=none; d=zohomail.com; s=zohoarc; b=RhnINB/mgOVvBC+1xBvzVJ6rhSNiYm3liyhxuzZ/4DEdkS8VMOM9CCgkB2Ev3QshFbW/QAaNOudwyQZFqrE6l2rJOn4SQQq/hjp83PQQjTEkuPzxQJBMxNqHdk/V/nB/et0E4+S3PdCAO87JWLDIMlqpyLDon4n33J99veEKGnA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677853782; 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=YxLf5/GXBisb8uXvsHhGLoUoIXsvqWP5gssvaqic784=; b=Ynukzpu2K2OmZQSBr2x1nvwCYWZRl5LNj95UeARYCtPB0F4M+6T0lTWA9OphROBmkfUVVcmpX+aIiiYSAASOTY7YHnhWQDyrH/4KQF5s5+5bQnCO0akz1dFomMYdM3/1Xtub/n02lQ5tcwl5isujTBBghp5TyS5MRskzNKXUl7Y= 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= (p=none dis=none) Return-Path: 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 1677853782988154.47397290768833; Fri, 3 Mar 2023 06:29:42 -0800 (PST) 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-596-r2xxPBYpMn6SYRqwuYijpg-1; Fri, 03 Mar 2023 09:29:38 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3013987A9F4; Fri, 3 Mar 2023 14:29:29 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1C5001121319; Fri, 3 Mar 2023 14:29:29 +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 84240194A294; Fri, 3 Mar 2023 14:28:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C71FA19420B5 for ; Fri, 3 Mar 2023 14:28:35 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C27804051E56; Fri, 3 Mar 2023 14:28:35 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4B6F14051E4B for ; Fri, 3 Mar 2023 14:28:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677853781; 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=YxLf5/GXBisb8uXvsHhGLoUoIXsvqWP5gssvaqic784=; b=GMJQlEKP72E1+A8QwioMPvkuh+kMWpt0bHh6k19sEDJVMtDJJbktvFfYtNgW/seD4niN2s 0jRD1hLtX3qCVEL+6ca4pT1VBgbPmPXHoSl0aId5xbPQbE+LNUgCbMOkrAwaSZbg70+cvO o7K85BLygIFSLhbp70PuKBaKq9vCsgU= X-MC-Unique: r2xxPBYpMn6SYRqwuYijpg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 26/31] qemuxml2argvdata: Convert test cases for 'ppc' architecture to latest caps Date: Fri, 3 Mar 2023 15:28:00 +0100 Message-Id: <13a13f0ec6aa76731c7521ca45576b644725c6cd.1677853487.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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: 1677853784984100001 Content-Type: text/plain; charset="utf-8" Convert the 'ppc-dtb' and 'ppce500-serial' to use real capabilities albeit captured from a non-native machine. Thus the XML needs to be converted to use virt type 'qemu'. Signed-off-by: Peter Krempa --- .../{ppc-dtb.args =3D> ppc-dtb.ppc-latest.args} | 12 +++++++----- tests/qemuxml2argvdata/ppc-dtb.xml | 2 +- ...00-serial.args =3D> ppce500-serial.ppc-latest.args} | 12 +++++++----- tests/qemuxml2argvdata/ppce500-serial.xml | 2 +- tests/qemuxml2argvtest.c | 6 ++---- 5 files changed, 18 insertions(+), 16 deletions(-) rename tests/qemuxml2argvdata/{ppc-dtb.args =3D> ppc-dtb.ppc-latest.args} = (62%) rename tests/qemuxml2argvdata/{ppce500-serial.args =3D> ppce500-serial.ppc= -latest.args} (62%) diff --git a/tests/qemuxml2argvdata/ppc-dtb.args b/tests/qemuxml2argvdata/p= pc-dtb.ppc-latest.args similarity index 62% rename from tests/qemuxml2argvdata/ppc-dtb.args rename to tests/qemuxml2argvdata/ppc-dtb.ppc-latest.args index 951edcda6b..1cf06ffbac 100644 --- a/tests/qemuxml2argvdata/ppc-dtb.args +++ b/tests/qemuxml2argvdata/ppc-dtb.ppc-latest.args @@ -9,10 +9,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-ppc \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine ppce500,usb=3Doff,dump-guest-core=3Doff \ --accel kvm \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine ppce500,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dmpc8544d= s.ram \ +-accel tcg \ -m 256 \ +-object '{"qom-type":"memory-backend-ram","id":"mpc8544ds.ram","size":2684= 35456}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 49545eb3-75e1-2d0a-acdd-f0294406c99e \ @@ -28,9 +29,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -initrd /media/ram/ramdisk \ -append 'root=3D/dev/ram rw console=3DttyS0,115200' \ -dtb /media/ram/test.dtb \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1"}= ' \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/ppc-dtb.xml b/tests/qemuxml2argvdata/pp= c-dtb.xml index 04f0eb6624..37b9b280e7 100644 --- a/tests/qemuxml2argvdata/ppc-dtb.xml +++ b/tests/qemuxml2argvdata/ppc-dtb.xml @@ -1,4 +1,4 @@ - + QEMUGuest1 49545eb3-75e1-2d0a-acdd-f0294406c99e 262144 diff --git a/tests/qemuxml2argvdata/ppce500-serial.args b/tests/qemuxml2arg= vdata/ppce500-serial.ppc-latest.args similarity index 62% rename from tests/qemuxml2argvdata/ppce500-serial.args rename to tests/qemuxml2argvdata/ppce500-serial.ppc-latest.args index 1698f50498..1c1a387f62 100644 --- a/tests/qemuxml2argvdata/ppce500-serial.args +++ b/tests/qemuxml2argvdata/ppce500-serial.ppc-latest.args @@ -9,10 +9,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-ppc \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine ppce500,usb=3Doff,dump-guest-core=3Doff \ --accel kvm \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine ppce500,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dmpc8544d= s.ram \ +-accel tcg \ -m 256 \ +-object '{"qom-type":"memory-backend-ram","id":"mpc8544ds.ram","size":2684= 35456}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -27,9 +28,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -kernel /media/ram/uImage \ -initrd /media/ram/ramdisk \ -append 'root=3D/dev/ram rw console=3DttyS0,115200' \ --usb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1"}= ' \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/ppce500-serial.xml b/tests/qemuxml2argv= data/ppce500-serial.xml index 4e656d5ffe..20a3b1e7a8 100644 --- a/tests/qemuxml2argvdata/ppce500-serial.xml +++ b/tests/qemuxml2argvdata/ppce500-serial.xml @@ -1,4 +1,4 @@ - + QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 262144 diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index db846c1ea4..e515c2c0df 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2222,10 +2222,8 @@ mymain(void) DO_TEST("s390-serial-console", QEMU_CAPS_DEVICE_SCLPCONSOLE); - DO_TEST("ppc-dtb", - QEMU_CAPS_KVM); - DO_TEST("ppce500-serial", - QEMU_CAPS_KVM); + DO_TEST_CAPS_ARCH_LATEST("ppc-dtb", "ppc"); + DO_TEST_CAPS_ARCH_LATEST("ppce500-serial", "ppc"); DO_TEST_CAPS_LATEST("tpm-passthrough"); DO_TEST_CAPS_LATEST("tpm-passthrough-crb"); --=20 2.39.2