From nobody Tue Jan 21 04:05:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) 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 1737386366997536.6946138311564; Mon, 20 Jan 2025 07:19:26 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 6BA0C1AB6; Mon, 20 Jan 2025 10:19:26 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 6B1911929; Mon, 20 Jan 2025 10:18:54 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 745E01897; Mon, 20 Jan 2025 10:18:49 -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 EC5D91734 for ; Mon, 20 Jan 2025 10:18:48 -0500 (EST) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-358-ycrcAzvkNUWruqQIq94o5g-1; Mon, 20 Jan 2025 10:18:47 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.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 mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id ADD56195606F for ; Mon, 20 Jan 2025 15:18:42 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.2]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C5FA830044C5 for ; Mon, 20 Jan 2025 15:18:41 +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=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1737386328; h=from:from: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; bh=rveZYGwTWlYHOIjh7NGBUhBqpU2je+NIRUHkycomk0g=; b=T4TYW+4Bp9gU/Hx6xtuW+KrO+8bV62fUqLuliYNeOrbvIecGjBY5q9FQCQiNVP2n8dCK+b BhuXWOMljQhibSYgreCPIZH3vKf5d5a4nQY3DHO+140Te87BFuWZMD8ji1ilstNCYEhpSj V/vvIy+Zlp2pgtchlTPbvR1yx5R5EuQ= X-MC-Unique: ycrcAzvkNUWruqQIq94o5g-1 X-Mimecast-MFC-AGG-ID: ycrcAzvkNUWruqQIq94o5g From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 1/2] libvirt.spec: Move ownership of 'storage-file' backends directory to gluster Date: Mon, 20 Jan 2025 16:18:37 +0100 Message-ID: <2453eea85c4dfac44a6d8e5c4619594c10a4cc66.1737386257.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: bLpfher9Tsh1RYoaVbEUPPm9lvyrdAy9xMiD9cw91-g_1737386326 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: OUCL54I6OB4J3JXD7ORK5SQDJKRXLNLP X-Message-ID-Hash: OUCL54I6OB4J3JXD7ORK5SQDJKRXLNLP X-MailFrom: pkrempa@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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1737386369573019000 Content-Type: text/plain; charset="utf-8" Commit f8558a87ac8525b16f4cbba4f24e0885fde2b79e de-modularized the 'storage-file' backend for local files, and thus now the only possibility to have the directory is when compiling with gluster. This breaks RPM builds when building without gluster as the backend directory no longer exists in such case. Move the stanza requiring the directory under the gluster driver declarations. Fixes: f8558a87ac8525b16f4cbba4f24e0885fde2b79e Signed-off-by: Peter Krempa Reviewed-by: Jiri Denemark --- libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index b1e223cfbe..f513ca9173 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2098,7 +2098,6 @@ exit 0 %dir %attr(0755, root, root) %{_libdir}/libvirt/ %dir %attr(0755, root, root) %{_libdir}/libvirt/connection-driver/ %dir %attr(0755, root, root) %{_libdir}/libvirt/storage-backend/ -%dir %attr(0755, root, root) %{_libdir}/libvirt/storage-file/ %{_datadir}/polkit-1/actions/org.libvirt.unix.policy %{_datadir}/polkit-1/actions/org.libvirt.api.policy %{_datadir}/polkit-1/rules.d/50-libvirt.rules @@ -2293,6 +2292,7 @@ exit 0 %if %{with_storage_gluster} %files daemon-driver-storage-gluster %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_gluster.so +%dir %attr(0755, root, root) %{_libdir}/libvirt/storage-file/ %{_libdir}/libvirt/storage-file/libvirt_storage_file_gluster.so %endif --=20 2.48.1 From nobody Tue Jan 21 04:05:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) 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 1737386384664844.9502005180212; Mon, 20 Jan 2025 07:19:44 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 1320E11F2; Mon, 20 Jan 2025 10:19:44 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 02E331774; Mon, 20 Jan 2025 10:18:58 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id BAAFE1889; Mon, 20 Jan 2025 10:18:49 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 3C3D31895 for ; Mon, 20 Jan 2025 10:18:49 -0500 (EST) Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-451-qN9V6KVBMNqcWZy2B7sAbw-1; Mon, 20 Jan 2025 10:18:47 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.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 mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 198331954230 for ; Mon, 20 Jan 2025 15:18:44 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.2]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 311B83003FDC for ; Mon, 20 Jan 2025 15:18:42 +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=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1737386329; h=from:from: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; bh=sQmr3jUl0+ss1EyBTONLXKI2Dvz1aeThviESf9EPU1o=; b=POhiA4tuhMNHHcgX0ZXTG+Ws1sEYvGh5dlUm0P2P8KKys0jpEBJVncU8lDFiwmNAWcQUsY iF6x2MfxB3v0IzYhTLxag6HVTvFoBkA6K8s7ykZ8iuF9X+eq5ARo340UNJhfaYw3ZEGWyx OZN6nFnwdC01fHMKLZMLoTHdpyAN6n4= X-MC-Unique: qN9V6KVBMNqcWZy2B7sAbw-1 X-Mimecast-MFC-AGG-ID: qN9V6KVBMNqcWZy2B7sAbw From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 2/2] storage_file_backend_fs: Compile out 'chown' backend on mingw Date: Mon, 20 Jan 2025 16:18:38 +0100 Message-ID: <45984ede6497d220af4ace66024c5e339b871eab.1737386257.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: KVJuCzfgAJsL1ZgyWwTkALhOy-Me68KQa86SVc7yDIk_1737386327 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: AU3UG3T3PSXJ7OVGDOKPIAO352S2FLAB X-Message-ID-Hash: AU3UG3T3PSXJ7OVGDOKPIAO352S2FLAB X-MailFrom: pkrempa@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: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1737386385313019000 Content-Type: text/plain; charset="utf-8" Otherwise build on mingw complains: src/storage_file/storage_file_backend_fs.c:142:12: error: implicit declar= ation of function 'chown Fixes: f8558a87ac8525b16f4cbba4f24e0885fde2b79e Signed-off-by: Peter Krempa Reviewed-by: Jiri Denemark --- src/storage_file/storage_file_backend_fs.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/storage_file/storage_file_backend_fs.c b/src/storage_file/= storage_file_backend_fs.c index 1de822200d..92de403e3a 100644 --- a/src/storage_file/storage_file_backend_fs.c +++ b/src/storage_file/storage_file_backend_fs.c @@ -23,6 +23,7 @@ #include #include #include +#include #include "virerror.h" #include "storage_file_backend.h" @@ -134,6 +135,7 @@ virStorageFileBackendFileAccess(virStorageSource *src, } +#ifndef WIN32 static int virStorageFileBackendFileChown(const virStorageSource *src, uid_t uid, @@ -141,6 +143,7 @@ virStorageFileBackendFileChown(const virStorageSource *= src, { return chown(src->path, uid, gid); } +#endif virStorageFileBackend virStorageFileBackendFile =3D { @@ -154,7 +157,9 @@ virStorageFileBackend virStorageFileBackendFile =3D { .storageFileStat =3D virStorageFileBackendFileStat, .storageFileRead =3D virStorageFileBackendFileRead, .storageFileAccess =3D virStorageFileBackendFileAccess, +#ifndef WIN32 .storageFileChown =3D virStorageFileBackendFileChown, +#endif }; @@ -167,7 +172,9 @@ virStorageFileBackend virStorageFileBackendBlock =3D { .storageFileStat =3D virStorageFileBackendFileStat, .storageFileRead =3D virStorageFileBackendFileRead, .storageFileAccess =3D virStorageFileBackendFileAccess, +#ifndef WIN32 .storageFileChown =3D virStorageFileBackendFileChown, +#endif }; @@ -178,7 +185,9 @@ virStorageFileBackend virStorageFileBackendDir =3D { .backendDeinit =3D virStorageFileBackendFileDeinit, .storageFileAccess =3D virStorageFileBackendFileAccess, +#ifndef WIN32 .storageFileChown =3D virStorageFileBackendFileChown, +#endif }; --=20 2.48.1