From nobody Tue Feb 10 01:59:19 2026 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1710926976498528.9360872087123; Wed, 20 Mar 2024 02:29:36 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 69EA0217C; Wed, 20 Mar 2024 05:29:35 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 4619E1F40; Wed, 20 Mar 2024 05:20:19 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 267FF1C1E; Wed, 20 Mar 2024 05:19:36 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id BB9531B65 for ; Wed, 20 Mar 2024 05:19:31 -0400 (EDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-104-wuYhqIn0NF-Ags-8yJRMCA-1; Wed, 20 Mar 2024 05:19:25 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 653E929AC00C; Wed, 20 Mar 2024 09:19:24 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.225.41]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C8229C1576F; Wed, 20 Mar 2024 09:19:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: wuYhqIn0NF-Ags-8yJRMCA-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH 03/10] security: Drop virSecurity(DAC|SELinux)RestoreImageLabelSingle() Date: Wed, 20 Mar 2024 10:19:08 +0100 Message-ID: <20240320091915.369391-4-abologna@redhat.com> In-Reply-To: <20240320091915.369391-1-abologna@redhat.com> References: <20240320091915.369391-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: 2AD5QESQ5TX7HDMELWSMHAILE52TKYSX X-Message-ID-Hash: 2AD5QESQ5TX7HDMELWSMHAILE52TKYSX X-MailFrom: abologna@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Stefan Berger X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1710926977750100001 Each one only has a single, trivial caller. Signed-off-by: Andrea Bolognani Reviewed-by: Peter Krempa Reviewed-by: Stefan Berger --- src/security/security_dac.c | 21 ++++----------------- src/security/security_selinux.c | 21 ++++----------------- 2 files changed, 8 insertions(+), 34 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 7421496fc9..9c24a1c4a8 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -972,10 +972,10 @@ virSecurityDACSetImageLabel(virSecurityManager *mgr, } =20 static int -virSecurityDACRestoreImageLabelSingle(virSecurityManager *mgr, - virDomainDef *def, - virStorageSource *src, - bool migrated) +virSecurityDACRestoreImageLabelInt(virSecurityManager *mgr, + virDomainDef *def, + virStorageSource *src, + bool migrated) { virSecurityDACData *priv =3D virSecurityManagerGetPrivateData(mgr); virSecurityLabelDef *secdef; @@ -1047,19 +1047,6 @@ virSecurityDACRestoreImageLabelSingle(virSecurityMan= ager *mgr, } =20 =20 -static int -virSecurityDACRestoreImageLabelInt(virSecurityManager *mgr, - virDomainDef *def, - virStorageSource *src, - bool migrated) -{ - if (virSecurityDACRestoreImageLabelSingle(mgr, def, src, migrated) < 0) - return -1; - - return 0; -} - - static int virSecurityDACRestoreImageLabel(virSecurityManager *mgr, virDomainDef *def, diff --git a/src/security/security_selinux.c b/src/security/security_selinu= x.c index ffad058d9a..d491435ae1 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1774,10 +1774,10 @@ virSecuritySELinuxRestoreTPMFileLabelInt(virSecurit= yManager *mgr, =20 =20 static int -virSecuritySELinuxRestoreImageLabelSingle(virSecurityManager *mgr, - virDomainDef *def, - virStorageSource *src, - bool migrated) +virSecuritySELinuxRestoreImageLabelInt(virSecurityManager *mgr, + virDomainDef *def, + virStorageSource *src, + bool migrated) { virSecurityLabelDef *seclabel; virSecurityDeviceLabelDef *disk_seclabel; @@ -1863,19 +1863,6 @@ virSecuritySELinuxRestoreImageLabelSingle(virSecurit= yManager *mgr, } =20 =20 -static int -virSecuritySELinuxRestoreImageLabelInt(virSecurityManager *mgr, - virDomainDef *def, - virStorageSource *src, - bool migrated) -{ - if (virSecuritySELinuxRestoreImageLabelSingle(mgr, def, src, migrated)= < 0) - return -1; - - return 0; -} - - static int virSecuritySELinuxRestoreImageLabel(virSecurityManager *mgr, virDomainDef *def, --=20 2.44.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org