From: Osier Yang <jyang@redhat.com>
Date: Tue, 18 Jun 2013 08:39:24 +0000 (+0800)
Subject: nodedev_udev: changes missed by commit 1aa0ba3cef
X-Git-Tag: v1.1.0-rc1~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf5fbf8f94955f667300cd6c52886116707f95fa;p=thirdparty%2Flibvirt.git

nodedev_udev: changes missed by commit 1aa0ba3cef
---

diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index 06212b98b0..b8f5e5b063 100644
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -1122,16 +1122,13 @@ out:
 }
 
 static bool
-udevDeviceHasProperty(struct udev_device *dev,
+udevHasDeviceProperty(struct udev_device *dev,
                       const char *key)
 {
-    const char *value = NULL;
-    bool ret = false;
+    if (udev_device_get_property_value(dev, key))
+        return true;
 
-    if ((value = udev_device_get_property_value(dev, key)))
-        ret = true;
-
-    return ret;
+    return false;
 }
 
 static int
@@ -1161,14 +1158,14 @@ udevGetDeviceType(struct udev_device *device,
             *type = VIR_NODE_DEV_CAP_NET;
     } else {
         /* PCI devices don't set the DEVTYPE property. */
-        if (udevDeviceHasProperty(device, "PCI_CLASS"))
+        if (udevHasDeviceProperty(device, "PCI_CLASS"))
             *type = VIR_NODE_DEV_CAP_PCI_DEV;
 
         /* Wired network interfaces don't set the DEVTYPE property,
          * USB devices also have an INTERFACE property, but they do
          * set DEVTYPE, so if devtype is NULL and the INTERFACE
          * property exists, we have a network device. */
-        if (udevDeviceHasProperty(device, "INTERFACE"))
+        if (udevHasDeviceProperty(device, "INTERFACE"))
             *type = VIR_NODE_DEV_CAP_NET;
     }