[Cluster-devel] cluster/fence/agents/xvm fence_xvmd.c

[fabbione]

CVSROOT:        /cvs/cluster
Module name:    cluster
Changes by:     [EMAIL PROTECTED]       2007-12-14 14:49:38

Modified files:
        fence/agents/xvm: fence_xvmd.c 

Log message:
        Make sure we invoke virConnectOpen with a proper URI. NULL is deprecated
        in libvirt and we have no control over distro defaults that might not be
        xen:///.
        
        Patch by Soren Hansen <soren at ubuntu.com>

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/fence_xvmd.c.diff?cvsroot=cluster&r1=1.13&r2=1.14

--- cluster/fence/agents/xvm/fence_xvmd.c       2007/10/17 18:29:57     1.13
+++ cluster/fence/agents/xvm/fence_xvmd.c       2007/12/14 14:49:34     1.14
@@ -54,6 +54,8 @@
 #include "libcman.h"
 #include "debug.h"
 
+#define LIBVIRT_XEN_URI "xen:///"
+
 static int running = 1;
 
 
@@ -541,7 +543,7 @@
        virt_list_t *vl = NULL;
        virt_state_t *dom = NULL;
 
-       vp = virConnectOpen(NULL);
+       vp = virConnectOpen(LIBVIRT_XEN_URI);
        if (!vp)
                perror("virConnectOpen");
 
@@ -577,7 +579,7 @@
                        continue;
        
                /* Request and/or timeout: open connection */
-               vp = virConnectOpen(NULL);
+               vp = virConnectOpen(LIBVIRT_XEN_URI);
                if (!vp) {
                        printf("NOTICE: virConnectOpen(): %s; cannot fence!\n",
                               strerror(errno));