From: Daniel P. Berrange <berrange@redhat.com>
Date: Mon, 16 Mar 2009 10:56:01 +0000 (+0000)
Subject: Fix subsystem lookup for older HAL releases
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=35625e5aa89458a1298a82bb12866994e9c6a8fc;p=libvirt.git

Fix subsystem lookup for older HAL releases
---

diff --git a/ChangeLog b/ChangeLog
index 551dabb3cb..e056fe7209 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar 16 10:55:00 GMT 2009 Daniel P. Berrange <berrange@redhat.com>
+
+	Fix subsystem lookup for older HAL releases
+	* src/node_device_hal.c: Check for linux.subsystem property
+
 Mon Mar 16 10:45:00 GMT 2009 Daniel P. Berrange <berrange@redhat.com>
 
 	Add ac97 to test case & RNG schema (Pritesh Kothari)
diff --git a/src/node_device_hal.c b/src/node_device_hal.c
index a47c42ac26..b214f6030a 100644
--- a/src/node_device_hal.c
+++ b/src/node_device_hal.c
@@ -357,7 +357,8 @@ static int gather_capabilities(LibHalContext *ctx, const char *udi,
             goto failure;
     }
 
-    if (get_str_prop(ctx, udi, "info.subsystem", &bus_name) == 0) {
+    if (get_str_prop(ctx, udi, "info.subsystem", &bus_name) == 0 ||
+        get_str_prop(ctx, udi, "linux.subsystem", &bus_name) == 0) {
         rv = gather_capability(ctx, udi, bus_name, &caps);
         if (rv != 0)
             goto failure;