On Wed, Mar 01, 2017 at 07:27:14PM -0500, John Ferlan wrote: > Move all the NodeDeviceObj API's into their own module virnodedeviceobj > from the node_device_conf > > Purely code motion at this point, plus adjustments to cleanly build. > > Signed-off-by: John Ferlan <jferlan(a)redhat.com&gt; > --- > po/POTFILES.in | 1 + > src/Makefile.am | 3 +- > src/conf/node_device_conf.c | 505 -------------------------------- > src/conf/node_device_conf.h | 50 ---- > src/conf/virnodedeviceobj.c | 542 +++++++++++++++++++++++++++++++++++ > src/conf/virnodedeviceobj.h | 78 +++++ > src/libvirt_private.syms | 23 +- > src/node_device/node_device_driver.h | 2 +- > src/test/test_driver.c | 1 + > 9 files changed, 638 insertions(+), 567 deletions(-) > create mode 100644 src/conf/virnodedeviceobj.c > create mode 100644 src/conf/virnodedeviceobj.h [...] > diff --git a/src/conf/virnodedeviceobj.h b/src/conf/virnodedeviceobj.h > new file mode 100644 > index 0000000..6ad7fb1 > --- /dev/null > +++ b/src/conf/virnodedeviceobj.h > @@ -0,0 +1,78 @@ > +/* > + * virnodedeviceobj.h: node device object handling for node devices > + * (derived from node_device_conf.h) > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library. If not, see > + * <http://www.gnu.org/licenses/>;. > + */ > + > +#ifndef __VIRNODEDEVICEOBJ_H__ > +# define __VIRNODEDEVICEOBJ_H__ > + > +# include "internal.h" > +# include "virthread.h" > + > +# include "node_device_conf.h" > +# include "object_event.h" > + > + > +typedef struct _virNodeDeviceDriverState virNodeDeviceDriverState; > +typedef virNodeDeviceDriverState *virNodeDeviceDriverStatePtr; > +struct _virNodeDeviceDriverState { > + virMutex lock; > + > + virNodeDeviceObjList devs; /* currently-known devices */ > + void *privateData; /* driver-specific private data */ > + > + /* Immutable pointer, self-locking APIs */ > + virObjectEventStatePtr nodeDeviceEventState; > +}; > + > + Since I'm the only one that tries to change the different coding style between header and source files this is a kind reminder that it would be nice to use the same coding style, placing the return value on separate line. Thanks, Pavel

Alter the static functions from virNodeDev* to just nodeDev* as a visual cue to determine which are local or not when reading code. Cleanup spacing between functions, function defs, etc. to match more modern techniques used in libvirt Signed-off-by: John Ferlan <jferlan(a)redhat.com&gt; --- src/conf/node_device_conf.c | 476 +++++++++++++++++++++++--------------------- src/conf/virnodedeviceobj.c | 128 ++++++------ 2 files changed, 322 insertions(+), 282 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index bc36527..09e815a 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -72,9 +72,9 @@ VIR_ENUM_IMPL(virNodeDevDRM, VIR_NODE_DEV_DRM_LAST, "render") static int -virNodeDevCapsDefParseString(const char *xpath, - xmlXPathContextPtr ctxt, - char **string) +nodeDevCapsDefParseString(const char *xpath, + xmlXPathContextPtr ctxt, + char **string)

On 03/02/2017 09:58 AM, Peter Krempa wrote: > On Wed, Mar 01, 2017 at 19:27:15 -0500, John Ferlan wrote: >> Alter the static functions from virNodeDev* to just nodeDev* as a visual >> cue to determine which are local or not when reading code. >> >> Cleanup spacing between functions, function defs, etc. to match more modern >> techniques used in libvirt >> >> Signed-off-by: John Ferlan <jferlan(a)redhat.com&gt; >> --- >> src/conf/node_device_conf.c | 476 +++++++++++++++++++++++--------------------- >> src/conf/virnodedeviceobj.c | 128 ++++++------ >> 2 files changed, 322 insertions(+), 282 deletions(-) >> >> diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c >> index bc36527..09e815a 100644 >> --- a/src/conf/node_device_conf.c >> +++ b/src/conf/node_device_conf.c >> @@ -72,9 +72,9 @@ VIR_ENUM_IMPL(virNodeDevDRM, VIR_NODE_DEV_DRM_LAST, >> "render") >> >> static int >> -virNodeDevCapsDefParseString(const char *xpath, >> - xmlXPathContextPtr ctxt, >> - char **string) >> +nodeDevCapsDefParseString(const char *xpath, >> + xmlXPathContextPtr ctxt, >> + char **string) > > Please don't remove the vir prefix. The coding style tries to converge > to having them everywhere. > Why? If a function is static, we can be sure it's not called from outside of the file. Moreover, I'd direct your attention to recent

commit of f557b3351e0b6d for instance. In fact whole qemu driver serves as a great example: it's "static int qemuDomain*()" not "static vir virQEMUDomain*()".

In fact, I'd suggest the opposite rule - use "vir" prefix only if function is shared between modules. For instance virFileCopyACLs should have the vir prefix because it's exported. virFileRewriteStrHelper should not have the prefix because it's static.

The advantage of this approach is that one can immediately tell just from the name if the function is exported or not.

On Thu, Mar 02, 2017 at 10:04:24AM +0100, Michal Privoznik wrote: > On 03/02/2017 09:58 AM, Peter Krempa wrote: >> On Wed, Mar 01, 2017 at 19:27:15 -0500, John Ferlan wrote: >>> Alter the static functions from virNodeDev* to just nodeDev* as a visual >>> cue to determine which are local or not when reading code. >>> >>> Cleanup spacing between functions, function defs, etc. to match more modern >>> techniques used in libvirt >>> >>> Signed-off-by: John Ferlan <jferlan(a)redhat.com&gt; >>> --- >>> src/conf/node_device_conf.c | 476 +++++++++++++++++++++++--------------------- >>> src/conf/virnodedeviceobj.c | 128 ++++++------ >>> 2 files changed, 322 insertions(+), 282 deletions(-) >>> >>> diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c >>> index bc36527..09e815a 100644 >>> --- a/src/conf/node_device_conf.c >>> +++ b/src/conf/node_device_conf.c >>> @@ -72,9 +72,9 @@ VIR_ENUM_IMPL(virNodeDevDRM, VIR_NODE_DEV_DRM_LAST, >>> "render") >>> >>> static int >>> -virNodeDevCapsDefParseString(const char *xpath, >>> - xmlXPathContextPtr ctxt, >>> - char **string) >>> +nodeDevCapsDefParseString(const char *xpath, >>> + xmlXPathContextPtr ctxt, >>> + char **string) >> >> Please don't remove the vir prefix. The coding style tries to converge >> to having them everywhere. >> > > Why? If a function is static, we can be sure it's not called from > outside of the file. Moreover, I'd direct your attention to recent > commit of f557b3351e0b6d for instance. In fact whole qemu driver serves > as a great example: it's "static int qemuDomain*()" not "static vir > virQEMUDomain*()". > > In fact, I'd suggest the opposite rule - use "vir" prefix only if > function is shared between modules. For instance virFileCopyACLs should > have the vir prefix because it's exported. virFileRewriteStrHelper > should not have the prefix because it's static. > The advantage of this approach is that one can immediately tell just > from the name if the function is exported or not. No, this is a bad rule because it causes us to rename code when we inevitably make static functions non-static. We want a naming rule that is standardized & stable long term. Convering to use 'vir' prefix everywhere gives us that.

Alter the static functions from virNodeDev* to just nodeDev* as a visual cue to determine which are local or not when reading code.

Cleanup spacing between functions, function defs, etc. to match more modern techniques used in libvirt Signed-off-by: John Ferlan <jferlan(a)redhat.com&gt; --- src/conf/node_device_conf.c | 476 +++++++++++++++++++++++--------------------- src/conf/virnodedeviceobj.c | 128 ++++++------ 2 files changed, 322 insertions(+), 282 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index bc36527..09e815a 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -72,9 +72,9 @@ VIR_ENUM_IMPL(virNodeDevDRM, VIR_NODE_DEV_DRM_LAST, "render") static int -virNodeDevCapsDefParseString(const char *xpath, - xmlXPathContextPtr ctxt, - char **string) +nodeDevCapsDefParseString(const char *xpath, + xmlXPathContextPtr ctxt, + char **string) { char *s; @@ -86,7 +86,8 @@ virNodeDevCapsDefParseString(const char *xpath, } -void virNodeDeviceDefFree(virNodeDeviceDefPtr def) +void +virNodeDeviceDefFree(virNodeDeviceDefPtr def) { virNodeDevCapsDefPtr caps; @@ -116,9 +117,9 @@ void virNodeDeviceDefFree(virNodeDeviceDefPtr def) static void -virPCIELinkFormat(virBufferPtr buf, - virPCIELinkPtr lnk, - const char *attrib) +nodeDevPCIELinkFormat(virBufferPtr buf, + virPCIELinkPtr lnk, + const char *attrib) { if (!lnk) return; @@ -133,9 +134,10 @@ virPCIELinkFormat(virBufferPtr buf, virBufferAddLit(buf, "/>\n"); } + static void -virPCIEDeviceInfoFormat(virBufferPtr buf, - virPCIEDeviceInfoPtr info) +nodeDevPCIEDeviceInfoFormat(virBufferPtr buf, + virPCIEDeviceInfoPtr info) { if (!info->link_cap && !info->link_sta) { virBufferAddLit(buf, "<pci-express/>\n"); @@ -145,14 +147,16 @@ virPCIEDeviceInfoFormat(virBufferPtr buf, virBufferAddLit(buf, "<pci-express>\n"); virBufferAdjustIndent(buf, 2); - virPCIELinkFormat(buf, info->link_cap, "cap"); - virPCIELinkFormat(buf, info->link_sta, "sta"); + nodeDevPCIELinkFormat(buf, info->link_cap, "cap"); + nodeDevPCIELinkFormat(buf, info->link_sta, "sta"); virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</pci-express>\n"); } -char *virNodeDeviceDefFormat(const virNodeDeviceDef *def) + +char * +virNodeDeviceDefFormat(const virNodeDeviceDef *def) { virBuffer buf = VIR_BUFFER_INITIALIZER; virNodeDevCapsDefPtr caps; @@ -305,7 +309,7 @@ char *virNodeDeviceDefFormat(const virNodeDeviceDef *def) data->pci_dev.numa_node); if (data->pci_dev.flags & VIR_NODE_DEV_CAP_FLAG_PCIE) - virPCIEDeviceInfoFormat(&buf, data->pci_dev.pci_express); + nodeDevPCIEDeviceInfoFormat(&buf, data->pci_dev.pci_express); break; case VIR_NODE_DEV_CAP_USB_DEV: virBufferAsprintf(&buf, "<bus>%d</bus>\n", data->usb_dev.bus); @@ -489,8 +493,9 @@ char *virNodeDeviceDefFormat(const virNodeDeviceDef *def) return virBufferContentAndReset(&buf); } + /** - * virNodeDevCapsDefParseIntOptional: + * nodeDevCapsDefParseIntOptional: * @xpath: XPath to evaluate * @ctxt: Context * @value: Where to store parsed value @@ -502,11 +507,11 @@ char *virNodeDeviceDefFormat(const virNodeDeviceDef *def) * 1 on success */ static int -virNodeDevCapsDefParseIntOptional(const char *xpath, - xmlXPathContextPtr ctxt, - int *value, - virNodeDeviceDefPtr def, - const char *invalid_error_fmt) +nodeDevCapsDefParseIntOptional(const char *xpath, + xmlXPathContextPtr ctxt, + int *value, + virNodeDeviceDefPtr def, + const char *invalid_error_fmt) { int ret; int val; @@ -524,13 +529,14 @@ virNodeDevCapsDefParseIntOptional(const char *xpath, return 1; } + static int -virNodeDevCapsDefParseULong(const char *xpath, - xmlXPathContextPtr ctxt, - unsigned *value, - virNodeDeviceDefPtr def, - const char *missing_error_fmt, - const char *invalid_error_fmt) +nodeDevCapsDefParseULong(const char *xpath, + xmlXPathContextPtr ctxt, + unsigned *value, + virNodeDeviceDefPtr def, + const char *missing_error_fmt, + const char *invalid_error_fmt) { int ret; unsigned long val; @@ -547,13 +553,14 @@ virNodeDevCapsDefParseULong(const char *xpath, return 0; } + static int -virNodeDevCapsDefParseULongLong(const char *xpath, - xmlXPathContextPtr ctxt, - unsigned long long *value, - virNodeDeviceDefPtr def, - const char *missing_error_fmt, - const char *invalid_error_fmt) +nodeDevCapsDefParseULongLong(const char *xpath, + xmlXPathContextPtr ctxt, + unsigned long long *value, + virNodeDeviceDefPtr def, + const char *missing_error_fmt, + const char *invalid_error_fmt) { int ret; unsigned long long val; @@ -570,11 +577,12 @@ virNodeDevCapsDefParseULongLong(const char *xpath, return 0; } + static int -virNodeDevCapDRMParseXML(xmlXPathContextPtr ctxt, - virNodeDeviceDefPtr def, - xmlNodePtr node, - virNodeDevCapDataPtr data) +nodeDevCapDRMParseXML(xmlXPathContextPtr ctxt, + virNodeDeviceDefPtr def, + xmlNodePtr node, + virNodeDevCapDataPtr data) { xmlNodePtr orignode; int ret = -1, val; @@ -600,11 +608,12 @@ virNodeDevCapDRMParseXML(xmlXPathContextPtr ctxt, return ret; } + static int -virNodeDevCapStorageParseXML(xmlXPathContextPtr ctxt, - virNodeDeviceDefPtr def, - xmlNodePtr node, - virNodeDevCapDataPtr data) +nodeDevCapStorageParseXML(xmlXPathContextPtr ctxt, + virNodeDeviceDefPtr def, + xmlNodePtr node, + virNodeDevCapDataPtr data) { xmlNodePtr orignode, *nodes = NULL; size_t i; @@ -657,9 +666,9 @@ virNodeDevCapStorageParseXML(xmlXPathContextPtr ctxt, data->storage.media_label = virXPathString("string(./media_label[1])", ctxt); val = 0; - if (virNodeDevCapsDefParseULongLong("number(./media_size[1])", ctxt, &val, def, - _("no removable media size supplied for '%s'"), - _("invalid removable media size supplied for '%s'")) < 0) { + if (nodeDevCapsDefParseULongLong("number(./media_size[1])", ctxt, &val, def, + _("no removable media size supplied for '%s'"), + _("invalid removable media size supplied for '%s'")) < 0) { ctxt->node = orignode2; VIR_FREE(type); goto out; @@ -680,9 +689,9 @@ virNodeDevCapStorageParseXML(xmlXPathContextPtr ctxt, if (!(data->storage.flags & VIR_NODE_DEV_CAP_STORAGE_REMOVABLE)) { val = 0; - if (virNodeDevCapsDefParseULongLong("number(./size[1])", ctxt, &val, def, - _("no size supplied for '%s'"), - _("invalid size supplied for '%s'")) < 0) + if (nodeDevCapsDefParseULongLong("number(./size[1])", ctxt, &val, def, + _("no size supplied for '%s'"), + _("invalid size supplied for '%s'")) < 0) goto out; data->storage.size = val; } @@ -694,11 +703,12 @@ virNodeDevCapStorageParseXML(xmlXPathContextPtr ctxt, return ret; } + static int -virNodeDevCapSCSIParseXML(xmlXPathContextPtr ctxt, - virNodeDeviceDefPtr def, - xmlNodePtr node, - virNodeDevCapDataPtr data) +nodeDevCapSCSIParseXML(xmlXPathContextPtr ctxt, + virNodeDeviceDefPtr def, + xmlNodePtr node, + virNodeDevCapDataPtr data) { xmlNodePtr orignode; int ret = -1; @@ -706,28 +716,28 @@ virNodeDevCapSCSIParseXML(xmlXPathContextPtr ctxt, orignode = ctxt->node; ctxt->node = node; - if (virNodeDevCapsDefParseULong("number(./host[1])", ctxt, - &data->scsi.host, def, - _("no SCSI host ID supplied for '%s'"), - _("invalid SCSI host ID supplied for '%s'")) < 0) + if (nodeDevCapsDefParseULong("number(./host[1])", ctxt, + &data->scsi.host, def, + _("no SCSI host ID supplied for '%s'"), + _("invalid SCSI host ID supplied for '%s'")) < 0) goto out; - if (virNodeDevCapsDefParseULong("number(./bus[1])", ctxt, - &data->scsi.bus, def, - _("no SCSI bus ID supplied for '%s'"), - _("invalid SCSI bus ID supplied for '%s'")) < 0) + if (nodeDevCapsDefParseULong("number(./bus[1])", ctxt, + &data->scsi.bus, def, + _("no SCSI bus ID supplied for '%s'"), + _("invalid SCSI bus ID supplied for '%s'")) < 0) goto out; - if (virNodeDevCapsDefParseULong("number(./target[1])", ctxt, - &data->scsi.target, def, - _("no SCSI target ID supplied for '%s'"), + if (nodeDevCapsDefParseULong("number(./target[1])", ctxt, + &data->scsi.target, def, + _("no SCSI target ID supplied for '%s'"), _("invalid SCSI target ID supplied for '%s'")) < 0) goto out; - if (virNodeDevCapsDefParseULong("number(./lun[1])", ctxt, - &data->scsi.lun, def, - _("no SCSI LUN ID supplied for '%s'"), - _("invalid SCSI LUN ID supplied for '%s'")) < 0) + if (nodeDevCapsDefParseULong("number(./lun[1])", ctxt, + &data->scsi.lun, def, + _("no SCSI LUN ID supplied for '%s'"), + _("invalid SCSI LUN ID supplied for '%s'")) < 0) goto out; data->scsi.type = virXPathString("string(./type[1])", ctxt); @@ -740,10 +750,10 @@ virNodeDevCapSCSIParseXML(xmlXPathContextPtr ctxt, static int -virNodeDevCapSCSITargetParseXML(xmlXPathContextPtr ctxt, - virNodeDeviceDefPtr def, - xmlNodePtr node, - virNodeDevCapDataPtr data) +nodeDevCapSCSITargetParseXML(xmlXPathContextPtr ctxt, + virNodeDeviceDefPtr def, + xmlNodePtr node, + virNodeDevCapDataPtr data) { xmlNodePtr orignode; int ret = -1; @@ -768,12 +778,12 @@ virNodeDevCapSCSITargetParseXML(xmlXPathContextPtr ctxt, static int -virNodeDevCapSCSIHostParseXML(xmlXPathContextPtr ctxt, - virNodeDeviceDefPtr def, - xmlNodePtr node, - virNodeDevCapDataPtr data, - int create, - const char *virt_type) +nodeDevCapSCSIHostParseXML(xmlXPathContextPtr ctxt, + virNodeDeviceDefPtr def, + xmlNodePtr node, + virNodeDevCapDataPtr data, + int create, + const char *virt_type) { xmlNodePtr orignode, *nodes = NULL; int ret = -1, n = 0; @@ -784,17 +794,17 @@ virNodeDevCapSCSIHostParseXML(xmlXPathContextPtr ctxt, ctxt->node = node; if (create == EXISTING_DEVICE) { - if (virNodeDevCapsDefParseULong("number(./host[1])", ctxt, - &data->scsi_host.host, def, - _("no SCSI host ID supplied for '%s'"), - _("invalid SCSI host ID supplied for '%s'")) < 0) { + if (nodeDevCapsDefParseULong("number(./host[1])", ctxt, + &data->scsi_host.host, def, + _("no SCSI host ID supplied for '%s'"), + _("invalid SCSI host ID supplied for '%s'")) < 0) { goto out; } /* Optional unique_id value */ data->scsi_host.unique_id = -1; - if (virNodeDevCapsDefParseIntOptional("number(./unique_id[1])", ctxt, - &data->scsi_host.unique_id, def, - _("invalid unique_id supplied for '%s'")) < 0) { + if (nodeDevCapsDefParseIntOptional("number(./unique_id[1])", ctxt, + &data->scsi_host.unique_id, def, + _("invalid unique_id supplied for '%s'")) < 0) { goto out; } } @@ -825,9 +835,9 @@ virNodeDevCapSCSIHostParseXML(xmlXPathContextPtr ctxt, orignode2 = ctxt->node; ctxt->node = nodes[i]; - if (virNodeDevCapsDefParseString("string(./wwnn[1])", - ctxt, - &data->scsi_host.wwnn) < 0) { + if (nodeDevCapsDefParseString("string(./wwnn[1])", + ctxt, + &data->scsi_host.wwnn) < 0) { if (virRandomGenerateWWN(&data->scsi_host.wwnn, virt_type) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("no WWNN supplied for '%s', and " @@ -837,9 +847,9 @@ virNodeDevCapSCSIHostParseXML(xmlXPathContextPtr ctxt, } } - if (virNodeDevCapsDefParseString("string(./wwpn[1])", - ctxt, - &data->scsi_host.wwpn) < 0) { + if (nodeDevCapsDefParseString("string(./wwpn[1])", + ctxt, + &data->scsi_host.wwpn) < 0) { if (virRandomGenerateWWN(&data->scsi_host.wwpn, virt_type) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("no WWPN supplied for '%s', and " @@ -849,9 +859,9 @@ virNodeDevCapSCSIHostParseXML(xmlXPathContextPtr ctxt, } } - if (virNodeDevCapsDefParseString("string(./fabric_wwn[1])", - ctxt, - &data->scsi_host.fabric_wwn) < 0) + if (nodeDevCapsDefParseString("string(./fabric_wwn[1])", + ctxt, + &data->scsi_host.fabric_wwn) < 0) VIR_DEBUG("No fabric_wwn defined for '%s'", def->name); ctxt->node = orignode2; @@ -877,10 +887,10 @@ virNodeDevCapSCSIHostParseXML(xmlXPathContextPtr ctxt, static int -virNodeDevCapNetParseXML(xmlXPathContextPtr ctxt, - virNodeDeviceDefPtr def, - xmlNodePtr node, - virNodeDevCapDataPtr data) +nodeDevCapNetParseXML(xmlXPathContextPtr ctxt, + virNodeDeviceDefPtr def, + xmlNodePtr node, + virNodeDevCapDataPtr data) { xmlNodePtr orignode, lnk; size_t i = -1; @@ -954,11 +964,12 @@ virNodeDevCapNetParseXML(xmlXPathContextPtr ctxt, return ret; } + static int -virNodeDevCapUSBInterfaceParseXML(xmlXPathContextPtr ctxt, - virNodeDeviceDefPtr def, - xmlNodePtr node, - virNodeDevCapDataPtr data) +nodeDevCapUSBInterfaceParseXML(xmlXPathContextPtr ctxt, + virNodeDeviceDefPtr def, + xmlNodePtr node, + virNodeDevCapDataPtr data) { xmlNodePtr orignode; int ret = -1; @@ -966,27 +977,27 @@ virNodeDevCapUSBInterfaceParseXML(xmlXPathContextPtr ctxt, orignode = ctxt->node; ctxt->node = node; - if (virNodeDevCapsDefParseULong("number(./number[1])", ctxt, - &data->usb_if.number, def, - _("no USB interface number supplied for '%s'"), - _("invalid USB interface number supplied for '%s'")) < 0) + if (nodeDevCapsDefParseULong("number(./number[1])", ctxt, + &data->usb_if.number, def, + _("no USB interface number supplied for '%s'"), + _("invalid USB interface number supplied for '%s'")) < 0) goto out; - if (virNodeDevCapsDefParseULong("number(./class[1])", ctxt, - &data->usb_if._class, def, - _("no USB interface class supplied for '%s'"), - _("invalid USB interface class supplied for '%s'")) < 0) + if (nodeDevCapsDefParseULong("number(./class[1])", ctxt, + &data->usb_if._class, def, + _("no USB interface class supplied for '%s'"), + _("invalid USB interface class supplied for '%s'")) < 0) goto out; - if (virNodeDevCapsDefParseULong("number(./subclass[1])", ctxt, - &data->usb_if.subclass, def, - _("no USB interface subclass supplied for '%s'"), - _("invalid USB interface subclass supplied for '%s'")) < 0) + if (nodeDevCapsDefParseULong("number(./subclass[1])", ctxt, + &data->usb_if.subclass, def, + _("no USB interface subclass supplied for '%s'"), + _("invalid USB interface subclass supplied for '%s'")) < 0) goto out; - if (virNodeDevCapsDefParseULong("number(./protocol[1])", ctxt, - &data->usb_if.protocol, def, - _("no USB interface protocol supplied for '%s'"), + if (nodeDevCapsDefParseULong("number(./protocol[1])", ctxt, + &data->usb_if.protocol, def, + _("no USB interface protocol supplied for '%s'"), _("invalid USB interface protocol supplied for '%s'")) < 0) goto out; @@ -998,13 +1009,14 @@ virNodeDevCapUSBInterfaceParseXML(xmlXPathContextPtr ctxt, return ret; } + static int -virNodeDevCapsDefParseHexId(const char *xpath, - xmlXPathContextPtr ctxt, - unsigned *value, - virNodeDeviceDefPtr def, - const char *missing_error_fmt, - const char *invalid_error_fmt) +nodeDevCapsDefParseHexId(const char *xpath, + xmlXPathContextPtr ctxt, + unsigned *value, + virNodeDeviceDefPtr def, + const char *missing_error_fmt, + const char *invalid_error_fmt) { int ret; unsigned long val; @@ -1021,11 +1033,12 @@ virNodeDevCapsDefParseHexId(const char *xpath, return 0; } + static int -virNodeDevCapUSBDevParseXML(xmlXPathContextPtr ctxt, - virNodeDeviceDefPtr def, - xmlNodePtr node, - virNodeDevCapDataPtr data) +nodeDevCapUSBDevParseXML(xmlXPathContextPtr ctxt, + virNodeDeviceDefPtr def, + xmlNodePtr node, + virNodeDevCapDataPtr data) { xmlNodePtr orignode; int ret = -1; @@ -1033,28 +1046,28 @@ virNodeDevCapUSBDevParseXML(xmlXPathContextPtr ctxt, orignode = ctxt->node; ctxt->node = node; - if (virNodeDevCapsDefParseULong("number(./bus[1])", ctxt, - &data->usb_dev.bus, def, - _("no USB bus number supplied for '%s'"), - _("invalid USB bus number supplied for '%s'")) < 0) + if (nodeDevCapsDefParseULong("number(./bus[1])", ctxt, + &data->usb_dev.bus, def, + _("no USB bus number supplied for '%s'"), + _("invalid USB bus number supplied for '%s'")) < 0) goto out; - if (virNodeDevCapsDefParseULong("number(./device[1])", ctxt, - &data->usb_dev.device, def, - _("no USB device number supplied for '%s'"), - _("invalid USB device number supplied for '%s'")) < 0) + if (nodeDevCapsDefParseULong("number(./device[1])", ctxt, + &data->usb_dev.device, def, + _("no USB device number supplied for '%s'"), + _("invalid USB device number supplied for '%s'")) < 0) goto out; - if (virNodeDevCapsDefParseHexId("string(./vendor[1]/@id)", ctxt, - &data->usb_dev.vendor, def, - _("no USB vendor ID supplied for '%s'"), - _("invalid USB vendor ID supplied for '%s'")) < 0) + if (nodeDevCapsDefParseHexId("string(./vendor[1]/@id)", ctxt, + &data->usb_dev.vendor, def, + _("no USB vendor ID supplied for '%s'"), + _("invalid USB vendor ID supplied for '%s'")) < 0) goto out; - if (virNodeDevCapsDefParseHexId("string(./product[1]/@id)", ctxt, - &data->usb_dev.product, def, - _("no USB product ID supplied for '%s'"), - _("invalid USB product ID supplied for '%s'")) < 0) + if (nodeDevCapsDefParseHexId("string(./product[1]/@id)", ctxt, + &data->usb_dev.product, def, + _("no USB product ID supplied for '%s'"), + _("invalid USB product ID supplied for '%s'")) < 0) goto out; data->usb_dev.vendor_name = virXPathString("string(./vendor[1])", ctxt); @@ -1066,10 +1079,11 @@ virNodeDevCapUSBDevParseXML(xmlXPathContextPtr ctxt, return ret; } + static int -virNodeDevCapPCIDevIommuGroupParseXML(xmlXPathContextPtr ctxt, - xmlNodePtr iommuGroupNode, - virNodeDevCapDataPtr data) +nodeDevCapPCIDevIommuGroupParseXML(xmlXPathContextPtr ctxt, + xmlNodePtr iommuGroupNode, + virNodeDevCapDataPtr data) { xmlNodePtr origNode = ctxt->node; xmlNodePtr *addrNodes = NULL; @@ -1122,10 +1136,11 @@ virNodeDevCapPCIDevIommuGroupParseXML(xmlXPathContextPtr ctxt, return ret; } + static int -virPCIEDeviceInfoLinkParseXML(xmlXPathContextPtr ctxt, - xmlNodePtr linkNode, - virPCIELinkPtr lnk) +nodeDevPCIEDeviceInfoLinkParseXML(xmlXPathContextPtr ctxt, + xmlNodePtr linkNode, + virPCIELinkPtr lnk) { xmlNodePtr origNode = ctxt->node; int ret = -1, speed; @@ -1168,10 +1183,11 @@ virPCIEDeviceInfoLinkParseXML(xmlXPathContextPtr ctxt, return ret; } + static int -virPCIEDeviceInfoParseXML(xmlXPathContextPtr ctxt, - xmlNodePtr pciExpressNode, - virPCIEDeviceInfoPtr pci_express) +nodeDevPCIEDeviceInfoParseXML(xmlXPathContextPtr ctxt, + xmlNodePtr pciExpressNode, + virPCIEDeviceInfoPtr pci_express) { xmlNodePtr lnk, origNode = ctxt->node; int ret = -1; @@ -1182,8 +1198,8 @@ virPCIEDeviceInfoParseXML(xmlXPathContextPtr ctxt, if (VIR_ALLOC(pci_express->link_cap) < 0) goto cleanup; - if (virPCIEDeviceInfoLinkParseXML(ctxt, lnk, - pci_express->link_cap) < 0) + if (nodeDevPCIEDeviceInfoLinkParseXML(ctxt, lnk, + pci_express->link_cap) < 0) goto cleanup; } @@ -1191,8 +1207,8 @@ virPCIEDeviceInfoParseXML(xmlXPathContextPtr ctxt, if (VIR_ALLOC(pci_express->link_sta) < 0) goto cleanup; - if (virPCIEDeviceInfoLinkParseXML(ctxt, lnk, - pci_express->link_sta) < 0) + if (nodeDevPCIEDeviceInfoLinkParseXML(ctxt, lnk, + pci_express->link_sta) < 0) goto cleanup; } @@ -1204,9 +1220,9 @@ virPCIEDeviceInfoParseXML(xmlXPathContextPtr ctxt, static int -virNodeDevPCICapabilityParseXML(xmlXPathContextPtr ctxt, - xmlNodePtr node, - virNodeDevCapDataPtr data) +nodeDevPCICapabilityParseXML(xmlXPathContextPtr ctxt, + xmlNodePtr node, + virNodeDevCapDataPtr data) { char *maxFuncsStr = virXMLPropString(node, "maxCount"); char *type = virXMLPropString(node, "type"); @@ -1292,10 +1308,10 @@ virNodeDevPCICapabilityParseXML(xmlXPathContextPtr ctxt, static int -virNodeDevCapPCIDevParseXML(xmlXPathContextPtr ctxt, - virNodeDeviceDefPtr def, - xmlNodePtr node, - virNodeDevCapDataPtr data) +nodeDevCapPCIDevParseXML(xmlXPathContextPtr ctxt, + virNodeDeviceDefPtr def, + xmlNodePtr node, + virNodeDevCapDataPtr data) { xmlNodePtr orignode, iommuGroupNode, pciExpress; xmlNodePtr *nodes = NULL; @@ -1308,40 +1324,40 @@ virNodeDevCapPCIDevParseXML(xmlXPathContextPtr ctxt, orignode = ctxt->node; ctxt->node = node; - if (virNodeDevCapsDefParseULong("number(./domain[1])", ctxt, - &data->pci_dev.domain, def, - _("no PCI domain ID supplied for '%s'"), - _("invalid PCI domain ID supplied for '%s'")) < 0) + if (nodeDevCapsDefParseULong("number(./domain[1])", ctxt, + &data->pci_dev.domain, def, + _("no PCI domain ID supplied for '%s'"), + _("invalid PCI domain ID supplied for '%s'")) < 0) goto out; - if (virNodeDevCapsDefParseULong("number(./bus[1])", ctxt, - &data->pci_dev.bus, def, - _("no PCI bus ID supplied for '%s'"), - _("invalid PCI bus ID supplied for '%s'")) < 0) + if (nodeDevCapsDefParseULong("number(./bus[1])", ctxt, + &data->pci_dev.bus, def, + _("no PCI bus ID supplied for '%s'"), + _("invalid PCI bus ID supplied for '%s'")) < 0) goto out; - if (virNodeDevCapsDefParseULong("number(./slot[1])", ctxt, - &data->pci_dev.slot, def, - _("no PCI slot ID supplied for '%s'"), - _("invalid PCI slot ID supplied for '%s'")) < 0) + if (nodeDevCapsDefParseULong("number(./slot[1])", ctxt, + &data->pci_dev.slot, def, + _("no PCI slot ID supplied for '%s'"), + _("invalid PCI slot ID supplied for '%s'")) < 0) goto out; - if (virNodeDevCapsDefParseULong("number(./function[1])", ctxt, - &data->pci_dev.function, def, - _("no PCI function ID supplied for '%s'"), - _("invalid PCI function ID supplied for '%s'")) < 0) + if (nodeDevCapsDefParseULong("number(./function[1])", ctxt, + &data->pci_dev.function, def, + _("no PCI function ID supplied for '%s'"), + _("invalid PCI function ID supplied for '%s'")) < 0) goto out; - if (virNodeDevCapsDefParseHexId("string(./vendor[1]/@id)", ctxt, - &data->pci_dev.vendor, def, - _("no PCI vendor ID supplied for '%s'"), - _("invalid PCI vendor ID supplied for '%s'")) < 0) + if (nodeDevCapsDefParseHexId("string(./vendor[1]/@id)", ctxt, + &data->pci_dev.vendor, def, + _("no PCI vendor ID supplied for '%s'"), + _("invalid PCI vendor ID supplied for '%s'")) < 0) goto out; - if (virNodeDevCapsDefParseHexId("string(./product[1]/@id)", ctxt, - &data->pci_dev.product, def, - _("no PCI product ID supplied for '%s'"), - _("invalid PCI product ID supplied for '%s'")) < 0) + if (nodeDevCapsDefParseHexId("string(./product[1]/@id)", ctxt, + &data->pci_dev.product, def, + _("no PCI product ID supplied for '%s'"), + _("invalid PCI product ID supplied for '%s'")) < 0) goto out; data->pci_dev.vendor_name = virXPathString("string(./vendor[1])", ctxt); @@ -1351,30 +1367,30 @@ virNodeDevCapPCIDevParseXML(xmlXPathContextPtr ctxt, goto out; for (i = 0; i < n; i++) { - if (virNodeDevPCICapabilityParseXML(ctxt, nodes[i], data) < 0) + if (nodeDevPCICapabilityParseXML(ctxt, nodes[i], data) < 0) goto out; } VIR_FREE(nodes); if ((iommuGroupNode = virXPathNode("./iommuGroup[1]", ctxt))) { - if (virNodeDevCapPCIDevIommuGroupParseXML(ctxt, iommuGroupNode, - data) < 0) { + if (nodeDevCapPCIDevIommuGroupParseXML(ctxt, iommuGroupNode, + data) < 0) { goto out; } } /* The default value is -1 since zero is valid NUMA node number */ data->pci_dev.numa_node = -1; - if (virNodeDevCapsDefParseIntOptional("number(./numa[1]/@node)", ctxt, - &data->pci_dev.numa_node, def, - _("invalid NUMA node ID supplied for '%s'")) < 0) + if (nodeDevCapsDefParseIntOptional("number(./numa[1]/@node)", ctxt, + &data->pci_dev.numa_node, def, + _("invalid NUMA node ID supplied for '%s'")) < 0) goto out; if ((pciExpress = virXPathNode("./pci-express[1]", ctxt))) { if (VIR_ALLOC(pci_express) < 0) goto out; - if (virPCIEDeviceInfoParseXML(ctxt, pciExpress, pci_express) < 0) + if (nodeDevPCIEDeviceInfoParseXML(ctxt, pciExpress, pci_express) < 0) goto out; data->pci_dev.pci_express = pci_express; @@ -1391,11 +1407,12 @@ virNodeDevCapPCIDevParseXML(xmlXPathContextPtr ctxt, return ret; } + static int -virNodeDevCapSystemParseXML(xmlXPathContextPtr ctxt, - virNodeDeviceDefPtr def, - xmlNodePtr node, - virNodeDevCapDataPtr data) +nodeDevCapSystemParseXML(xmlXPathContextPtr ctxt, + virNodeDeviceDefPtr def, + xmlNodePtr node, + virNodeDevCapDataPtr data) { xmlNodePtr orignode; int ret = -1; @@ -1435,12 +1452,13 @@ virNodeDevCapSystemParseXML(xmlXPathContextPtr ctxt, return ret; } + static virNodeDevCapsDefPtr -virNodeDevCapsDefParseXML(xmlXPathContextPtr ctxt, - virNodeDeviceDefPtr def, - xmlNodePtr node, - int create, - const char *virt_type) +nodeDevCapsDefParseXML(xmlXPathContextPtr ctxt, + virNodeDeviceDefPtr def, + xmlNodePtr node, + int create, + const char *virt_type) { virNodeDevCapsDefPtr caps; char *tmp; @@ -1467,37 +1485,37 @@ virNodeDevCapsDefParseXML(xmlXPathContextPtr ctxt, switch (caps->data.type) { case VIR_NODE_DEV_CAP_SYSTEM: - ret = virNodeDevCapSystemParseXML(ctxt, def, node, &caps->data); + ret = nodeDevCapSystemParseXML(ctxt, def, node, &caps->data); break; case VIR_NODE_DEV_CAP_PCI_DEV: - ret = virNodeDevCapPCIDevParseXML(ctxt, def, node, &caps->data); + ret = nodeDevCapPCIDevParseXML(ctxt, def, node, &caps->data); break; case VIR_NODE_DEV_CAP_USB_DEV: - ret = virNodeDevCapUSBDevParseXML(ctxt, def, node, &caps->data); + ret = nodeDevCapUSBDevParseXML(ctxt, def, node, &caps->data); break; case VIR_NODE_DEV_CAP_USB_INTERFACE: - ret = virNodeDevCapUSBInterfaceParseXML(ctxt, def, node, &caps->data); + ret = nodeDevCapUSBInterfaceParseXML(ctxt, def, node, &caps->data); break; case VIR_NODE_DEV_CAP_NET: - ret = virNodeDevCapNetParseXML(ctxt, def, node, &caps->data); + ret = nodeDevCapNetParseXML(ctxt, def, node, &caps->data); break; case VIR_NODE_DEV_CAP_SCSI_HOST: - ret = virNodeDevCapSCSIHostParseXML(ctxt, def, node, - &caps->data, - create, - virt_type); + ret = nodeDevCapSCSIHostParseXML(ctxt, def, node, + &caps->data, + create, + virt_type); break; case VIR_NODE_DEV_CAP_SCSI_TARGET: - ret = virNodeDevCapSCSITargetParseXML(ctxt, def, node, &caps->data); + ret = nodeDevCapSCSITargetParseXML(ctxt, def, node, &caps->data); break; case VIR_NODE_DEV_CAP_SCSI: - ret = virNodeDevCapSCSIParseXML(ctxt, def, node, &caps->data); + ret = nodeDevCapSCSIParseXML(ctxt, def, node, &caps->data); break; case VIR_NODE_DEV_CAP_STORAGE: - ret = virNodeDevCapStorageParseXML(ctxt, def, node, &caps->data); + ret = nodeDevCapStorageParseXML(ctxt, def, node, &caps->data); break; case VIR_NODE_DEV_CAP_DRM: - ret = virNodeDevCapDRMParseXML(ctxt, def, node, &caps->data); + ret = nodeDevCapDRMParseXML(ctxt, def, node, &caps->data); break; case VIR_NODE_DEV_CAP_FC_HOST: case VIR_NODE_DEV_CAP_VPORTS: @@ -1519,10 +1537,11 @@ virNodeDevCapsDefParseXML(xmlXPathContextPtr ctxt, return NULL; } + static virNodeDeviceDefPtr -virNodeDeviceDefParseXML(xmlXPathContextPtr ctxt, - int create, - const char *virt_type) +nodeDeviceDefParseXML(xmlXPathContextPtr ctxt, + int create, + const char *virt_type) { virNodeDeviceDefPtr def; virNodeDevCapsDefPtr *next_cap; @@ -1614,10 +1633,10 @@ virNodeDeviceDefParseXML(xmlXPathContextPtr ctxt, next_cap = &def->caps; for (i = 0; i < n; i++) { - *next_cap = virNodeDevCapsDefParseXML(ctxt, def, - nodes[i], - create, - virt_type); + *next_cap = nodeDevCapsDefParseXML(ctxt, def, + nodes[i], + create, + virt_type); if (!*next_cap) goto error; @@ -1633,6 +1652,7 @@ virNodeDeviceDefParseXML(xmlXPathContextPtr ctxt, return NULL; } + virNodeDeviceDefPtr virNodeDeviceDefParseNode(xmlDocPtr xml, xmlNodePtr root, @@ -1657,18 +1677,19 @@ virNodeDeviceDefParseNode(xmlDocPtr xml, } ctxt->node = root; - def = virNodeDeviceDefParseXML(ctxt, create, virt_type); + def = nodeDeviceDefParseXML(ctxt, create, virt_type); cleanup: xmlXPathFreeContext(ctxt); return def; } + static virNodeDeviceDefPtr -virNodeDeviceDefParse(const char *str, - const char *filename, - int create, - const char *virt_type) +nodeDeviceDefParse(const char *str, + const char *filename, + int create, + const char *virt_type) { xmlDocPtr xml; virNodeDeviceDefPtr def = NULL; @@ -1682,22 +1703,25 @@ virNodeDeviceDefParse(const char *str, return def; } + virNodeDeviceDefPtr virNodeDeviceDefParseString(const char *str, int create, const char *virt_type) { - return virNodeDeviceDefParse(str, NULL, create, virt_type); + return nodeDeviceDefParse(str, NULL, create, virt_type); } + virNodeDeviceDefPtr virNodeDeviceDefParseFile(const char *filename, int create, const char *virt_type) { - return virNodeDeviceDefParse(NULL, filename, create, virt_type); + return nodeDeviceDefParse(NULL, filename, create, virt_type); } + /* * Return fc_host dev's WWNN and WWPN */ diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 83f7217..a416fb8 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -33,7 +33,9 @@ VIR_LOG_INIT("conf.virnodedeviceobj"); -int virNodeDeviceHasCap(const virNodeDeviceObj *dev, const char *cap) +int +virNodeDeviceHasCap(const virNodeDeviceObj *dev, + const char *cap) { virNodeDevCapsDefPtr caps = dev->def->caps; const char *fc_host_cap = @@ -58,7 +60,7 @@ int virNodeDeviceHasCap(const virNodeDeviceObj *dev, const char *cap) } -/* virNodeDeviceFindFCCapDef: +/* nodeDeviceFindFCCapDef: * @dev: Pointer to current device * * Search the device object 'caps' array for fc_host capability. @@ -67,7 +69,7 @@ int virNodeDeviceHasCap(const virNodeDeviceObj *dev, const char *cap) * Pointer to the caps or NULL if not found */ static virNodeDevCapsDefPtr -virNodeDeviceFindFCCapDef(const virNodeDeviceObj *dev) +nodeDeviceFindFCCapDef(const virNodeDeviceObj *dev) { virNodeDevCapsDefPtr caps = dev->def->caps; @@ -125,8 +127,9 @@ virNodeDeviceFindBySysfsPath(virNodeDeviceObjListPtr devs, } -virNodeDeviceObjPtr virNodeDeviceFindByName(virNodeDeviceObjListPtr devs, - const char *name) +virNodeDeviceObjPtr +virNodeDeviceFindByName(virNodeDeviceObjListPtr devs, + const char *name) { size_t i; @@ -142,16 +145,16 @@ virNodeDeviceObjPtr virNodeDeviceFindByName(virNodeDeviceObjListPtr devs, static virNodeDeviceObjPtr -virNodeDeviceFindByWWNs(virNodeDeviceObjListPtr devs, - const char *parent_wwnn, - const char *parent_wwpn) +nodeDeviceFindByWWNs(virNodeDeviceObjListPtr devs, + const char *parent_wwnn, + const char *parent_wwpn) { size_t i; for (i = 0; i < devs->count; i++) { virNodeDevCapsDefPtr cap; virNodeDeviceObjLock(devs->objs[i]); - if ((cap = virNodeDeviceFindFCCapDef(devs->objs[i])) && + if ((cap = nodeDeviceFindFCCapDef(devs->objs[i])) && STREQ_NULLABLE(cap->data.scsi_host.wwnn, parent_wwnn) && STREQ_NULLABLE(cap->data.scsi_host.wwpn, parent_wwpn)) return devs->objs[i]; @@ -163,15 +166,15 @@ virNodeDeviceFindByWWNs(virNodeDeviceObjListPtr devs, static virNodeDeviceObjPtr -virNodeDeviceFindByFabricWWN(virNodeDeviceObjListPtr devs, - const char *parent_fabric_wwn) +nodeDeviceFindByFabricWWN(virNodeDeviceObjListPtr devs, + const char *parent_fabric_wwn) { size_t i; for (i = 0; i < devs->count; i++) { virNodeDevCapsDefPtr cap; virNodeDeviceObjLock(devs->objs[i]); - if ((cap = virNodeDeviceFindFCCapDef(devs->objs[i])) && + if ((cap = nodeDeviceFindFCCapDef(devs->objs[i])) && STREQ_NULLABLE(cap->data.scsi_host.fabric_wwn, parent_fabric_wwn)) return devs->objs[i]; virNodeDeviceObjUnlock(devs->objs[i]); @@ -182,8 +185,8 @@ virNodeDeviceFindByFabricWWN(virNodeDeviceObjListPtr devs, static virNodeDeviceObjPtr -virNodeDeviceFindByCap(virNodeDeviceObjListPtr devs, - const char *cap) +nodeDeviceFindByCap(virNodeDeviceObjListPtr devs, + const char *cap) { size_t i; @@ -198,7 +201,8 @@ virNodeDeviceFindByCap(virNodeDeviceObjListPtr devs, } -void virNodeDeviceObjFree(virNodeDeviceObjPtr dev) +void +virNodeDeviceObjFree(virNodeDeviceObjPtr dev) { if (!dev) return; @@ -212,7 +216,9 @@ void virNodeDeviceObjFree(virNodeDeviceObjPtr dev) VIR_FREE(dev); } -void virNodeDeviceObjListFree(virNodeDeviceObjListPtr devs) + +void +virNodeDeviceObjListFree(virNodeDeviceObjListPtr devs) { size_t i; for (i = 0; i < devs->count; i++) @@ -221,8 +227,10 @@ void virNodeDeviceObjListFree(virNodeDeviceObjListPtr devs) devs->count = 0; } -virNodeDeviceObjPtr virNodeDeviceAssignDef(virNodeDeviceObjListPtr devs, - virNodeDeviceDefPtr def) + +virNodeDeviceObjPtr +virNodeDeviceAssignDef(virNodeDeviceObjListPtr devs, + virNodeDeviceDefPtr def) { virNodeDeviceObjPtr device; @@ -254,8 +262,10 @@ virNodeDeviceObjPtr virNodeDeviceAssignDef(virNodeDeviceObjListPtr devs, } -void virNodeDeviceObjRemove(virNodeDeviceObjListPtr devs, - virNodeDeviceObjPtr *dev) + +void +virNodeDeviceObjRemove(virNodeDeviceObjListPtr devs, + virNodeDeviceObjPtr *dev) { size_t i; @@ -279,7 +289,7 @@ void virNodeDeviceObjRemove(virNodeDeviceObjListPtr devs, /* * Return the NPIV dev's parent device name */ -/* virNodeDeviceFindFCParentHost: +/* nodeDeviceFindFCParentHost: * @parent: Pointer to node device object * * Search the capabilities for the device to find the FC capabilities @@ -289,7 +299,7 @@ void virNodeDeviceObjRemove(virNodeDeviceObjListPtr devs, * parent_host value on success (>= 0), -1 otherwise. */ static int -virNodeDeviceFindFCParentHost(virNodeDeviceObjPtr parent) +nodeDeviceFindFCParentHost(virNodeDeviceObjPtr parent) { virNodeDevCapsDefPtr cap = virNodeDeviceFindVPORTCapDef(parent); @@ -306,9 +316,9 @@ virNodeDeviceFindFCParentHost(virNodeDeviceObjPtr parent) static int -virNodeDeviceGetParentHostByParent(virNodeDeviceObjListPtr devs, - const char *dev_name, - const char *parent_name) +nodeDeviceGetParentHostByParent(virNodeDeviceObjListPtr devs, + const char *dev_name, + const char *parent_name) { virNodeDeviceObjPtr parent = NULL; int ret; @@ -320,7 +330,7 @@ virNodeDeviceGetParentHostByParent(virNodeDeviceObjListPtr devs, return -1; } - ret = virNodeDeviceFindFCParentHost(parent); + ret = nodeDeviceFindFCParentHost(parent); virNodeDeviceObjUnlock(parent); @@ -329,22 +339,22 @@ virNodeDeviceGetParentHostByParent(virNodeDeviceObjListPtr devs, static int -virNodeDeviceGetParentHostByWWNs(virNodeDeviceObjListPtr devs, - const char *dev_name, - const char *parent_wwnn, - const char *parent_wwpn) +nodeDeviceGetParentHostByWWNs(virNodeDeviceObjListPtr devs, + const char *dev_name, + const char *parent_wwnn, + const char *parent_wwpn) { virNodeDeviceObjPtr parent = NULL; int ret; - if (!(parent = virNodeDeviceFindByWWNs(devs, parent_wwnn, parent_wwpn))) { + if (!(parent = nodeDeviceFindByWWNs(devs, parent_wwnn, parent_wwpn))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not find parent device for '%s'"), dev_name); return -1; } - ret = virNodeDeviceFindFCParentHost(parent); + ret = nodeDeviceFindFCParentHost(parent); virNodeDeviceObjUnlock(parent); @@ -353,21 +363,21 @@ virNodeDeviceGetParentHostByWWNs(virNodeDeviceObjListPtr devs, static int -virNodeDeviceGetParentHostByFabricWWN(virNodeDeviceObjListPtr devs, - const char *dev_name, - const char *parent_fabric_wwn) +nodeDeviceGetParentHostByFabricWWN(virNodeDeviceObjListPtr devs, + const char *dev_name, + const char *parent_fabric_wwn) { virNodeDeviceObjPtr parent = NULL; int ret; - if (!(parent = virNodeDeviceFindByFabricWWN(devs, parent_fabric_wwn))) { + if (!(parent = nodeDeviceFindByFabricWWN(devs, parent_fabric_wwn))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not find parent device for '%s'"), dev_name); return -1; } - ret = virNodeDeviceFindFCParentHost(parent); + ret = nodeDeviceFindFCParentHost(parent); virNodeDeviceObjUnlock(parent); @@ -376,19 +386,19 @@ virNodeDeviceGetParentHostByFabricWWN(virNodeDeviceObjListPtr devs, static int -virNodeDeviceFindVportParentHost(virNodeDeviceObjListPtr devs) +nodeDeviceFindVportParentHost(virNodeDeviceObjListPtr devs) { virNodeDeviceObjPtr parent = NULL; const char *cap = virNodeDevCapTypeToString(VIR_NODE_DEV_CAP_VPORTS); int ret; - if (!(parent = virNodeDeviceFindByCap(devs, cap))) { + if (!(parent = nodeDeviceFindByCap(devs, cap))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not find any vport capable device")); return -1; } - ret = virNodeDeviceFindFCParentHost(parent); + ret = nodeDeviceFindFCParentHost(parent); virNodeDeviceObjUnlock(parent); @@ -404,38 +414,42 @@ virNodeDeviceGetParentHost(virNodeDeviceObjListPtr devs, int parent_host = -1; if (def->parent) { - parent_host = virNodeDeviceGetParentHostByParent(devs, def->name, - def->parent); + parent_host = nodeDeviceGetParentHostByParent(devs, def->name, + def->parent); } else if (def->parent_wwnn && def->parent_wwpn) { - parent_host = virNodeDeviceGetParentHostByWWNs(devs, def->name, - def->parent_wwnn, - def->parent_wwpn); + parent_host = nodeDeviceGetParentHostByWWNs(devs, def->name, + def->parent_wwnn, + def->parent_wwpn); } else if (def->parent_fabric_wwn) { parent_host = - virNodeDeviceGetParentHostByFabricWWN(devs, def->name, - def->parent_fabric_wwn); + nodeDeviceGetParentHostByFabricWWN(devs, def->name, + def->parent_fabric_wwn); } else if (create == CREATE_DEVICE) { /* Try to find a vport capable scsi_host when no parent supplied */ - parent_host = virNodeDeviceFindVportParentHost(devs); + parent_host = nodeDeviceFindVportParentHost(devs); } return parent_host; } -void virNodeDeviceObjLock(virNodeDeviceObjPtr obj) +void +virNodeDeviceObjLock(virNodeDeviceObjPtr obj) { virMutexLock(&obj->lock); } -void virNodeDeviceObjUnlock(virNodeDeviceObjPtr obj) + +void +virNodeDeviceObjUnlock(virNodeDeviceObjPtr obj) { virMutexUnlock(&obj->lock); } + static bool -virNodeDeviceCapMatch(virNodeDeviceObjPtr devobj, - int type) +nodeDeviceCapMatch(virNodeDeviceObjPtr devobj, + int type) { virNodeDevCapsDefPtr cap = NULL; @@ -459,11 +473,12 @@ virNodeDeviceCapMatch(virNodeDeviceObjPtr devobj, return false; } + #define MATCH(FLAG) ((flags & (VIR_CONNECT_LIST_NODE_DEVICES_CAP_ ## FLAG)) && \ - virNodeDeviceCapMatch(devobj, VIR_NODE_DEV_CAP_ ## FLAG)) + nodeDeviceCapMatch(devobj, VIR_NODE_DEV_CAP_ ## FLAG)) static bool -virNodeDeviceMatch(virNodeDeviceObjPtr devobj, - unsigned int flags) +nodeDeviceMatch(virNodeDeviceObjPtr devobj, + unsigned int flags) { /* filter by cap type */ if (flags & VIR_CONNECT_LIST_NODE_DEVICES_FILTERS_CAP) { @@ -487,6 +502,7 @@ virNodeDeviceMatch(virNodeDeviceObjPtr devobj, } #undef MATCH + int virNodeDeviceObjListExport(virConnectPtr conn, virNodeDeviceObjList devobjs, @@ -507,7 +523,7 @@ virNodeDeviceObjListExport(virConnectPtr conn, virNodeDeviceObjPtr devobj = devobjs.objs[i]; virNodeDeviceObjLock(devobj); if ((!filter || filter(conn, devobj->def)) && - virNodeDeviceMatch(devobj, flags)) { + nodeDeviceMatch(devobj, flags)) { if (devices) { if (!(device = virGetNodeDevice(conn, devobj->def->name)) || VIR_STRDUP(device->parent, devobj->def->parent) < 0) { -- 2.9.3 -- libvir-list mailing list libvir-list(a)redhat.com https://www.redhat.com/mailman/listinfo/libvir-list

Use "virNodeDeviceObj" as a prefix for any external API in virnodedeviceobj Signed-off-by: John Ferlan <jferlan(a)redhat.com&gt; --- src/conf/virnodedeviceobj.c | 28 ++++++++++++++-------------- src/conf/virnodedeviceobj.h | 18 +++++++++--------- src/node_device/node_device_driver.c | 24 ++++++++++++------------ src/node_device/node_device_hal.c | 10 ++++------ src/node_device/node_device_udev.c | 12 ++++++------ src/test/test_driver.c | 28 ++++++++++++++-------------- 6 files changed, 59 insertions(+), 61 deletions(-)

diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index a416fb8..ee0b2ae 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -34,8 +34,8 @@ VIR_LOG_INIT("conf.virnodedeviceobj"); int -virNodeDeviceHasCap(const virNodeDeviceObj *dev, - const char *cap) +virNodeDeviceObjHasCap(const virNodeDeviceObj *dev, + const char *cap) { virNodeDevCapsDefPtr caps = dev->def->caps; const char *fc_host_cap = @@ -109,8 +109,8 @@ virNodeDeviceFindVPORTCapDef(const virNodeDeviceObj *dev) virNodeDeviceObjPtr -virNodeDeviceFindBySysfsPath(virNodeDeviceObjListPtr devs, - const char *sysfs_path) +virNodeDeviceObjFindBySysfsPath(virNodeDeviceObjListPtr devs, + const char *sysfs_path) { size_t i; @@ -128,8 +128,8 @@ virNodeDeviceFindBySysfsPath(virNodeDeviceObjListPtr devs, virNodeDeviceObjPtr -virNodeDeviceFindByName(virNodeDeviceObjListPtr devs, - const char *name) +virNodeDeviceObjFindByName(virNodeDeviceObjListPtr devs, + const char *name) { size_t i; @@ -192,7 +192,7 @@ nodeDeviceFindByCap(virNodeDeviceObjListPtr devs, for (i = 0; i < devs->count; i++) { virNodeDeviceObjLock(devs->objs[i]); - if (virNodeDeviceHasCap(devs->objs[i], cap)) + if (virNodeDeviceObjHasCap(devs->objs[i], cap)) return devs->objs[i]; virNodeDeviceObjUnlock(devs->objs[i]); } @@ -229,12 +229,12 @@ virNodeDeviceObjListFree(virNodeDeviceObjListPtr devs) virNodeDeviceObjPtr -virNodeDeviceAssignDef(virNodeDeviceObjListPtr devs, - virNodeDeviceDefPtr def) +virNodeDeviceObjAssignDef(virNodeDeviceObjListPtr devs, + virNodeDeviceDefPtr def) { virNodeDeviceObjPtr device; - if ((device = virNodeDeviceFindByName(devs, def->name))) { + if ((device = virNodeDeviceObjFindByName(devs, def->name))) { virNodeDeviceDefFree(device->def); device->def = def; return device; @@ -323,7 +323,7 @@ nodeDeviceGetParentHostByParent(virNodeDeviceObjListPtr devs, virNodeDeviceObjPtr parent = NULL; int ret; - if (!(parent = virNodeDeviceFindByName(devs, parent_name))) { + if (!(parent = virNodeDeviceObjFindByName(devs, parent_name))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not find parent device for '%s'"), dev_name); @@ -407,9 +407,9 @@ nodeDeviceFindVportParentHost(virNodeDeviceObjListPtr devs) int -virNodeDeviceGetParentHost(virNodeDeviceObjListPtr devs, - virNodeDeviceDefPtr def, - int create) +virNodeDeviceObjGetParentHost(virNodeDeviceObjListPtr devs, + virNodeDeviceDefPtr def, + int create) { int parent_host = -1; diff --git a/src/conf/virnodedeviceobj.h b/src/conf/virnodedeviceobj.h index 6ad7fb1..b4409b7 100644 --- a/src/conf/virnodedeviceobj.h +++ b/src/conf/virnodedeviceobj.h @@ -40,24 +40,24 @@ struct _virNodeDeviceDriverState { }; -int virNodeDeviceHasCap(const virNodeDeviceObj *dev, const char *cap); +int virNodeDeviceObjHasCap(const virNodeDeviceObj *dev, const char *cap); -virNodeDeviceObjPtr virNodeDeviceFindByName(virNodeDeviceObjListPtr devs, +virNodeDeviceObjPtr virNodeDeviceObjFindByName(virNodeDeviceObjListPtr devs, const char *name); virNodeDeviceObjPtr -virNodeDeviceFindBySysfsPath(virNodeDeviceObjListPtr devs, - const char *sysfs_path) +virNodeDeviceObjFindBySysfsPath(virNodeDeviceObjListPtr devs, + const char *sysfs_path) ATTRIBUTE_NONNULL(2); -virNodeDeviceObjPtr virNodeDeviceAssignDef(virNodeDeviceObjListPtr devs, - virNodeDeviceDefPtr def); +virNodeDeviceObjPtr virNodeDeviceObjAssignDef(virNodeDeviceObjListPtr devs, + virNodeDeviceDefPtr def); void virNodeDeviceObjRemove(virNodeDeviceObjListPtr devs, virNodeDeviceObjPtr *dev); -int virNodeDeviceGetParentHost(virNodeDeviceObjListPtr devs, - virNodeDeviceDefPtr def, - int create); +int virNodeDeviceObjGetParentHost(virNodeDeviceObjListPtr devs, + virNodeDeviceDefPtr def, + int create); void virNodeDeviceObjFree(virNodeDeviceObjPtr dev); diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 5d57006..0869b1b 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -173,7 +173,7 @@ nodeNumOfDevices(virConnectPtr conn, virNodeDeviceObjLock(obj); if (virNodeNumOfDevicesCheckACL(conn, obj->def) && ((cap == NULL) || - virNodeDeviceHasCap(obj, cap))) + virNodeDeviceObjHasCap(obj, cap))) ++ndevs; virNodeDeviceObjUnlock(obj); } @@ -202,7 +202,7 @@ nodeListDevices(virConnectPtr conn, virNodeDeviceObjLock(obj); if (virNodeListDevicesCheckACL(conn, obj->def) && (cap == NULL || - virNodeDeviceHasCap(obj, cap))) { + virNodeDeviceObjHasCap(obj, cap))) { if (VIR_STRDUP(names[ndevs++], obj->def->name) < 0) { virNodeDeviceObjUnlock(obj); goto failure; @@ -249,7 +249,7 @@ nodeDeviceLookupByName(virConnectPtr conn, const char *name) virNodeDevicePtr ret = NULL; nodeDeviceLock(); - obj = virNodeDeviceFindByName(&driver->devs, name); + obj = virNodeDeviceObjFindByName(&driver->devs, name); nodeDeviceUnlock(); if (!obj) { @@ -337,7 +337,7 @@ nodeDeviceGetXMLDesc(virNodeDevicePtr dev, virCheckFlags(0, NULL); nodeDeviceLock(); - obj = virNodeDeviceFindByName(&driver->devs, dev->name); + obj = virNodeDeviceObjFindByName(&driver->devs, dev->name); nodeDeviceUnlock(); if (!obj) { @@ -370,7 +370,7 @@ nodeDeviceGetParent(virNodeDevicePtr dev) char *ret = NULL; nodeDeviceLock(); - obj = virNodeDeviceFindByName(&driver->devs, dev->name); + obj = virNodeDeviceObjFindByName(&driver->devs, dev->name); nodeDeviceUnlock(); if (!obj) { @@ -407,7 +407,7 @@ nodeDeviceNumOfCaps(virNodeDevicePtr dev) int ret = -1; nodeDeviceLock(); - obj = virNodeDeviceFindByName(&driver->devs, dev->name); + obj = virNodeDeviceObjFindByName(&driver->devs, dev->name); nodeDeviceUnlock(); if (!obj) { @@ -452,7 +452,7 @@ nodeDeviceListCaps(virNodeDevicePtr dev, char **const names, int maxnames) int ret = -1; nodeDeviceLock(); - obj = virNodeDeviceFindByName(&driver->devs, dev->name); + obj = virNodeDeviceObjFindByName(&driver->devs, dev->name); nodeDeviceUnlock(); if (!obj) { @@ -590,8 +590,8 @@ nodeDeviceCreateXML(virConnectPtr conn, if (virNodeDeviceGetWWNs(def, &wwnn, &wwpn) == -1) goto cleanup; - if ((parent_host = virNodeDeviceGetParentHost(&driver->devs, def, - CREATE_DEVICE)) < 0) + if ((parent_host = virNodeDeviceObjGetParentHost(&driver->devs, def, + CREATE_DEVICE)) < 0) goto cleanup; if (virVHBAManageVport(parent_host, wwpn, wwnn, VPORT_CREATE) < 0) @@ -625,7 +625,7 @@ nodeDeviceDestroy(virNodeDevicePtr dev) int parent_host = -1; nodeDeviceLock(); - if (!(obj = virNodeDeviceFindByName(&driver->devs, dev->name))) { + if (!(obj = virNodeDeviceObjFindByName(&driver->devs, dev->name))) { virReportError(VIR_ERR_NO_NODE_DEVICE, _("no node device with matching name '%s'"), dev->name); @@ -645,8 +645,8 @@ nodeDeviceDestroy(virNodeDevicePtr dev) def = obj->def; virNodeDeviceObjUnlock(obj); obj = NULL; - if ((parent_host = virNodeDeviceGetParentHost(&driver->devs, def, - EXISTING_DEVICE)) < 0) + if ((parent_host = virNodeDeviceObjGetParentHost(&driver->devs, def, + EXISTING_DEVICE)) < 0) goto cleanup; if (virVHBAManageVport(parent_host, wwpn, wwnn, VPORT_DELETE) < 0) diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index fb7bf25..f17618c 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -493,9 +493,7 @@ dev_create(const char *udi) /* Some devices don't have a path in sysfs, so ignore failure */ (void)get_str_prop(ctx, udi, "linux.sysfs_path", &devicePath); - dev = virNodeDeviceAssignDef(&driver->devs, - def); - + dev = virNodeDeviceObjAssignDef(&driver->devs, def); if (!dev) { VIR_FREE(devicePath); goto failure; @@ -525,7 +523,7 @@ dev_refresh(const char *udi) virNodeDeviceObjPtr dev; nodeDeviceLock(); - dev = virNodeDeviceFindByName(&driver->devs, name); + dev = virNodeDeviceObjFindByName(&driver->devs, name); if (dev) { /* Simply "rediscover" device -- incrementally handling changes * to sub-capabilities (like net.80203) is nasty ... so avoid it. @@ -557,7 +555,7 @@ device_removed(LibHalContext *ctx ATTRIBUTE_UNUSED, virNodeDeviceObjPtr dev; nodeDeviceLock(); - dev = virNodeDeviceFindByName(&driver->devs, name); + dev = virNodeDeviceObjFindByName(&driver->devs, name); VIR_DEBUG("%s", name); if (dev) virNodeDeviceObjRemove(&driver->devs, &dev); @@ -575,7 +573,7 @@ device_cap_added(LibHalContext *ctx, virNodeDeviceObjPtr dev; nodeDeviceLock(); - dev = virNodeDeviceFindByName(&driver->devs, name); + dev = virNodeDeviceObjFindByName(&driver->devs, name); nodeDeviceUnlock(); VIR_DEBUG("%s %s", cap, name); if (dev) { diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 1016075..6bc0a53 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1099,7 +1099,7 @@ static int udevRemoveOneDevice(struct udev_device *device) int ret = -1; name = udev_device_get_syspath(device); - dev = virNodeDeviceFindBySysfsPath(&driver->devs, name); + dev = virNodeDeviceObjFindBySysfsPath(&driver->devs, name); if (!dev) { VIR_DEBUG("Failed to find device to remove that has udev name '%s'", @@ -1146,8 +1146,8 @@ static int udevSetParent(struct udev_device *device, goto cleanup; } - dev = virNodeDeviceFindBySysfsPath(&driver->devs, - parent_sysfs_path); + dev = virNodeDeviceObjFindBySysfsPath(&driver->devs, + parent_sysfs_path); if (dev != NULL) { if (VIR_STRDUP(def->parent, dev->def->name) < 0) { virNodeDeviceObjUnlock(dev); @@ -1203,7 +1203,7 @@ static int udevAddOneDevice(struct udev_device *device) if (udevSetParent(device, def) != 0) goto cleanup; - dev = virNodeDeviceFindByName(&driver->devs, def->name); + dev = virNodeDeviceObjFindByName(&driver->devs, def->name); if (dev) { virNodeDeviceObjUnlock(dev); new_device = false; @@ -1211,7 +1211,7 @@ static int udevAddOneDevice(struct udev_device *device) /* If this is a device change, the old definition will be freed * and the current definition will take its place. */ - dev = virNodeDeviceAssignDef(&driver->devs, def); + dev = virNodeDeviceObjAssignDef(&driver->devs, def); if (dev == NULL) goto cleanup; @@ -1492,7 +1492,7 @@ static int udevSetupSystemDev(void) udevGetDMIData(&def->caps->data); #endif - dev = virNodeDeviceAssignDef(&driver->devs, def); + dev = virNodeDeviceObjAssignDef(&driver->devs, def); if (dev == NULL) goto cleanup; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index c6214c6..61c82b9 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1166,7 +1166,7 @@ testParseNodedevs(testDriverPtr privconn, if (!def) goto error; - if (!(obj = virNodeDeviceAssignDef(&privconn->devs, def))) { + if (!(obj = virNodeDeviceObjAssignDef(&privconn->devs, def))) { virNodeDeviceDefFree(def); goto error; } @@ -5424,7 +5424,7 @@ testNodeNumOfDevices(virConnectPtr conn, testDriverLock(driver); for (i = 0; i < driver->devs.count; i++) if ((cap == NULL) || - virNodeDeviceHasCap(driver->devs.objs[i], cap)) + virNodeDeviceObjHasCap(driver->devs.objs[i], cap)) ++ndevs; testDriverUnlock(driver); @@ -5448,7 +5448,7 @@ testNodeListDevices(virConnectPtr conn, for (i = 0; i < driver->devs.count && ndevs < maxnames; i++) { virNodeDeviceObjLock(driver->devs.objs[i]); if (cap == NULL || - virNodeDeviceHasCap(driver->devs.objs[i], cap)) { + virNodeDeviceObjHasCap(driver->devs.objs[i], cap)) { if (VIR_STRDUP(names[ndevs++], driver->devs.objs[i]->def->name) < 0) { virNodeDeviceObjUnlock(driver->devs.objs[i]); goto failure; @@ -5476,7 +5476,7 @@ testNodeDeviceLookupByName(virConnectPtr conn, const char *name) virNodeDevicePtr ret = NULL; testDriverLock(driver); - obj = virNodeDeviceFindByName(&driver->devs, name); + obj = virNodeDeviceObjFindByName(&driver->devs, name); testDriverUnlock(driver); if (!obj) { @@ -5508,7 +5508,7 @@ testNodeDeviceGetXMLDesc(virNodeDevicePtr dev, virCheckFlags(0, NULL); testDriverLock(driver); - obj = virNodeDeviceFindByName(&driver->devs, dev->name); + obj = virNodeDeviceObjFindByName(&driver->devs, dev->name); testDriverUnlock(driver); if (!obj) { @@ -5534,7 +5534,7 @@ testNodeDeviceGetParent(virNodeDevicePtr dev) char *ret = NULL; testDriverLock(driver); - obj = virNodeDeviceFindByName(&driver->devs, dev->name); + obj = virNodeDeviceObjFindByName(&driver->devs, dev->name); testDriverUnlock(driver); if (!obj) { @@ -5568,7 +5568,7 @@ testNodeDeviceNumOfCaps(virNodeDevicePtr dev) int ret = -1; testDriverLock(driver); - obj = virNodeDeviceFindByName(&driver->devs, dev->name); + obj = virNodeDeviceObjFindByName(&driver->devs, dev->name); testDriverUnlock(driver); if (!obj) { @@ -5599,7 +5599,7 @@ testNodeDeviceListCaps(virNodeDevicePtr dev, char **const names, int maxnames) int ret = -1; testDriverLock(driver); - obj = virNodeDeviceFindByName(&driver->devs, dev->name); + obj = virNodeDeviceObjFindByName(&driver->devs, dev->name); testDriverUnlock(driver); if (!obj) { @@ -5647,7 +5647,7 @@ testNodeDeviceMockCreateVport(testDriverPtr driver, * using the scsi_host11 definition, changing the name and the * scsi_host capability fields before calling virNodeDeviceAssignDef * to add the def to the node device objects list. */ - if (!(objcopy = virNodeDeviceFindByName(&driver->devs, "scsi_host11"))) + if (!(objcopy = virNodeDeviceObjFindByName(&driver->devs, "scsi_host11"))) goto cleanup; xml = virNodeDeviceDefFormat(objcopy->def); @@ -5687,7 +5687,7 @@ testNodeDeviceMockCreateVport(testDriverPtr driver, caps = caps->next; } - if (!(obj = virNodeDeviceAssignDef(&driver->devs, def))) + if (!(obj = virNodeDeviceObjAssignDef(&driver->devs, def))) goto cleanup; def = NULL; @@ -5730,7 +5730,7 @@ testNodeDeviceCreateXML(virConnectPtr conn, /* Unlike the "real" code we don't need the parent_host in order to * call virVHBAManageVport, but still let's make sure the code finds * something valid and no one messed up the mock environment. */ - if (virNodeDeviceGetParentHost(&driver->devs, def, CREATE_DEVICE) < 0) + if (virNodeDeviceObjGetParentHost(&driver->devs, def, CREATE_DEVICE) < 0) goto cleanup; /* In the real code, we'd call virVHBAManageVport followed by @@ -5772,7 +5772,7 @@ testNodeDeviceDestroy(virNodeDevicePtr dev) virObjectEventPtr event = NULL; testDriverLock(driver); - obj = virNodeDeviceFindByName(&driver->devs, dev->name); + obj = virNodeDeviceObjFindByName(&driver->devs, dev->name); testDriverUnlock(driver); if (!obj) { @@ -5796,8 +5796,8 @@ testNodeDeviceDestroy(virNodeDevicePtr dev) /* We do this just for basic validation, but also avoid finding a * vport capable HBA if for some reason our vHBA doesn't exist */ - if (virNodeDeviceGetParentHost(&driver->devs, obj->def, - EXISTING_DEVICE) < 0) { + if (virNodeDeviceObjGetParentHost(&driver->devs, obj->def, + EXISTING_DEVICE) < 0) { obj = NULL; goto out; }

On 03/01/2017 07:27 PM, John Ferlan wrote: > Use "virNodeDeviceObj" as a prefix for any external API in virnodedeviceobj > > Signed-off-by: John Ferlan <jferlan(a)redhat.com&gt; > --- > src/conf/virnodedeviceobj.c | 28 ++++++++++++++-------------- > src/conf/virnodedeviceobj.h | 18 +++++++++--------- > src/node_device/node_device_driver.c | 24 ++++++++++++------------ > src/node_device/node_device_hal.c | 10 ++++------ > src/node_device/node_device_udev.c | 12 ++++++------ > src/test/test_driver.c | 28 ++++++++++++++-------------- > 6 files changed, 59 insertions(+), 61 deletions(-) > Ugh... Forgot to commit: diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 8639979..aed1d3d 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -949,11 +949,11 @@ virDomainObjListRename; # conf/virnodedeviceobj.h -virNodeDeviceAssignDef; -virNodeDeviceFindByName; -virNodeDeviceFindBySysfsPath; -virNodeDeviceGetParentHost; -virNodeDeviceHasCap; +virNodeDeviceObjAssignDef; +virNodeDeviceObjFindByName; +virNodeDeviceObjFindBySysfsPath; +virNodeDeviceObjGetParentHost; +virNodeDeviceObjHasCap; virNodeDeviceObjListExport; virNodeDeviceObjListFree; virNodeDeviceObjLock; before sending...