From nobody Mon Feb 9 12:12:06 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=1692889462; cv=none; d=zohomail.com; s=zohoarc; b=QWc+BjjTL3GIdH9KIQXc8J4H12TPODQAHZcevNG/ftjH6T4iBqXIlP2epVqSC2fJp0KFqgV3MGfNRoDCklEYBUWbigJpBTmEcPOc6yC1O5Ie/TbIhWapQMPB03okYuBvRFW1ejE3HW0Mbcx+KAZcM/SjL8AvFMsHQX0q9I3yxQ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692889462; 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=MwIgFAhhcq+1NL9KBjOQVeQ5Ns/rM0e/4MX3s/DLrac=; b=ncj2btgWuZuLT7SunUEsV/A5HFbAZhpxMU15IYWUSyjzwv/AgDxDy70Fqv5x99F8uZQic2xd91ZUvwrE1R/vql2umqMKHbbr1ST7x0GPxRp1ZlCBO+lQUJ47jV7OzfFKfPf8s2RVit+PTLXrZHjDXkKMgY0vKvdJbqRbZr+u1/o= 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 1692889462196719.7778832591773; Thu, 24 Aug 2023 08:04:22 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-91-Tb00G43MMLaPP54AiUc2hg-1; Thu, 24 Aug 2023 11:03:10 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 75F893844E10; Thu, 24 Aug 2023 15:03:07 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 641F9C1602B; Thu, 24 Aug 2023 15:03:07 +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 0A84819465B3; Thu, 24 Aug 2023 15:03:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3642519465A4 for ; Thu, 24 Aug 2023 15:02:45 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0C4522166B28; Thu, 24 Aug 2023 15:02:45 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 899E22166B27 for ; Thu, 24 Aug 2023 15:02:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692889458; 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=MwIgFAhhcq+1NL9KBjOQVeQ5Ns/rM0e/4MX3s/DLrac=; b=isgR5t1wqPZRcmkerzCM5i7MAAzhPuKZMNpP3G+xU87B8yVq9H1mcGZvgD+5li+4UIemMk wOGUdxt9mEgVnNH0waDB8xCNuhLXNFTGGpihL6TWsmGTK5ybJw7tpVgoO31VbXfmxTnYEk wE9+mLWvU4BSSbxdV75WG6o7RMaKm6M= X-MC-Unique: Tb00G43MMLaPP54AiUc2hg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 4/5] qemuxml2xmltest: Modernize rest of 'seclabel-*' tests Date: Thu, 24 Aug 2023 17:02:39 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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.8 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: 1692889471331100001 Content-Type: text/plain; charset="utf-8" Use real capabilities for these last few tests that were not modernized due to use of 'WHEN_INACTIVE'. Signed-off-by: Peter Krempa --- ...el-dynamic-baselabel-inactive.x86_64-latest.xml} | 5 ++++- ...el-dynamic-labelskip-inactive.x86_64-latest.xml} | 5 ++++- ...dynamic-none-relabel-inactive.x86_64-latest.xml} | 5 ++++- ...bel-dynamic-override-inactive.x86_64-latest.xml} | 5 ++++- ...abel-dynamic-relabel-inactive.x86_64-latest.xml} | 5 ++++- tests/qemuxml2xmltest.c | 13 +++++-------- 6 files changed, 25 insertions(+), 13 deletions(-) rename tests/qemuxml2xmloutdata/{seclabel-dynamic-baselabel-inactive.xml = =3D> seclabel-dynamic-baselabel-inactive.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{seclabel-dynamic-labelskip-inactive.xml = =3D> seclabel-dynamic-labelskip-inactive.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{seclabel-dynamic-none-relabel-inactive.xm= l =3D> seclabel-dynamic-none-relabel-inactive.x86_64-latest.xml} (92%) rename tests/qemuxml2xmloutdata/{seclabel-dynamic-override-inactive.xml = =3D> seclabel-dynamic-override-inactive.x86_64-latest.xml} (92%) rename tests/qemuxml2xmloutdata/{seclabel-dynamic-relabel-inactive.xml =3D= > seclabel-dynamic-relabel-inactive.x86_64-latest.xml} (89%) diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.x= ml b/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.x86_64-la= test.xml similarity index 90% rename from tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml rename to tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.x86_= 64-latest.xml index 5fa8455f77..7ab0558e66 100644 --- a/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml +++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.x86_64-l= atest.xml @@ -8,6 +8,9 @@ hvm + + qemu64 + destroy restart @@ -20,7 +23,7 @@
- +
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.x= ml b/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.x86_64-la= test.xml similarity index 90% rename from tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml rename to tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.x86_= 64-latest.xml index 5fa8455f77..7ab0558e66 100644 --- a/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml +++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.x86_64-l= atest.xml @@ -8,6 +8,9 @@ hvm + + qemu64 + destroy restart @@ -20,7 +23,7 @@
- +
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel-inactiv= e.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel-inactive.x86= _64-latest.xml similarity index 92% rename from tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel-inactive= .xml rename to tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel-inactive.x= 86_64-latest.xml index 09c019e474..005e13334c 100644 --- a/tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel-inactive.xml +++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel-inactive.x86_6= 4-latest.xml @@ -16,13 +16,16 @@ + + qemu64 + destroy restart destroy /usr/bin/qemu-system-x86_64 - +
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xm= l b/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.x86_64-late= st.xml similarity index 92% rename from tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml rename to tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.x86_6= 4-latest.xml index 56f15db911..7c1d16d0b2 100644 --- a/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml +++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.x86_64-la= test.xml @@ -8,6 +8,9 @@ hvm + + qemu64 + destroy restart @@ -32,7 +35,7 @@
- +
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml= b/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.x86_64-latest= .xml similarity index 89% rename from tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml rename to tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.x86_64= -latest.xml index a2b4a3e19e..d94c33d47b 100644 --- a/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml +++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.x86_64-lat= est.xml @@ -8,6 +8,9 @@ hvm + + qemu64 + destroy restart @@ -20,7 +23,7 @@
- +
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index e6018f8240..f6be677694 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -503,20 +503,17 @@ 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", "", ARG_FLAGS, FLAG_SKIP_CO= NFIG_ACTIVE, ARG_END); - DO_TEST_FULL("seclabel-dynamic-override", "", ARG_FLAGS, FLAG_SKIP_CON= FIG_ACTIVE, ARG_END); - DO_TEST_FULL("seclabel-dynamic-labelskip", "", ARG_FLAGS, FLAG_SKIP_CO= NFIG_ACTIVE, ARG_END); - DO_TEST_FULL("seclabel-dynamic-relabel", "", ARG_FLAGS, FLAG_SKIP_CONF= IG_ACTIVE, ARG_END); + DO_TEST_CAPS_ARCH_LATEST_FULL("seclabel-dynamic-baselabel", "x86_64", = ARG_FLAGS, FLAG_SKIP_CONFIG_ACTIVE, ARG_END); + DO_TEST_CAPS_ARCH_LATEST_FULL("seclabel-dynamic-override", "x86_64", A= RG_FLAGS, FLAG_SKIP_CONFIG_ACTIVE, ARG_END); + DO_TEST_CAPS_ARCH_LATEST_FULL("seclabel-dynamic-labelskip", "x86_64", = ARG_FLAGS, FLAG_SKIP_CONFIG_ACTIVE, ARG_END); + DO_TEST_CAPS_ARCH_LATEST_FULL("seclabel-dynamic-relabel", "x86_64", AR= G_FLAGS, FLAG_SKIP_CONFIG_ACTIVE, ARG_END); DO_TEST_CAPS_LATEST("seclabel-static"); DO_TEST_CAPS_LATEST("seclabel-static-labelskip"); DO_TEST_CAPS_LATEST("seclabel-none"); DO_TEST_CAPS_LATEST("seclabel-dac-none"); DO_TEST_CAPS_LATEST("seclabel-dynamic-none"); DO_TEST_CAPS_LATEST("seclabel-device-multiple"); - DO_TEST_FULL("seclabel-dynamic-none-relabel", "", ARG_FLAGS, FLAG_SKIP= _CONFIG_ACTIVE, - ARG_QEMU_CAPS, QEMU_CAPS_DEVICE_CIRRUS_VGA, - QEMU_CAPS_SPICE, QEMU_CAPS_LAST, - ARG_END); + DO_TEST_CAPS_ARCH_LATEST_FULL("seclabel-dynamic-none-relabel", "x86_64= ", ARG_FLAGS, FLAG_SKIP_CONFIG_ACTIVE, ARG_END); DO_TEST_CAPS_LATEST("numad-static-vcpu-no-numatune"); DO_TEST_CAPS_LATEST("disk-scsi-disk-vpd"); --=20 2.41.0