From nobody Mon Feb 9 04:08:19 2026 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=1680261995; cv=none; d=zohomail.com; s=zohoarc; b=iLDDfZndoJKRRmZRiobeqqZ6W80QZkbbz3hY4UYGGiW/g/IgIYMsky8V5RdqEr1uJtF97wsM17Idjo/zH8yRvTx2O3XuNUB3w5rqSN67ZmaXd3SaLG8Vm4A35Rnq5extxpYIf6ju+muLeEx0lsp2xy5YNTZ6/cPG643+m2TFyRM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680261995; 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=26uREs26dZwShBnzWA5G4D+4emYD9s4r7UXzTqma+HI=; b=H3ymSLl1kUxdFaiwXv1igFzfUFwEmeAhZ6iwSfPdRCE4xbEKq1aHNMqtoeD5cphwINu/6BsW3zgt9023PyXg+ywd0g4dUUOeHE55VAulG9h4FBuuwuzFGSTrhh+hKMqqB598ldoP4NEkpZL3QdYDY7X0Fdo1qT2+JWg7KiS2ysU= 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= (p=none dis=none) Return-Path: 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 1680261995063669.0579161136363; Fri, 31 Mar 2023 04:26:35 -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-625-nnxoCK2YMNiUjnkUG5BZXg-1; Fri, 31 Mar 2023 07:26:27 -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 CBAB2855304; Fri, 31 Mar 2023 11:26:23 +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 B96A44020C82; Fri, 31 Mar 2023 11:26:23 +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 8FF0519466DF; Fri, 31 Mar 2023 11:26:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4881E19465BD for ; Fri, 31 Mar 2023 11:26:22 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3D1C11121315; Fri, 31 Mar 2023 11:26:22 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id A5BC41121314 for ; Fri, 31 Mar 2023 11:26:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680261991; 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=26uREs26dZwShBnzWA5G4D+4emYD9s4r7UXzTqma+HI=; b=MlOJCCurpw1F1199rNoXahvm5aEIn7Hevb4Z7xuR3INj9pWSm2M+ITwoxsIZkB//8B8LKd FAly9CsAV08VPgGXWfBPAo0t4DLmVU2HbLEEy4zNrG8uWc9ExTb0oUUWPP+f8f5dBsr2oY CpeikATDPETkB6V7HbhiEH0W6mmfkzY= X-MC-Unique: nnxoCK2YMNiUjnkUG5BZXg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 05/21] qemuxml2argvtest: Convert the rest of GIC tests to latest capabilities Date: Fri, 31 Mar 2023 13:25:59 +0200 Message-Id: <94777778f2939f0e08b2db829094db210a5f0604.1680260939.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.2 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: 1680261996196100005 Content-Type: text/plain; charset="utf-8" Convert the two negative cases to use real capapbilities as well as the positive case for situations when KVM is not used by stripping the QEMU_CAPS_KVM flag. Signed-off-by: Peter Krempa --- ...err =3D> aarch64-gic-invalid.aarch64-latest.err} | 0 tests/qemuxml2argvdata/aarch64-gic-none-tcg.args | 6 ++++-- ...rr =3D> aarch64-gic-not-virt.aarch64-latest.err} | 0 tests/qemuxml2argvtest.c | 15 ++++++++------- 4 files changed, 12 insertions(+), 9 deletions(-) rename tests/qemuxml2argvdata/{aarch64-gic-invalid.err =3D> aarch64-gic-in= valid.aarch64-latest.err} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-not-virt.err =3D> aarch64-gic-n= ot-virt.aarch64-latest.err} (100%) diff --git a/tests/qemuxml2argvdata/aarch64-gic-invalid.err b/tests/qemuxml= 2argvdata/aarch64-gic-invalid.aarch64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-invalid.err rename to tests/qemuxml2argvdata/aarch64-gic-invalid.aarch64-latest.err diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args b/tests/qemux= ml2argvdata/aarch64-gic-none-tcg.args index 16a02b74bd..029ef5230d 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args +++ b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args @@ -9,11 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ /usr/bin/qemu-system-aarch64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-guest/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a57 \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ @@ -27,4 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -no-acpi \ -boot strict=3Don \ -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-gic-not-virt.err b/tests/qemuxm= l2argvdata/aarch64-gic-not-virt.aarch64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-not-virt.err rename to tests/qemuxml2argvdata/aarch64-gic-not-virt.aarch64-latest.err diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 2498469dc9..61e5a93fdc 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2406,8 +2406,12 @@ mymain(void) DO_TEST_GIC("aarch64-gic-none-v2", GIC_V2); DO_TEST_GIC("aarch64-gic-none-v3", GIC_V3); DO_TEST_GIC("aarch64-gic-none-both", GIC_BOTH); - qemuTestSetHostArch(&driver, VIR_ARCH_AARCH64); - DO_TEST_FULL("aarch64-gic-none-tcg", "", ARG_GIC, GIC_BOTH, ARG_END); + DO_TEST_FULL("aarch64-gic-none-tcg", "", + ARG_GIC, GIC_BOTH, + ARG_CAPS_ARCH, "aarch64", + ARG_CAPS_VER, "latest", + ARG_QEMU_CAPS_DEL, QEMU_CAPS_KVM, QEMU_CAPS_LAST, + ARG_END); DO_TEST_FULL("aarch64-gic-default", ".aarch64-4.2.0", ARG_GIC, GIC_NONE, ARG_CAPS_ARCH, "aarch64", @@ -2433,11 +2437,8 @@ mymain(void) DO_TEST_GIC("aarch64-gic-host", GIC_V2); DO_TEST_GIC("aarch64-gic-host", GIC_V3); DO_TEST_GIC("aarch64-gic-host", GIC_BOTH); - qemuTestSetHostArch(&driver, VIR_ARCH_AARCH64); - DO_TEST_PARSE_ERROR("aarch64-gic-invalid", - QEMU_CAPS_KVM); - DO_TEST_PARSE_ERROR("aarch64-gic-not-virt", - QEMU_CAPS_KVM); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("aarch64-gic-invalid", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("aarch64-gic-not-virt", "aarch64"= ); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("aarch64-gic-not-arm", "ppc64"); DO_TEST_CAPS_ARCH_LATEST("aarch64-kvm-32-on-64", "aarch64"); DO_TEST("aarch64-pci-serial", --=20 2.39.2