Disable xm_internal on new xend

diff --git a/ChangeLog b/ChangeLog
index 438c867bb4ab057402f70f4456fe61e37fc24b60..56247774b6c2e586ad3a9e937a4a3a4e434a11df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May  2 12:16:35 EST 2007 Daniel P. Berrange <berrange@redhat.com>
+
+       * src/xen_unified.c: Disable xm_internal.c driver on Xen
+       newer than 3.0.3
+
 Wed May  2 11:50:35 EST 2007 Daniel P. Berrange <berrange@redhat.com>
 
        * qemud/qemud.c: Use --strict-order when running dnsmasq

diff --git a/src/xen_unified.c b/src/xen_unified.c
index dd5ca5b6b602659b7638372888fd2fb78d33e959..12b542e890e23aa6b4376f242ad6ce4196671b69 100644 (file)
--- a/src/xen_unified.c
+++ b/src/xen_unified.c
@@ -111,6 +111,11 @@ xenUnifiedOpen (virConnectPtr conn, const char *name, int flags)
     for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i) {
         priv->opened[i] = 0;
 
+        /* Only use XM driver for Xen <= 3.0.3 (ie xendConfigVersion <= 2) */
+        if (drivers[i] == &xenXMDriver &&
+            priv->xendConfigVersion > 2)
+            continue;
+
         /* Ignore proxy for root */
         if (i == proxy_offset && getuid() == 0)
             continue;