From nobody Thu May 15 01:22:09 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1512840771445332.95084100057636; Sat, 9 Dec 2017 09:32:51 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 92BCF804E3; Sat, 9 Dec 2017 17:32:49 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7397419F00; Sat, 9 Dec 2017 17:32:49 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 33EAE1800C87; Sat, 9 Dec 2017 17:32:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id vB9HTXuA028918 for ; Sat, 9 Dec 2017 12:29:33 -0500 Received: by smtp.corp.redhat.com (Postfix) id 67E2B51C4B; Sat, 9 Dec 2017 17:29:33 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-132.phx2.redhat.com [10.3.117.132]) by smtp.corp.redhat.com (Postfix) with ESMTP id 305B718BBC for ; Sat, 9 Dec 2017 17:29:33 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Sat, 9 Dec 2017 12:29:13 -0500 Message-Id: <20171209172914.14640-3-jferlan@redhat.com> In-Reply-To: <20171209172914.14640-1-jferlan@redhat.com> References: <20171209172914.14640-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/3] nodedev: Move the udevPCITranslate{Init|Deinit} X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Sat, 09 Dec 2017 17:32:50 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Move the functions to the top - about to change where/when the Init helper gets called away from the main StateInitialize. Signed-off-by: John Ferlan --- src/node_device/node_device_udev.c | 74 +++++++++++++++++++---------------= ---- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_devi= ce_udev.c index e0fca6159..ca5b47767 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -126,6 +126,43 @@ udevEventDataNew(void) } =20 =20 +static int +udevPCITranslateInit(bool privileged ATTRIBUTE_UNUSED) +{ +#if defined __s390__ || defined __s390x_ + /* On s390(x) system there is no PCI bus. + * Therefore there is nothing to initialize here. */ +#else + int rc; + + if ((rc =3D pci_system_init()) !=3D 0) { + /* Ignore failure as non-root; udev is not as helpful in that + * situation, but a non-privileged user won't benefit much + * from udev in the first place. */ + if (errno !=3D ENOENT && (privileged || errno !=3D EACCES)) { + virReportSystemError(rc, "%s", + _("Failed to initialize libpciaccess")); + return -1; + } + } +#endif + return 0; +} + + +static void +udevPCITranslateDeinit(void) +{ +#if defined __s390__ || defined __s390x_ + /* Nothing was initialized, nothing needs to be cleaned up */ +#else + /* pci_system_cleanup returns void */ + pci_system_cleanup(); +#endif + return; +} + + static bool udevHasDeviceProperty(struct udev_device *dev, const char *key) @@ -1627,19 +1664,6 @@ udevEnumerateDevices(struct udev *udev) } =20 =20 -static void -udevPCITranslateDeinit(void) -{ -#if defined __s390__ || defined __s390x_ - /* Nothing was initialized, nothing needs to be cleaned up */ -#else - /* pci_system_cleanup returns void */ - pci_system_cleanup(); -#endif - return; -} - - static int nodeStateCleanup(void) { @@ -1911,30 +1935,6 @@ nodeStateInitializeEnumerate(void *opaque) =20 =20 static int -udevPCITranslateInit(bool privileged ATTRIBUTE_UNUSED) -{ -#if defined __s390__ || defined __s390x_ - /* On s390(x) system there is no PCI bus. - * Therefore there is nothing to initialize here. */ -#else - int rc; - - if ((rc =3D pci_system_init()) !=3D 0) { - /* Ignore failure as non-root; udev is not as helpful in that - * situation, but a non-privileged user won't benefit much - * from udev in the first place. */ - if (errno !=3D ENOENT && (privileged || errno !=3D EACCES)) { - virReportSystemError(rc, "%s", - _("Failed to initialize libpciaccess")); - return -1; - } - } -#endif - return 0; -} - - -static int nodeStateInitialize(bool privileged, virStateInhibitCallback callback ATTRIBUTE_UNUSED, void *opaque ATTRIBUTE_UNUSED) --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list