Oops, numa_node should not be a mandatory attribute

diff --git a/lib/sysfs.c b/lib/sysfs.c
index 9c005bb19115afa5939f3422a5df28b44356566e..a16c92a2b8980b2a9b79bdadbd92407d07fd8f95 100644 (file)
--- a/lib/sysfs.c
+++ b/lib/sysfs.c
@@ -113,12 +113,14 @@ sysfs_get_string(struct pci_dev *d, char *object, char *buf, int mandatory)
 }
 
 static int
-sysfs_get_value(struct pci_dev *d, char *object)
+sysfs_get_value(struct pci_dev *d, char *object, int mandatory)
 {
   char buf[OBJBUFSIZE];
 
-  sysfs_get_string(d, object, buf, 1);
-  return strtol(buf, NULL, 0);
+  if (sysfs_get_string(d, object, buf, mandatory))
+    return strtol(buf, NULL, 0);
+  else
+    return -1;
 }
 
 static void
@@ -191,16 +193,15 @@ static void sysfs_scan(struct pci_access *a)
       if (!a->buscentric)
        {
          sysfs_get_resources(d);
-         d->irq = sysfs_get_value(d, "irq");
-         d->numa_node = sysfs_get_value(d, "numa_node");
+         d->irq = sysfs_get_value(d, "irq", 1);
          /*
           *  We could read these faster from the config registers, but we want to give
           *  the kernel a chance to fix up ID's and especially classes of broken devices.
           */
-         d->vendor_id = sysfs_get_value(d, "vendor");
-         d->device_id = sysfs_get_value(d, "device");
-         d->device_class = sysfs_get_value(d, "class") >> 8;
-         d->known_fields = PCI_FILL_IDENT | PCI_FILL_CLASS | PCI_FILL_IRQ | PCI_FILL_BASES | PCI_FILL_ROM_BASE | PCI_FILL_SIZES | PCI_FILL_NUMA_NODE;
+         d->vendor_id = sysfs_get_value(d, "vendor", 1);
+         d->device_id = sysfs_get_value(d, "device", 1);
+         d->device_class = sysfs_get_value(d, "class", 1) >> 8;
+         d->known_fields = PCI_FILL_IDENT | PCI_FILL_CLASS | PCI_FILL_IRQ | PCI_FILL_BASES | PCI_FILL_ROM_BASE | PCI_FILL_SIZES;
        }
       pci_link_dev(a, d);
     }
@@ -292,6 +293,9 @@ sysfs_fill_info(struct pci_dev *d, int flags)
        d->label = pci_strdup(d->access, buf);
     }
 
+  if ((flags & PCI_FILL_NUMA_NODE) && !(d->known_fields & PCI_FILL_NUMA_NODE))
+    d->numa_node = sysfs_get_value(d, "numa_node", 0);
+
   return pci_generic_fill_info(d, flags);
 }