shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-08-24 09:49:59 +03:00
Code Releases Activity

nodedev: Alter param to nodeDeviceUpdateCaps

Browse Source 
Rather than taking an virNodeDeviceObjPtr and dereffing the obj->def,
just pass the def.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan
2017-05-12 16:06:47 -04:00
parent 381bbfbbb6
commit 7c40ed4a84
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/node_device/node_device_driver.c
View File

@ -49,9 +49,9 @@ virNodeDeviceDriverStatePtr driver;
static int static int
nodeDeviceUpdateCaps(virNodeDeviceObjPtr dev) nodeDeviceUpdateCaps(virNodeDeviceDefPtr def)
{ {
virNodeDevCapsDefPtr cap = dev->def->caps; virNodeDevCapsDefPtr cap = def->caps;
while (cap) { while (cap) {
switch (cap->data.type) { switch (cap->data.type) {
@ -59,7 +59,7 @@ nodeDeviceUpdateCaps(virNodeDeviceObjPtr dev)
nodeDeviceSysfsGetSCSIHostCaps(&cap->data.scsi_host); nodeDeviceSysfsGetSCSIHostCaps(&cap->data.scsi_host);
break; break;
case VIR_NODE_DEV_CAP_SCSI_TARGET: case VIR_NODE_DEV_CAP_SCSI_TARGET:
nodeDeviceSysfsGetSCSITargetCaps(dev->def->sysfs_path, nodeDeviceSysfsGetSCSITargetCaps(def->sysfs_path,
&cap->data.scsi_target); &cap->data.scsi_target);
break; break;
case VIR_NODE_DEV_CAP_NET: case VIR_NODE_DEV_CAP_NET:
@ -70,7 +70,7 @@ nodeDeviceUpdateCaps(virNodeDeviceObjPtr dev)
return -1; return -1;
break; break;
case VIR_NODE_DEV_CAP_PCI_DEV: case VIR_NODE_DEV_CAP_PCI_DEV:
if (nodeDeviceSysfsGetPCIRelatedDevCaps(dev->def->sysfs_path, if (nodeDeviceSysfsGetPCIRelatedDevCaps(def->sysfs_path,
&cap->data.pci_dev) < 0) &cap->data.pci_dev) < 0)
return -1; return -1;
break; break;
@ -355,7 +355,7 @@ nodeDeviceGetXMLDesc(virNodeDevicePtr dev,
if (nodeDeviceUpdateDriverName(obj->def) < 0) if (nodeDeviceUpdateDriverName(obj->def) < 0)
goto cleanup; goto cleanup;
if (nodeDeviceUpdateCaps(obj) < 0) if (nodeDeviceUpdateCaps(obj->def) < 0)
goto cleanup; goto cleanup;
ret = virNodeDeviceDefFormat(obj->def); ret = virNodeDeviceDefFormat(obj->def);