From nobody Wed Mar 12 17:23:04 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1740667921238918.9894400909675; Thu, 27 Feb 2025 06:52:01 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 3C13F163B; Thu, 27 Feb 2025 09:52:00 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 3910617F5; Thu, 27 Feb 2025 09:50:53 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 486AE1470; Thu, 27 Feb 2025 09:50:47 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 66FEE161F for ; Thu, 27 Feb 2025 09:50:46 -0500 (EST) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-401-6IGS_HJWPheBL4ATK-A6Lw-1; Thu, 27 Feb 2025 09:50:44 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DCAB71800987 for ; Thu, 27 Feb 2025 14:50:43 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.44.33.63]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E8E841944F12 for ; Thu, 27 Feb 2025 14:50:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740667846; h=from:from: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; bh=Afw2VdDGDJOTutGhmObq5LlJ1xU8VwAQ0Sc1u4DrfKw=; b=P7Qcxjr8JzjMiW6kvA6yHl0TSEFMvxzetyj3k9N2OTYD6zuErhiBc+fAJv2zY8Zyc7YaGB 39Eu0rXu8BSCv7sBzOJrQuPx2RrjVx/4gpdQZOaz2Ddhmb6b8O7195MpFMSRQVPuDUqR3D IoKO/cYnErxRCfxZuKk+evKGg2sDXa4= X-MC-Unique: 6IGS_HJWPheBL4ATK-A6Lw-1 X-Mimecast-MFC-AGG-ID: 6IGS_HJWPheBL4ATK-A6Lw_1740667844 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH 1/2] tests: Use collie instead of borzoi for aarch64 tests Date: Thu, 27 Feb 2025 15:50:37 +0100 Message-ID: <20250227145038.581710-2-abologna@redhat.com> In-Reply-To: <20250227145038.581710-1-abologna@redhat.com> References: <20250227145038.581710-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: pXDaM3QZ-uqRodmxs4wNGeZIdUtx0dlnI4yWas3nlY8_1740667844 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 2PIQSKIV3E3B2W6YZQ3O5RHEK235OTBK X-Message-ID-Hash: 2PIQSKIV3E3B2W6YZQ3O5RHEK235OTBK X-MailFrom: abologna@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1740667924144019100 Content-Type: text/plain; charset="utf-8"; x-default="true" The borzoi machine type was dropped in QEMU 9.2.0, so let's use a different machine type with no ACPI support and no implicit USB controller instead. Signed-off-by: Andrea Bolognani --- tests/qemuxmlconfdata/aarch64-noacpi-acpi.aarch64-latest.err | 2 +- tests/qemuxmlconfdata/aarch64-noacpi-acpi.xml | 2 +- .../aarch64-nousb-minimal.aarch64-latest.abi-update.args | 3 ++- .../aarch64-nousb-minimal.aarch64-latest.abi-update.xml | 2 +- .../qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.args | 3 ++- tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.xml | 2 +- tests/qemuxmlconfdata/aarch64-nousb-minimal.xml | 2 +- .../usb-controller-default-fallback-nousb.aarch64-latest.args | 3 ++- .../usb-controller-default-fallback-nousb.aarch64-latest.xml | 2 +- .../usb-controller-default-nousb.aarch64-latest.args | 3 ++- .../usb-controller-default-nousb.aarch64-latest.xml | 2 +- tests/qemuxmlconfdata/usb-controller-default-nousb.xml | 2 +- ...sb-controller-default-unavailable-nousb.aarch64-latest.args | 3 ++- ...usb-controller-default-unavailable-nousb.aarch64-latest.xml | 2 +- tests/qemuxmlconftest.c | 2 +- 15 files changed, 20 insertions(+), 15 deletions(-) diff --git a/tests/qemuxmlconfdata/aarch64-noacpi-acpi.aarch64-latest.err b= /tests/qemuxmlconfdata/aarch64-noacpi-acpi.aarch64-latest.err index 5f379d56ce..d10bbb1b3e 100644 --- a/tests/qemuxmlconfdata/aarch64-noacpi-acpi.aarch64-latest.err +++ b/tests/qemuxmlconfdata/aarch64-noacpi-acpi.aarch64-latest.err @@ -1 +1 @@ -unsupported configuration: machine type 'borzoi' does not support ACPI +unsupported configuration: machine type 'collie' does not support ACPI diff --git a/tests/qemuxmlconfdata/aarch64-noacpi-acpi.xml b/tests/qemuxmlc= onfdata/aarch64-noacpi-acpi.xml index 10dbeabd6d..7b5528d612 100644 --- a/tests/qemuxmlconfdata/aarch64-noacpi-acpi.xml +++ b/tests/qemuxmlconfdata/aarch64-noacpi-acpi.xml @@ -5,7 +5,7 @@ 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi= -update.args b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.a= bi-update.args index a3d0f7a4fc..9a1c6fd276 100644 --- a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update= .args +++ b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update= .args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch= 64test/.config \ -name guest=3Daarch64test,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ --machine borzoi,usb=3Doff,dump-guest-core=3Doff \ +-machine collie,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dstrongarm= .sdram \ -accel kvm \ -cpu host \ -m size=3D1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"strongarm.sdram","size":10= 73741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ diff --git a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi= -update.xml b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.ab= i-update.xml index 9bf4af4f74..e3f04fbbff 100644 --- a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update= .xml +++ b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update= .xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.arg= s b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.args index a3d0f7a4fc..9a1c6fd276 100644 --- a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch= 64test/.config \ -name guest=3Daarch64test,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ --machine borzoi,usb=3Doff,dump-guest-core=3Doff \ +-machine collie,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dstrongarm= .sdram \ -accel kvm \ -cpu host \ -m size=3D1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"strongarm.sdram","size":10= 73741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ diff --git a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.xml= b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.xml index 9bf4af4f74..e3f04fbbff 100644 --- a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/aarch64-nousb-minimal.xml b/tests/qemuxm= lconfdata/aarch64-nousb-minimal.xml index 64cd74e365..6505122cb8 100644 --- a/tests/qemuxmlconfdata/aarch64-nousb-minimal.xml +++ b/tests/qemuxmlconfdata/aarch64-nousb-minimal.xml @@ -5,7 +5,7 @@ 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aa= rch64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-fallback-n= ousb.aarch64-latest.args index 6cfa04a0f4..0fb2909dd2 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aarch64-l= atest.args +++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aarch64-l= atest.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch= 64test/.config \ -name guest=3Daarch64test,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ --machine borzoi,usb=3Doff,dump-guest-core=3Doff \ +-machine collie,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dstrongarm= .sdram \ -accel kvm \ -cpu host \ -m size=3D1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"strongarm.sdram","size":10= 73741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aa= rch64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-fallback-no= usb.aarch64-latest.xml index 2f71d294a7..a01dd15168 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aarch64-l= atest.xml +++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aarch64-l= atest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-lat= est.args b/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-lates= t.args index 6cfa04a0f4..0fb2909dd2 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-latest.args +++ b/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-latest.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch= 64test/.config \ -name guest=3Daarch64test,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ --machine borzoi,usb=3Doff,dump-guest-core=3Doff \ +-machine collie,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dstrongarm= .sdram \ -accel kvm \ -cpu host \ -m size=3D1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"strongarm.sdram","size":10= 73741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ diff --git a/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-lat= est.xml b/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-latest= .xml index 2f71d294a7..a01dd15168 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/usb-controller-default-nousb.xml b/tests= /qemuxmlconfdata/usb-controller-default-nousb.xml index c8bd07ad5d..83a405800f 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-nousb.xml +++ b/tests/qemuxmlconfdata/usb-controller-default-nousb.xml @@ -5,7 +5,7 @@ 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb= .aarch64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-unavail= able-nousb.aarch64-latest.args index 6cfa04a0f4..0fb2909dd2 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.aarch6= 4-latest.args +++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.aarch6= 4-latest.args @@ -10,10 +10,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch= 64test/.config \ -name guest=3Daarch64test,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ --machine borzoi,usb=3Doff,dump-guest-core=3Doff \ +-machine collie,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dstrongarm= .sdram \ -accel kvm \ -cpu host \ -m size=3D1048576k \ +-object '{"qom-type":"memory-backend-ram","id":"strongarm.sdram","size":10= 73741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb= .aarch64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-unavaila= ble-nousb.aarch64-latest.xml index 2f71d294a7..a01dd15168 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.aarch6= 4-latest.xml +++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.aarch6= 4-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 8632434760..c18a7fa911 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -1765,7 +1765,7 @@ mymain(void) * - firmware-manual-efi-acpi-aarch64 * - firmware-auto-efi-loongarch64 * - * - negative case for aarch64 with 'borzoi' machine not supporting A= CPI + * - negative case for aarch64 with 'collie' machine not supporting A= CPI * * - s390x has hack to strip ACPI to preserve migration of old config= s, * but should produce error when ABI_UPDATE is requested --=20 2.48.1