External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 06:35:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

nodedev: udevProcessPCI: Drop syspath variable

Browse Source 
Since we have that information provided by @def which is not a private
object, there is really no need for the variable.

Signed-off-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Erik Skultety 2017-03-01 17:46:53 +01:00
parent bfaaaf108d
commit 9347652142
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/node_device/node_device_udev.c
View File

@ -316,7 +316,6 @@ static int udevTranslatePCIIds(unsigned int vendor,
static int udevProcessPCI(struct udev_device *device, static int udevProcessPCI(struct udev_device *device,
virNodeDeviceDefPtr def) virNodeDeviceDefPtr def)
{ {
const char *syspath = NULL;
virNodeDevCapPCIDevPtr pci_dev = &def->caps->data.pci_dev; virNodeDevCapPCIDevPtr pci_dev = &def->caps->data.pci_dev;
virPCIEDeviceInfoPtr pci_express = NULL; virPCIEDeviceInfoPtr pci_express = NULL;
virPCIDevicePtr pciDev = NULL; virPCIDevicePtr pciDev = NULL;
@ -324,19 +323,17 @@ static int udevProcessPCI(struct udev_device *device,
int ret = -1; int ret = -1;
char *p; char *p;
syspath = udev_device_get_syspath(device);
if (udevGetUintProperty(device, "PCI_CLASS", &pci_dev->class, 16) < 0) if (udevGetUintProperty(device, "PCI_CLASS", &pci_dev->class, 16) < 0)
goto cleanup; goto cleanup;
if ((p = strrchr(syspath, '/')) == NULL || if ((p = strrchr(def->sysfs_path, '/')) == NULL ||
virStrToLong_ui(p + 1, &p, 16, &pci_dev->domain) < 0 || p == NULL || virStrToLong_ui(p + 1, &p, 16, &pci_dev->domain) < 0 || p == NULL ||
virStrToLong_ui(p + 1, &p, 16, &pci_dev->bus) < 0 || p == NULL || virStrToLong_ui(p + 1, &p, 16, &pci_dev->bus) < 0 || p == NULL ||
virStrToLong_ui(p + 1, &p, 16, &pci_dev->slot) < 0 || p == NULL || virStrToLong_ui(p + 1, &p, 16, &pci_dev->slot) < 0 || p == NULL ||
virStrToLong_ui(p + 1, &p, 16, &pci_dev->function) < 0) { virStrToLong_ui(p + 1, &p, 16, &pci_dev->function) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("failed to parse the PCI address from sysfs path: '%s'"), _("failed to parse the PCI address from sysfs path: '%s'"),
syspath); def->sysfs_path);
goto cleanup; goto cleanup;
} }
@ -363,8 +360,7 @@ static int udevProcessPCI(struct udev_device *device,
&pci_dev->numa_node, 10) < 0) &pci_dev->numa_node, 10) < 0)
goto cleanup; goto cleanup;
if (nodeDeviceSysfsGetPCIRelatedDevCaps(syspath, if (nodeDeviceSysfsGetPCIRelatedDevCaps(def->sysfs_path, pci_dev) < 0)
&def->caps->data.pci_dev) < 0)
goto cleanup; goto cleanup;
if (!(pciDev = virPCIDeviceNew(pci_dev->domain, if (!(pciDev = virPCIDeviceNew(pci_dev->domain,