From nobody Fri May 17 03:39:39 2024 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=1693927386; cv=none; d=zohomail.com; s=zohoarc; b=mngrRmziqSwJeY9im9XhW8RYgINpUBzTVcfeYRn+LQ+7GajJ61Kl8hL7MAqBSIqUXxR8vcRz1Rkfnet5Erh+v0CsDiBOwzhdDdNEN5OQdzABWXchRFp9f9YRP/bzA5AKiz+h8+5MZJi76vSqxbkeE44/KFDxfHcQgytRELhm7ZM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693927386; 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=x9e3+zTHqLt7kmcOfV5gk+txy+65KxRzXZ4lgyHIsaQ=; b=Q0vgXSHm8Brg6MTdGg50clZaltf2VNwiVJ3GY/2Yd3M+A75KiJ5q4Dx/WhEkD3leNBbklp62EkbnrcCtH2RnacDT/BTwGEYe7k/kBx6yGbdegUNzKehAPKCJH0KSja/Dc6ZBsL/JnDPIx2Rbqcvh6SizSRcR1RMzcWlq5himw8c= 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 1693927386741586.8266359965144; Tue, 5 Sep 2023 08:23:06 -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-613-LTPOwmJSOrieHG_sV2b-9w-1; Tue, 05 Sep 2023 11:21:19 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 83AAF18DA722; Tue, 5 Sep 2023 15:19:43 +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 EB07A2026D68; Tue, 5 Sep 2023 15:19:41 +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 812C4194658C; Tue, 5 Sep 2023 15:19:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2D66D1946589 for ; Tue, 5 Sep 2023 15:19:40 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E8AF9C03292; Tue, 5 Sep 2023 15:19:39 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 716EEC03291 for ; Tue, 5 Sep 2023 15:19:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693927375; 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=x9e3+zTHqLt7kmcOfV5gk+txy+65KxRzXZ4lgyHIsaQ=; b=XMLUaHSGkty81J6suXdW9FMh8/PkLjP1KxP4M9wo+jzNjRfWExJ7EuN2Sq/7BJYe31ZOyK 5jpp8MMMmk0E4pDeMqnXUzPYKNqQYWGJinbkxhs0tuEJZ8MMwGW21G1cj/ARk+jCAdsboW 4zFpDRc6sP5lqz1rP3S++Nbu9sCog8Y= X-MC-Unique: LTPOwmJSOrieHG_sV2b-9w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 00.5/51] securityselinuxlabeltest: Convert to testQemuInsertRealCaps Date: Tue, 5 Sep 2023 17:19:38 +0200 Message-ID: <2f3d5acdb03dda9d3fec8599eb0024e66c6a71db.1693926975.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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.4 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: 1693927387244100001 Content-Type: text/plain; charset="utf-8" Use the modern infrastructure to populate capabilities cache with real capabilities instead of the faked one which will be soon removed. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/securityselinuxlabeltest.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabelt= est.c index 30bd68b550..04bffe4356 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -299,7 +299,8 @@ mymain(void) { int ret =3D 0; int rc =3D testUserXattrEnabled(); - g_autoptr(virQEMUCaps) qemuCaps =3D NULL; + g_autoptr(GHashTable) capslatest =3D testQemuGetLatestCaps(); + g_autoptr(GHashTable) capscache =3D virHashNew(virObjectUnref); if (rc < 0) { VIR_TEST_VERBOSE("failed to determine xattr support"); @@ -322,12 +323,10 @@ mymain(void) if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; - qemuCaps =3D virQEMUCapsNew(); + qemuTestSetHostArch(&driver, VIR_ARCH_X86_64); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_CIRRUS_VGA); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC); - - if (qemuTestCapsCacheInsert(driver.qemuCapsCache, qemuCaps) < 0) + if (testQemuInsertRealCaps(driver.qemuCapsCache, "x86_64", "latest", "= ", + capslatest, capscache, NULL, NULL) < 0) return EXIT_FAILURE; #define DO_TEST_LABELING(name) \ --=20 2.41.0