From nobody Mon Feb 9 03:48:25 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=1641462371; cv=none; d=zohomail.com; s=zohoarc; b=GVZuLzdUfl6fOcenkowvMH+LHSqp6L+xTNli7KGM0OBk94N0mmjux/GHo+ujfwp3zibVj889PY5XnjpXsq8NmrwUHVNivAV8EeZU4Y5CSV3BCPaO48PDhTtmQwkssCE65IBFsCGVY41vJTFXxN2F0Om2TMPqedrzaVGnXZNObKY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641462371; 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=CgUhEWenUDgQ4zZNgk/obz34IdTtY4SpHx6KpXdN87c=; b=OmYJdKzbbPFXNTtlTTkFZ3dTJLFT13KcIL6oOwQ9aovlebSGEtQ3lRinQnROVT277nXyovomF/EeSArI2fJmIM+80YLTPYVOjlheZs0SS4ewggG80JCDR1IXVDK4AzCe3Bok6wqQJjCuqZr3J6KoAWHgAwnoB/ZB99/GycU2d/Q= 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 1641462371855383.18272407658355; Thu, 6 Jan 2022 01:46:11 -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-104-Gidg6xbaPX-GHGoZfzZKcQ-1; Thu, 06 Jan 2022 04:46:09 -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 A39D9100CCD7; Thu, 6 Jan 2022 09:46:04 +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 7CFF681F5B; Thu, 6 Jan 2022 09:46:04 +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 490184A7CB; Thu, 6 Jan 2022 09:46:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 2069k1Mx005768 for ; Thu, 6 Jan 2022 04:46:01 -0500 Received: by smtp.corp.redhat.com (Postfix) id 28F467CAD2; Thu, 6 Jan 2022 09:46:01 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 73D877D474 for ; Thu, 6 Jan 2022 09:46:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641462370; 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=CgUhEWenUDgQ4zZNgk/obz34IdTtY4SpHx6KpXdN87c=; b=L2Rg+5+e3JbgK/3Ww2tSwRk0zSlTejwfx9dNgXWvP21MiGNg7l/n+umDq0tSxCcelsoryt eKpnMx/kt/0k/TitZE8cOmlIsd7Qzxys8xtUC8QQrbpC2QiZIhNErx6ykyDOtc8cHVsbEo +bUOMhnxuzta/3XVDejeA5XA8agkEAc= X-MC-Unique: Gidg6xbaPX-GHGoZfzZKcQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 15/21] qemuxml2argvdata: Use proper arch and emulator for aarch64 real capability tests Date: Thu, 6 Jan 2022 10:44:14 +0100 Message-Id: <311106a221fde0ce5e756b8a8c30e8282686cc2b.1641461748.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: 1641462372266100003 Content-Type: text/plain; charset="utf-8" Upcoming patches will modify how we populate the capability cache in tests to be more sane. This also means that the emulator binary and architecture used in the test files using real capabilities must match what the real capabilities have. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args | 3 ++- .../qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args | 3 ++- tests/qemuxml2argvdata/disk-arm-virtio-sd.xml | 5 ++--- .../qemuxml2xmloutdata/disk-arm-virtio-sd.aarch64-latest.xml | 5 ++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args b= /tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args index afce523c1b..8049306445 100644 --- a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args +++ b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args @@ -7,7 +7,7 @@ XDG_DATA_HOME=3D/tmp/lib/domain--1-armtest/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-armtest/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-armtest/.config \ QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-arm \ +/usr/bin/qemu-system-aarch64 \ -name guest=3Darmtest,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-armt= est/master-key.aes \ @@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=3Dnone \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ +-no-acpi \ -boot strict=3Don \ -kernel /arm.kernel \ -initrd /arm.initrd \ diff --git a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args = b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args index 3acd6491e4..c51be77654 100644 --- a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args +++ b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args @@ -6,7 +6,7 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-armtest/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-armtest/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-armtest/.config \ -/usr/bin/qemu-system-arm \ +/usr/bin/qemu-system-aarch64 \ -name guest=3Darmtest,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-armtest/master-key.aes"}' \ @@ -25,6 +25,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-armtest/.config \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ +-no-acpi \ -boot strict=3Don \ -kernel /arm.kernel \ -initrd /arm.initrd \ diff --git a/tests/qemuxml2argvdata/disk-arm-virtio-sd.xml b/tests/qemuxml2= argvdata/disk-arm-virtio-sd.xml index 0a6482fd4a..45a2192d48 100644 --- a/tests/qemuxml2argvdata/disk-arm-virtio-sd.xml +++ b/tests/qemuxml2argvdata/disk-arm-virtio-sd.xml @@ -5,14 +5,13 @@ 1048576 1 - hvm + hvm /arm.kernel /arm.initrd /arm.dtb console=3DttyAMA0,115200n8 rw root=3D/dev/vda3 rootwait physm= ap.enabled=3D0 - @@ -21,7 +20,7 @@ restart restart - /usr/bin/qemu-system-arm + /usr/bin/qemu-system-aarch64 diff --git a/tests/qemuxml2xmloutdata/disk-arm-virtio-sd.aarch64-latest.xml= b/tests/qemuxml2xmloutdata/disk-arm-virtio-sd.aarch64-latest.xml index 7b07c8d3d7..962dc8f367 100644 --- a/tests/qemuxml2xmloutdata/disk-arm-virtio-sd.aarch64-latest.xml +++ b/tests/qemuxml2xmloutdata/disk-arm-virtio-sd.aarch64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm /arm.kernel /arm.initrd console=3DttyAMA0,115200n8 rw root=3D/dev/vda3 rootwait physm= ap.enabled=3D0 @@ -13,7 +13,6 @@ - @@ -25,7 +24,7 @@ restart restart - /usr/bin/qemu-system-arm + /usr/bin/qemu-system-aarch64 --=20 2.31.1