From nobody Thu May 9 22:15:00 2024 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 1700581694761878.1736866250951; Tue, 21 Nov 2023 07:48:14 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 5025017E3; Tue, 21 Nov 2023 10:48:13 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 8834A17CB; Tue, 21 Nov 2023 10:47:06 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 6809D1780; Tue, 21 Nov 2023 10:47:04 -0500 (EST) 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 DA8491775 for ; Tue, 21 Nov 2023 10:47:03 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-644-ERmYgCtYNpKC80EOYftSBQ-1; Tue, 21 Nov 2023 10:47:01 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 74EA080D731 for ; Tue, 21 Nov 2023 15:47:01 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.184]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0478C2026D4C for ; Tue, 21 Nov 2023 15:47:00 +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_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: ERmYgCtYNpKC80EOYftSBQ-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [libvirt PATCH] security: drop virSecurityDACRestoreImageLabelSingle() Date: Tue, 21 Nov 2023 16:46:59 +0100 Message-ID: <20231121154659.61319-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: Z5SQWMHGFRUVLIT7T4N3XS2MJVVHA2OR X-Message-ID-Hash: Z5SQWMHGFRUVLIT7T4N3XS2MJVVHA2OR 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 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: 1700581696560100001 It only has a single, trivial caller. Signed-off-by: Andrea Bolognani Reviewed-by: Peter Krempa --- src/security/security_dac.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index c07e488db7..35b9b56c66 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, --=20 2.42.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org