From nobody Sun Feb 8 17:47:03 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1629217580; cv=none; d=zohomail.com; s=zohoarc; b=g7QbmvEpBTgURHxfParGobTKxbOPfYKTI0H7vPuqZsy+csm4FjnurEDceAtTi0uBRmiSU4bTpQ8D3nOtU78NwGHq6oDfK43cSo+s8GzzmsMEHyDvaKOeKRijOr+760P8OJcIPT6ZEq70D0JZ1C49UM5LVUbm5O3fln55Vz4oiUg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629217580; 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=pPZdC0ZzZ+Kn8qraegLxUSTEAJso/yzuAKjgo1tP084=; b=n0Sk+/Qw0EPYdy7tjRDMrvMGJSx5ogwaqYcY+Qo32PiTokL/vijNW+RtWo53a+UW3rvrs+NnhpP3WDw1wpVYU/h/d07eppM9UotkpEN9QgQjg7PIZOMI6KgjhrZQe3VLvYOaNcivcDpp5aQtKQMuAfjHsGuDooAdSu/9i/Ss514= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1629217580279106.84522604421647; Tue, 17 Aug 2021 09:26:20 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-109-uEBhdw5kPlux409E-tBt5w-1; Tue, 17 Aug 2021 12:26:16 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8EB5A87D550; Tue, 17 Aug 2021 16:26:09 +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 4381468D9E; Tue, 17 Aug 2021 16:26:09 +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 0DF4A4A712; Tue, 17 Aug 2021 16:26:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17HGPkuY020342 for ; Tue, 17 Aug 2021 12:25:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7A2F8421F; Tue, 17 Aug 2021 16:25:46 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA0BF18B42 for ; Tue, 17 Aug 2021 16:25:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629217579; 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=pPZdC0ZzZ+Kn8qraegLxUSTEAJso/yzuAKjgo1tP084=; b=GeZAs6YUls1lhKdUv8G1F+1rjS+tTJBUDW5ZCxhApgrPZ8zbaBZ3Bx3/JcdKBGB0aXwJvK 19HGUzJERdVocc5KvV/IjZo/MsT8YV6ZjDd63V2Nz1ytKWTn6sxlfEa7wsDXCcMOt2oR1M r4q77ORT40OZjICb/zLJ+0ljbBU8P4s= X-MC-Unique: uEBhdw5kPlux409E-tBt5w-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 14/23] qemuxml2xmltest: Remove hack for qemuCaps allocation Date: Tue, 17 Aug 2021 18:25:15 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.16 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: 1629217580949100001 Content-Type: text/plain; charset="utf-8" Since qemuCaps are now always allocated we don't need to pass ARG_QEMU_CAPS, QEMU_CAPS_LAST to force the allocation. Signed-off-by: Peter Krempa --- tests/qemuxml2xmltest.c | 96 +++++++++++------------------------------ 1 file changed, 25 insertions(+), 71 deletions(-) diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 529a4b5485..ae73daea5c 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -617,14 +617,10 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("ppc64-tpmproxy-single", "ppc64"); DO_TEST_CAPS_ARCH_LATEST("ppc64-tpmproxy-with-tpm", "ppc64"); - DO_TEST_FULL("seclabel-dynamic-baselabel", "", WHEN_INACTIVE, - ARG_QEMU_CAPS, NONE, ARG_END); - DO_TEST_FULL("seclabel-dynamic-override", "", WHEN_INACTIVE, - ARG_QEMU_CAPS, NONE, ARG_END); - DO_TEST_FULL("seclabel-dynamic-labelskip", "", WHEN_INACTIVE, - ARG_QEMU_CAPS, NONE, ARG_END); - DO_TEST_FULL("seclabel-dynamic-relabel", "", WHEN_INACTIVE, - ARG_QEMU_CAPS, NONE, ARG_END); + DO_TEST_FULL("seclabel-dynamic-baselabel", "", WHEN_INACTIVE, ARG_END); + DO_TEST_FULL("seclabel-dynamic-override", "", WHEN_INACTIVE, ARG_END); + DO_TEST_FULL("seclabel-dynamic-labelskip", "", WHEN_INACTIVE, ARG_END); + DO_TEST_FULL("seclabel-dynamic-relabel", "", WHEN_INACTIVE, ARG_END); DO_TEST("seclabel-static", NONE); DO_TEST("seclabel-static-labelskip", NONE); DO_TEST("seclabel-none", NONE); @@ -1161,69 +1157,27 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_VNC); - DO_TEST_FULL("aarch64-gic-none", "", WHEN_BOTH, - ARG_GIC, GIC_NONE, - ARG_QEMU_CAPS, NONE, ARG_END); - DO_TEST_FULL("aarch64-gic-none-v2", "", WHEN_BOTH, - ARG_GIC, GIC_V2, - ARG_QEMU_CAPS, NONE, ARG_END); - DO_TEST_FULL("aarch64-gic-none-v3", "", WHEN_BOTH, - ARG_GIC, GIC_V3, - ARG_QEMU_CAPS, NONE, ARG_END); - DO_TEST_FULL("aarch64-gic-none-both", "", WHEN_BOTH, - ARG_GIC, GIC_BOTH, - ARG_QEMU_CAPS, NONE, ARG_END); - DO_TEST_FULL("aarch64-gic-none-tcg", "", WHEN_BOTH, - ARG_GIC, GIC_BOTH, - ARG_QEMU_CAPS, NONE, ARG_END); - DO_TEST_FULL("aarch64-gic-default", "", WHEN_BOTH, - ARG_GIC, GIC_NONE, - ARG_QEMU_CAPS, NONE, ARG_END); - DO_TEST_FULL("aarch64-gic-default-v2", "", WHEN_BOTH, - ARG_GIC, GIC_V2, - ARG_QEMU_CAPS, NONE, ARG_END); - DO_TEST_FULL("aarch64-gic-default-v3", "", WHEN_BOTH, - ARG_GIC, GIC_V3, - ARG_QEMU_CAPS, NONE, ARG_END); - DO_TEST_FULL("aarch64-gic-default-both", "", WHEN_BOTH, - ARG_GIC, GIC_BOTH, - ARG_QEMU_CAPS, NONE, ARG_END); - DO_TEST_FULL("aarch64-gic-v2", "", WHEN_BOTH, - ARG_GIC, GIC_NONE, - ARG_QEMU_CAPS, NONE, ARG_END); - DO_TEST_FULL("aarch64-gic-v2", "", WHEN_BOTH, - ARG_GIC, GIC_V2, - ARG_QEMU_CAPS, NONE, ARG_END); - DO_TEST_FULL("aarch64-gic-v2", "", WHEN_BOTH, - ARG_GIC, GIC_V3, - ARG_QEMU_CAPS, NONE, ARG_END); - DO_TEST_FULL("aarch64-gic-v2", "", WHEN_BOTH, - ARG_GIC, GIC_BOTH, - ARG_QEMU_CAPS, NONE, ARG_END); - DO_TEST_FULL("aarch64-gic-v3", "", WHEN_BOTH, - ARG_GIC, GIC_NONE, - ARG_QEMU_CAPS, NONE, ARG_END); - DO_TEST_FULL("aarch64-gic-v3", "", WHEN_BOTH, - ARG_GIC, GIC_V2, - ARG_QEMU_CAPS, NONE, ARG_END); - DO_TEST_FULL("aarch64-gic-v3", "", WHEN_BOTH, - ARG_GIC, GIC_V3, - ARG_QEMU_CAPS, NONE, ARG_END); - DO_TEST_FULL("aarch64-gic-v3", "", WHEN_BOTH, - ARG_GIC, GIC_BOTH, - ARG_QEMU_CAPS, NONE, ARG_END); - DO_TEST_FULL("aarch64-gic-host", "", WHEN_BOTH, - ARG_GIC, GIC_NONE, - ARG_QEMU_CAPS, NONE, ARG_END); - DO_TEST_FULL("aarch64-gic-host", "", WHEN_BOTH, - ARG_GIC, GIC_V2, - ARG_QEMU_CAPS, NONE, ARG_END); - DO_TEST_FULL("aarch64-gic-host", "", WHEN_BOTH, - ARG_GIC, GIC_V3, - ARG_QEMU_CAPS, NONE, ARG_END); - DO_TEST_FULL("aarch64-gic-host", "", WHEN_BOTH, - ARG_GIC, GIC_BOTH, - ARG_QEMU_CAPS, NONE, ARG_END); + DO_TEST_FULL("aarch64-gic-none", "", WHEN_BOTH, ARG_GIC, GIC_NONE, ARG= _END); + DO_TEST_FULL("aarch64-gic-none-v2", "", WHEN_BOTH, ARG_GIC, GIC_V2, AR= G_END); + DO_TEST_FULL("aarch64-gic-none-v3", "", WHEN_BOTH, ARG_GIC, GIC_V3, AR= G_END); + DO_TEST_FULL("aarch64-gic-none-both", "", WHEN_BOTH, ARG_GIC, GIC_BOTH= , ARG_END); + DO_TEST_FULL("aarch64-gic-none-tcg", "", WHEN_BOTH, ARG_GIC, GIC_BOTH,= ARG_END); + DO_TEST_FULL("aarch64-gic-default", "", WHEN_BOTH, ARG_GIC, GIC_NONE, = ARG_END); + DO_TEST_FULL("aarch64-gic-default-v2", "", WHEN_BOTH, ARG_GIC, GIC_V2,= ARG_END); + DO_TEST_FULL("aarch64-gic-default-v3", "", WHEN_BOTH, ARG_GIC, GIC_V3,= ARG_END); + DO_TEST_FULL("aarch64-gic-default-both", "", WHEN_BOTH, ARG_GIC, GIC_B= OTH, ARG_END); + DO_TEST_FULL("aarch64-gic-v2", "", WHEN_BOTH, ARG_GIC, GIC_NONE, ARG_E= ND); + DO_TEST_FULL("aarch64-gic-v2", "", WHEN_BOTH, ARG_GIC, GIC_V2, ARG_END= ); + DO_TEST_FULL("aarch64-gic-v2", "", WHEN_BOTH, ARG_GIC, GIC_V3, ARG_END= ); + DO_TEST_FULL("aarch64-gic-v2", "", WHEN_BOTH, ARG_GIC, GIC_BOTH, ARG_E= ND); + DO_TEST_FULL("aarch64-gic-v3", "", WHEN_BOTH, ARG_GIC, GIC_NONE, ARG_E= ND); + DO_TEST_FULL("aarch64-gic-v3", "", WHEN_BOTH, ARG_GIC, GIC_V2, ARG_END= ); + DO_TEST_FULL("aarch64-gic-v3", "", WHEN_BOTH, ARG_GIC, GIC_V3, ARG_END= ); + DO_TEST_FULL("aarch64-gic-v3", "", WHEN_BOTH, ARG_GIC, GIC_BOTH, ARG_E= ND); + DO_TEST_FULL("aarch64-gic-host", "", WHEN_BOTH, ARG_GIC, GIC_NONE, ARG= _END); + DO_TEST_FULL("aarch64-gic-host", "", WHEN_BOTH, ARG_GIC, GIC_V2, ARG_E= ND); + DO_TEST_FULL("aarch64-gic-host", "", WHEN_BOTH, ARG_GIC, GIC_V3, ARG_E= ND); + DO_TEST_FULL("aarch64-gic-host", "", WHEN_BOTH, ARG_GIC, GIC_BOTH, ARG= _END); /* SVE aarch64 CPU features work on modern QEMU */ DO_TEST_CAPS_ARCH_LATEST("aarch64-features-sve", "aarch64"); --=20 2.31.1