From: Daniel Veillard <veillard@redhat.com>
Date: Thu, 21 Jan 2010 14:45:44 +0000 (+0100)
Subject: Fix an error when looking for devices in syspath
X-Git-Tag: v0.7.6~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5df24a11c587e50cbd0201411f02a32e2917266;p=thirdparty%2Flibvirt.git

Fix an error when looking for devices in syspath

* src/node_device/node_device_udev.c: udevSetupSystemDev() only print the
  error message if lookup failed in both DMI_DEVPATH and DMI_DEVPATH_FALLBACK
---

diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index 78d7ae39cb..2e459d1801 100644
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -1454,11 +1454,10 @@ static int udevSetupSystemDev(void)
     udev = udev_monitor_get_udev(DRV_STATE_UDEV_MONITOR(driverState));
     device = udev_device_new_from_syspath(udev, DMI_DEVPATH);
     if (device == NULL) {
-        VIR_ERROR("Failed to get udev device for syspath '%s'", DMI_DEVPATH);
-
         device = udev_device_new_from_syspath(udev, DMI_DEVPATH_FALLBACK);
         if (device == NULL) {
-            VIR_ERROR("Failed to get udev device for syspath '%s'", DMI_DEVPATH_FALLBACK);
+            VIR_ERROR("Failed to get udev device for syspath '%s' or '%s'",
+                      DMI_DEVPATH, DMI_DEVPATH_FALLBACK);
             goto out;
         }
     }