From nobody Sun Feb 8 21:48:29 2026 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.zoho.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 1490792212022243.28339002116672; Wed, 29 Mar 2017 05:56:52 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 58C5E8C55A; Wed, 29 Mar 2017 12:56:50 +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 29E90B23F4; Wed, 29 Mar 2017 12:56:50 +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 CCDB518523CB; Wed, 29 Mar 2017 12:56:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2TCpUUh010059 for ; Wed, 29 Mar 2017 08:51:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2F3AB9629F; Wed, 29 Mar 2017 12:51:30 +0000 (UTC) Received: from beluga.usersys.redhat.com (dhcp129-94.brq.redhat.com [10.34.129.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1C6779664F; Wed, 29 Mar 2017 12:51:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 58C5E8C55A Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 58C5E8C55A From: Erik Skultety To: libvir-list@redhat.com Date: Wed, 29 Mar 2017 14:51:11 +0200 Message-Id: <3b091d5f94c631f30dfb42abd2ca1d31d5a6b458.1490791809.git.eskultet@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Erik Skultety Subject: [libvirt] [RFC PATCH 01/11] nodedev: Fix guideline violations in nodedev modules 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 29 Mar 2017 12:56:51 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" We recently started to enforce certain guideline rule a bit more, e.g. functions delimited by 2 newlines in *.c, by 1 newline in *.h, return types on a separate line, etc. This patch adjusts these issues in all nodedev modules. Signed-off-by: Erik Skultety --- src/node_device/node_device_driver.c | 29 +++- src/node_device/node_device_driver.h | 82 +++++++---- src/node_device/node_device_hal.c | 9 ++ src/node_device/node_device_linux_sysfs.c | 1 + src/node_device/node_device_linux_sysfs.h | 9 +- src/node_device/node_device_udev.c | 233 ++++++++++++++++++--------= ---- 6 files changed, 238 insertions(+), 125 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_de= vice_driver.c index 99f7bc5476..9b1c5bb5e9 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -47,7 +47,8 @@ =20 virNodeDeviceDriverStatePtr driver; =20 -static int update_caps(virNodeDeviceObjPtr dev) +static int +update_caps(virNodeDeviceObjPtr dev) { virNodeDevCapsDefPtr cap =3D dev->def->caps; =20 @@ -101,7 +102,8 @@ static int update_caps(virNodeDeviceObjPtr dev) * the driver name for a device each time its entry is used, both for * udev *and* HAL backends. */ -static int update_driver_name(virNodeDeviceObjPtr dev) +static int +update_driver_name(virNodeDeviceObjPtr dev) { char *driver_link =3D NULL; char *devpath =3D NULL; @@ -138,22 +140,28 @@ static int update_driver_name(virNodeDeviceObjPtr dev) } #else /* XXX: Implement me for non-linux */ -static int update_driver_name(virNodeDeviceObjPtr dev ATTRIBUTE_UNUSED) +static int +update_driver_name(virNodeDeviceObjPtr dev ATTRIBUTE_UNUSED) { return 0; } #endif =20 =20 -void nodeDeviceLock(void) +void +nodeDeviceLock(void) { virMutexLock(&driver->lock); } -void nodeDeviceUnlock(void) + + +void +nodeDeviceUnlock(void) { virMutexUnlock(&driver->lock); } =20 + int nodeNumOfDevices(virConnectPtr conn, const char *cap, @@ -182,6 +190,7 @@ nodeNumOfDevices(virConnectPtr conn, return ndevs; } =20 + int nodeListDevices(virConnectPtr conn, const char *cap, @@ -222,6 +231,7 @@ nodeListDevices(virConnectPtr conn, return -1; } =20 + int nodeConnectListAllNodeDevices(virConnectPtr conn, virNodeDevicePtr **devices, @@ -242,6 +252,7 @@ nodeConnectListAllNodeDevices(virConnectPtr conn, return ret; } =20 + virNodeDevicePtr nodeDeviceLookupByName(virConnectPtr conn, const char *name) { @@ -500,6 +511,7 @@ nodeDeviceListCaps(virNodeDevicePtr dev, char **const n= ames, int maxnames) return ret; } =20 + static int get_time(time_t *t) { @@ -565,6 +577,7 @@ find_new_device(virConnectPtr conn, const char *wwnn, c= onst char *wwpn) return dev; } =20 + virNodeDevicePtr nodeDeviceCreateXML(virConnectPtr conn, const char *xmlDesc, @@ -663,6 +676,7 @@ nodeDeviceDestroy(virNodeDevicePtr dev) return ret; } =20 + int nodeConnectNodeDeviceEventRegisterAny(virConnectPtr conn, virNodeDevicePtr dev, @@ -684,6 +698,7 @@ nodeConnectNodeDeviceEventRegisterAny(virConnectPtr con= n, return callbackID; } =20 + int nodeConnectNodeDeviceEventDeregisterAny(virConnectPtr conn, int callbackID) @@ -704,7 +719,9 @@ nodeConnectNodeDeviceEventDeregisterAny(virConnectPtr c= onn, return ret; } =20 -int nodedevRegister(void) + +int +nodedevRegister(void) { #ifdef WITH_UDEV return udevNodeRegister(); diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_de= vice_driver.h index bc8af8a9e7..0f55e7b71e 100644 --- a/src/node_device/node_device_driver.h +++ b/src/node_device/node_device_driver.h @@ -30,37 +30,67 @@ =20 # define LINUX_NEW_DEVICE_WAIT_TIME 60 =20 +extern virNodeDeviceDriverStatePtr driver; + # ifdef WITH_HAL -int halNodeRegister(void); +int +halNodeRegister(void); # endif # ifdef WITH_UDEV -int udevNodeRegister(void); +int +udevNodeRegister(void); # endif =20 -void nodeDeviceLock(void); -void nodeDeviceUnlock(void); - -extern virNodeDeviceDriverStatePtr driver; - -int nodedevRegister(void); - -int nodeNumOfDevices(virConnectPtr conn, const char *cap, unsigned int fla= gs); -int nodeListDevices(virConnectPtr conn, const char *cap, char **const name= s, - int maxnames, unsigned int flags); -int nodeConnectListAllNodeDevices(virConnectPtr conn, - virNodeDevicePtr **devices, - unsigned int flags); -virNodeDevicePtr nodeDeviceLookupByName(virConnectPtr conn, const char *na= me); -virNodeDevicePtr nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, - const char *wwnn, - const char *wwpn, - unsigned int flags); -char *nodeDeviceGetXMLDesc(virNodeDevicePtr dev, unsigned int flags); -char *nodeDeviceGetParent(virNodeDevicePtr dev); -int nodeDeviceNumOfCaps(virNodeDevicePtr dev); -int nodeDeviceListCaps(virNodeDevicePtr dev, char **const names, int maxna= mes); -virNodeDevicePtr nodeDeviceCreateXML(virConnectPtr conn, - const char *xmlDesc, unsigned int fla= gs); +void +nodeDeviceLock(void); + +void +nodeDeviceUnlock(void); + +int +nodedevRegister(void); + +int +nodeNumOfDevices(virConnectPtr conn, const char *cap, unsigned int flags); + +int +nodeListDevices(virConnectPtr conn, + const char *cap, + char **const names, + int maxnames, + unsigned int flags); + +int +nodeConnectListAllNodeDevices(virConnectPtr conn, + virNodeDevicePtr **devices, + unsigned int flags); + +virNodeDevicePtr +nodeDeviceLookupByName(virConnectPtr conn, const char *name); + +virNodeDevicePtr +nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, + const char *wwnn, + const char *wwpn, + unsigned int flags); + +char * +nodeDeviceGetXMLDesc(virNodeDevicePtr dev, unsigned int flags); + +char * +nodeDeviceGetParent(virNodeDevicePtr dev); + +int +nodeDeviceNumOfCaps(virNodeDevicePtr dev); + +int +nodeDeviceListCaps(virNodeDevicePtr dev, char **const names, int maxnames); + +virNodeDevicePtr +nodeDeviceCreateXML(virConnectPtr conn, + const char *xmlDesc, + unsigned int flags); + int nodeDeviceDestroy(virNodeDevicePtr dev); =20 int diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_devic= e_hal.c index 81e5ecc41d..5339218775 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -84,6 +84,7 @@ get_str_prop(LibHalContext *ctxt, const char *udi, return -1; } =20 + static int get_int_prop(LibHalContext *ctxt, const char *udi, const char *prop, int *val_p) @@ -102,6 +103,7 @@ get_int_prop(LibHalContext *ctxt, const char *udi, return rv; } =20 + static int get_bool_prop(LibHalContext *ctxt, const char *udi, const char *prop, int *val_p) @@ -120,6 +122,7 @@ get_bool_prop(LibHalContext *ctxt, const char *udi, return rv; } =20 + static int get_uint64_prop(LibHalContext *ctxt, const char *udi, const char *prop, unsigned long long *val_p) @@ -138,6 +141,7 @@ get_uint64_prop(LibHalContext *ctxt, const char *udi, return rv; } =20 + static int gather_pci_cap(LibHalContext *ctx, const char *udi, virNodeDevCapDataPtr d) @@ -290,6 +294,7 @@ gather_storage_cap(LibHalContext *ctx, const char *udi, return 0; } =20 + static int gather_scsi_generic_cap(LibHalContext *ctx, const char *udi, virNodeDevCapDataPtr d) @@ -446,12 +451,14 @@ gather_capabilities(LibHalContext *ctx, const char *u= di, return rv; } =20 + static void free_udi(void *udi) { VIR_FREE(udi); } =20 + static void dev_create(const char *udi) { @@ -516,6 +523,7 @@ dev_create(const char *udi) nodeDeviceUnlock(); } =20 + static void dev_refresh(const char *udi) { @@ -538,6 +546,7 @@ dev_refresh(const char *udi) dev_create(udi); } =20 + static void device_added(LibHalContext *ctx ATTRIBUTE_UNUSED, const char *udi) diff --git a/src/node_device/node_device_linux_sysfs.c b/src/node_device/no= de_device_linux_sysfs.c index 1b7aa9435c..ff22d6d55c 100644 --- a/src/node_device/node_device_linux_sysfs.c +++ b/src/node_device/node_device_linux_sysfs.c @@ -230,6 +230,7 @@ nodeDeviceSysfsGetSCSIHostCaps(virNodeDevCapSCSIHostPtr= scsi_host ATTRIBUTE_UNUS return -1; } =20 + int nodeDeviceSysfsGetPCIRelatedDevCaps(const char *sysfsPath ATTRIBUTE_UNUSED, virNodeDevCapPCIDevPtr pci_dev ATTRIBU= TE_UNUSED) diff --git a/src/node_device/node_device_linux_sysfs.h b/src/node_device/no= de_device_linux_sysfs.h index 8deea66998..11b96e86b8 100644 --- a/src/node_device/node_device_linux_sysfs.h +++ b/src/node_device/node_device_linux_sysfs.h @@ -25,8 +25,11 @@ =20 # include "node_device_conf.h" =20 -int nodeDeviceSysfsGetSCSIHostCaps(virNodeDevCapSCSIHostPtr scsi_host); -int nodeDeviceSysfsGetPCIRelatedDevCaps(const char *sysfsPath, - virNodeDevCapPCIDevPtr pci_dev); +int +nodeDeviceSysfsGetSCSIHostCaps(virNodeDevCapSCSIHostPtr scsi_host); + +int +nodeDeviceSysfsGetPCIRelatedDevCaps(const char *sysfsPath, + virNodeDevCapPCIDevPtr pci_dev); =20 #endif /* __VIR_NODE_DEVICE_LINUX_SYSFS_H__ */ diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_devi= ce_udev.c index bcae444d85..4a837e04dc 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -70,8 +70,9 @@ udevHasDeviceProperty(struct udev_device *dev, } =20 =20 -static const char *udevGetDeviceProperty(struct udev_device *udev_device, - const char *property_key) +static const char * +udevGetDeviceProperty(struct udev_device *udev_device, + const char *property_key) { const char *ret =3D NULL; =20 @@ -84,9 +85,10 @@ static const char *udevGetDeviceProperty(struct udev_dev= ice *udev_device, } =20 =20 -static int udevGetStringProperty(struct udev_device *udev_device, - const char *property_key, - char **value) +static int +udevGetStringProperty(struct udev_device *udev_device, + const char *property_key, + char **value) { if (VIR_STRDUP(*value, udevGetDeviceProperty(udev_device, property_key)) < 0) @@ -96,10 +98,11 @@ static int udevGetStringProperty(struct udev_device *ud= ev_device, } =20 =20 -static int udevGetIntProperty(struct udev_device *udev_device, - const char *property_key, - int *value, - int base) +static int +udevGetIntProperty(struct udev_device *udev_device, + const char *property_key, + int *value, + int base) { const char *str =3D NULL; =20 @@ -114,10 +117,11 @@ static int udevGetIntProperty(struct udev_device *ude= v_device, } =20 =20 -static int udevGetUintProperty(struct udev_device *udev_device, - const char *property_key, - unsigned int *value, - int base) +static int +udevGetUintProperty(struct udev_device *udev_device, + const char *property_key, + unsigned int *value, + int base) { const char *str =3D NULL; =20 @@ -132,8 +136,9 @@ static int udevGetUintProperty(struct udev_device *udev= _device, } =20 =20 -static const char *udevGetDeviceSysfsAttr(struct udev_device *udev_device, - const char *attr_name) +static const char * +udevGetDeviceSysfsAttr(struct udev_device *udev_device, + const char *attr_name) { const char *ret =3D NULL; =20 @@ -147,9 +152,10 @@ static const char *udevGetDeviceSysfsAttr(struct udev_= device *udev_device, } =20 =20 -static int udevGetStringSysfsAttr(struct udev_device *udev_device, - const char *attr_name, - char **value) +static int +udevGetStringSysfsAttr(struct udev_device *udev_device, + const char *attr_name, + char **value) { if (VIR_STRDUP(*value, udevGetDeviceSysfsAttr(udev_device, attr_name))= < 0) return -1; @@ -163,10 +169,11 @@ static int udevGetStringSysfsAttr(struct udev_device = *udev_device, } =20 =20 -static int udevGetIntSysfsAttr(struct udev_device *udev_device, - const char *attr_name, - int *value, - int base) +static int +udevGetIntSysfsAttr(struct udev_device *udev_device, + const char *attr_name, + int *value, + int base) { const char *str =3D NULL; =20 @@ -182,10 +189,11 @@ static int udevGetIntSysfsAttr(struct udev_device *ud= ev_device, } =20 =20 -static int udevGetUintSysfsAttr(struct udev_device *udev_device, - const char *attr_name, - unsigned int *value, - int base) +static int +udevGetUintSysfsAttr(struct udev_device *udev_device, + const char *attr_name, + unsigned int *value, + int base) { const char *str =3D NULL; =20 @@ -201,9 +209,10 @@ static int udevGetUintSysfsAttr(struct udev_device *ud= ev_device, } =20 =20 -static int udevGetUint64SysfsAttr(struct udev_device *udev_device, - const char *attr_name, - unsigned long long *value) +static int +udevGetUint64SysfsAttr(struct udev_device *udev_device, + const char *attr_name, + unsigned long long *value) { const char *str =3D NULL; =20 @@ -219,9 +228,10 @@ static int udevGetUint64SysfsAttr(struct udev_device *= udev_device, } =20 =20 -static int udevGenerateDeviceName(struct udev_device *device, - virNodeDeviceDefPtr def, - const char *s) +static int +udevGenerateDeviceName(struct udev_device *device, + virNodeDeviceDefPtr def, + const char *s) { size_t i; virBuffer buf =3D VIR_BUFFER_INITIALIZER; @@ -282,10 +292,11 @@ udevLogFunction(struct udev *udev ATTRIBUTE_UNUSED, #endif =20 =20 -static int udevTranslatePCIIds(unsigned int vendor, - unsigned int product, - char **vendor_string, - char **product_string) +static int +udevTranslatePCIIds(unsigned int vendor, + unsigned int product, + char **vendor_string, + char **product_string) { struct pci_id_match m; const char *vendor_name =3D NULL, *device_name =3D NULL; @@ -313,8 +324,9 @@ static int udevTranslatePCIIds(unsigned int vendor, } =20 =20 -static int udevProcessPCI(struct udev_device *device, - virNodeDeviceDefPtr def) +static int +udevProcessPCI(struct udev_device *device, + virNodeDeviceDefPtr def) { const char *syspath =3D NULL; virNodeDevCapPCIDevPtr pci_dev =3D &def->caps->data.pci_dev; @@ -411,7 +423,9 @@ static int udevProcessPCI(struct udev_device *device, return ret; } =20 -static int drmGetMinorType(int minor) + +static int +drmGetMinorType(int minor) { int type =3D minor >> 6; =20 @@ -428,8 +442,10 @@ static int drmGetMinorType(int minor) } } =20 -static int udevProcessDRMDevice(struct udev_device *device, - virNodeDeviceDefPtr def) + +static int +udevProcessDRMDevice(struct udev_device *device, + virNodeDeviceDefPtr def) { virNodeDevCapDRMPtr drm =3D &def->caps->data.drm; int minor; @@ -448,8 +464,10 @@ static int udevProcessDRMDevice(struct udev_device *de= vice, return 0; } =20 -static int udevProcessUSBDevice(struct udev_device *device, - virNodeDeviceDefPtr def) + +static int +udevProcessUSBDevice(struct udev_device *device, + virNodeDeviceDefPtr def) { virNodeDevCapUSBDevPtr usb_dev =3D &def->caps->data.usb_dev; =20 @@ -490,8 +508,9 @@ static int udevProcessUSBDevice(struct udev_device *dev= ice, } =20 =20 -static int udevProcessUSBInterface(struct udev_device *device, - virNodeDeviceDefPtr def) +static int +udevProcessUSBInterface(struct udev_device *device, + virNodeDeviceDefPtr def) { virNodeDevCapUSBIfPtr usb_if =3D &def->caps->data.usb_if; =20 @@ -518,8 +537,9 @@ static int udevProcessUSBInterface(struct udev_device *= device, } =20 =20 -static int udevProcessNetworkInterface(struct udev_device *device, - virNodeDeviceDefPtr def) +static int +udevProcessNetworkInterface(struct udev_device *device, + virNodeDeviceDefPtr def) { const char *devtype =3D udev_device_get_devtype(device); virNodeDevCapNetPtr net =3D &def->caps->data.net; @@ -581,8 +601,9 @@ static int udevProcessSCSIHost(struct udev_device *devi= ce ATTRIBUTE_UNUSED, } =20 =20 -static int udevProcessSCSITarget(struct udev_device *device ATTRIBUTE_UNUS= ED, - virNodeDeviceDefPtr def) +static int +udevProcessSCSITarget(struct udev_device *device ATTRIBUTE_UNUSED, + virNodeDeviceDefPtr def) { const char *sysname =3D NULL; virNodeDevCapSCSITargetPtr scsi_target =3D &def->caps->data.scsi_targe= t; @@ -599,8 +620,9 @@ static int udevProcessSCSITarget(struct udev_device *de= vice ATTRIBUTE_UNUSED, } =20 =20 -static int udevGetSCSIType(virNodeDeviceDefPtr def ATTRIBUTE_UNUSED, - unsigned int type, char **typestring) +static int +udevGetSCSIType(virNodeDeviceDefPtr def ATTRIBUTE_UNUSED, + unsigned int type, char **typestring) { int ret =3D 0; int foundtype =3D 1; @@ -657,8 +679,9 @@ static int udevGetSCSIType(virNodeDeviceDefPtr def ATTR= IBUTE_UNUSED, } =20 =20 -static int udevProcessSCSIDevice(struct udev_device *device ATTRIBUTE_UNUS= ED, - virNodeDeviceDefPtr def) +static int +udevProcessSCSIDevice(struct udev_device *device ATTRIBUTE_UNUSED, + virNodeDeviceDefPtr def) { int ret =3D -1; unsigned int tmp =3D 0; @@ -700,8 +723,9 @@ static int udevProcessSCSIDevice(struct udev_device *de= vice ATTRIBUTE_UNUSED, } =20 =20 -static int udevProcessDisk(struct udev_device *device, - virNodeDeviceDefPtr def) +static int +udevProcessDisk(struct udev_device *device, + virNodeDeviceDefPtr def) { virNodeDevCapStoragePtr storage =3D &def->caps->data.storage; =20 @@ -718,9 +742,10 @@ static int udevProcessDisk(struct udev_device *device, } =20 =20 -static int udevProcessRemoveableMedia(struct udev_device *device, - virNodeDeviceDefPtr def, - int has_media) +static int +udevProcessRemoveableMedia(struct udev_device *device, + virNodeDeviceDefPtr def, + int has_media) { virNodeDevCapStoragePtr storage =3D &def->caps->data.storage; int is_removable =3D 0; @@ -759,8 +784,10 @@ static int udevProcessRemoveableMedia(struct udev_devi= ce *device, return 0; } =20 -static int udevProcessCDROM(struct udev_device *device, - virNodeDeviceDefPtr def) + +static int +udevProcessCDROM(struct udev_device *device, + virNodeDeviceDefPtr def) { int has_media =3D 0; =20 @@ -779,8 +806,10 @@ static int udevProcessCDROM(struct udev_device *device, return udevProcessRemoveableMedia(device, def, has_media); } =20 -static int udevProcessFloppy(struct udev_device *device, - virNodeDeviceDefPtr def) + +static int +udevProcessFloppy(struct udev_device *device, + virNodeDeviceDefPtr def) { int has_media =3D 0; =20 @@ -797,8 +826,9 @@ static int udevProcessFloppy(struct udev_device *device, } =20 =20 -static int udevProcessSD(struct udev_device *device, - virNodeDeviceDefPtr def) +static int +udevProcessSD(struct udev_device *device, + virNodeDeviceDefPtr def) { virNodeDevCapStoragePtr storage =3D &def->caps->data.storage; =20 @@ -821,7 +851,8 @@ static int udevProcessSD(struct udev_device *device, * not provide a device type in the usual place, but udev told us it's * a storage device, and we can make a good guess at what kind of * storage device it is from other information that is provided. */ -static int udevKludgeStorageType(virNodeDeviceDefPtr def) +static int +udevKludgeStorageType(virNodeDeviceDefPtr def) { VIR_DEBUG("Could not find definitive storage type for device " "with sysfs path '%s', trying to guess it", @@ -842,8 +873,9 @@ static int udevKludgeStorageType(virNodeDeviceDefPtr de= f) } =20 =20 -static int udevProcessStorage(struct udev_device *device, - virNodeDeviceDefPtr def) +static int +udevProcessStorage(struct udev_device *device, + virNodeDeviceDefPtr def) { virNodeDevCapStoragePtr storage =3D &def->caps->data.storage; int ret =3D -1; @@ -938,6 +970,7 @@ static int udevProcessStorage(struct udev_device *devic= e, return ret; } =20 + static int udevProcessSCSIGeneric(struct udev_device *dev, virNodeDeviceDefPtr def) @@ -952,6 +985,7 @@ udevProcessSCSIGeneric(struct udev_device *dev, return 0; } =20 + static int udevGetDeviceNodes(struct udev_device *device, virNodeDeviceDefPtr def) @@ -980,6 +1014,7 @@ udevGetDeviceNodes(struct udev_device *device, return 0; } =20 + static int udevGetDeviceType(struct udev_device *device, virNodeDevCapType *type) @@ -1040,8 +1075,9 @@ udevGetDeviceType(struct udev_device *device, } =20 =20 -static int udevGetDeviceDetails(struct udev_device *device, - virNodeDeviceDefPtr def) +static int +udevGetDeviceDetails(struct udev_device *device, + virNodeDeviceDefPtr def) { int ret =3D 0; =20 @@ -1090,7 +1126,8 @@ static int udevGetDeviceDetails(struct udev_device *d= evice, } =20 =20 -static int udevRemoveOneDevice(struct udev_device *device) +static int +udevRemoveOneDevice(struct udev_device *device) { virNodeDeviceObjPtr dev =3D NULL; virObjectEventPtr event =3D NULL; @@ -1122,8 +1159,9 @@ static int udevRemoveOneDevice(struct udev_device *de= vice) } =20 =20 -static int udevSetParent(struct udev_device *device, - virNodeDeviceDefPtr def) +static int +udevSetParent(struct udev_device *device, + virNodeDeviceDefPtr def) { struct udev_device *parent_device =3D NULL; const char *parent_sysfs_path =3D NULL; @@ -1170,7 +1208,8 @@ static int udevSetParent(struct udev_device *device, } =20 =20 -static int udevAddOneDevice(struct udev_device *device) +static int +udevAddOneDevice(struct udev_device *device) { virNodeDeviceDefPtr def =3D NULL; virNodeDeviceObjPtr dev =3D NULL; @@ -1239,8 +1278,9 @@ static int udevAddOneDevice(struct udev_device *devic= e) } =20 =20 -static int udevProcessDeviceListEntry(struct udev *udev, - struct udev_list_entry *list_entry) +static int +udevProcessDeviceListEntry(struct udev *udev, + struct udev_list_entry *list_entry) { struct udev_device *device; const char *name =3D NULL; @@ -1272,7 +1312,8 @@ const char *subsystem_blacklist[] =3D { "acpi", "tty", "vc", "i2c", }; =20 -static int udevEnumerateAddMatches(struct udev_enumerate *udev_enumerate) +static int +udevEnumerateAddMatches(struct udev_enumerate *udev_enumerate) { size_t i; =20 @@ -1287,7 +1328,8 @@ static int udevEnumerateAddMatches(struct udev_enumer= ate *udev_enumerate) } =20 =20 -static int udevEnumerateDevices(struct udev *udev) +static int +udevEnumerateDevices(struct udev *udev) { struct udev_enumerate *udev_enumerate =3D NULL; struct udev_list_entry *list_entry =3D NULL; @@ -1317,7 +1359,8 @@ static int udevEnumerateDevices(struct udev *udev) } =20 =20 -static void udevPCITranslateDeinit(void) +static void +udevPCITranslateDeinit(void) { #if defined __s390__ || defined __s390x_ /* Nothing was initialized, nothing needs to be cleaned up */ @@ -1329,7 +1372,8 @@ static void udevPCITranslateDeinit(void) } =20 =20 -static int nodeStateCleanup(void) +static int +nodeStateCleanup(void) { udevPrivate *priv =3D NULL; struct udev_monitor *udev_monitor =3D NULL; @@ -1370,10 +1414,11 @@ static int nodeStateCleanup(void) } =20 =20 -static void udevEventHandleCallback(int watch ATTRIBUTE_UNUSED, - int fd, - int events ATTRIBUTE_UNUSED, - void *data ATTRIBUTE_UNUSED) +static void +udevEventHandleCallback(int watch ATTRIBUTE_UNUSED, + int fd, + int events ATTRIBUTE_UNUSED, + void *data ATTRIBUTE_UNUSED) { struct udev_device *device =3D NULL; struct udev_monitor *udev_monitor =3D DRV_STATE_UDEV_MONITOR(driver); @@ -1474,7 +1519,8 @@ udevGetDMIData(virNodeDevCapSystemPtr syscap) #endif =20 =20 -static int udevSetupSystemDev(void) +static int +udevSetupSystemDev(void) { virNodeDeviceDefPtr def =3D NULL; virNodeDeviceObjPtr dev =3D NULL; @@ -1508,7 +1554,9 @@ static int udevSetupSystemDev(void) return ret; } =20 -static int udevPCITranslateInit(bool privileged ATTRIBUTE_UNUSED) + +static int +udevPCITranslateInit(bool privileged ATTRIBUTE_UNUSED) { #if defined __s390__ || defined __s390x_ /* On s390(x) system there is no PCI bus. @@ -1530,9 +1578,11 @@ static int udevPCITranslateInit(bool privileged ATTR= IBUTE_UNUSED) return 0; } =20 -static int nodeStateInitialize(bool privileged, - virStateInhibitCallback callback ATTRIBUTE_= UNUSED, - void *opaque ATTRIBUTE_UNUSED) + +static int +nodeStateInitialize(bool privileged, + virStateInhibitCallback callback ATTRIBUTE_UNUSED, + void *opaque ATTRIBUTE_UNUSED) { udevPrivate *priv =3D NULL; struct udev *udev =3D NULL; @@ -1618,7 +1668,8 @@ static int nodeStateInitialize(bool privileged, } =20 =20 -static int nodeStateReload(void) +static int +nodeStateReload(void) { return 0; } @@ -1648,7 +1699,9 @@ static virStateDriver udevStateDriver =3D { .stateReload =3D nodeStateReload, /* 0.7.3 */ }; =20 -int udevNodeRegister(void) + +int +udevNodeRegister(void) { VIR_DEBUG("Registering udev node device backend"); =20 --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list