From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6353 invoked by alias); 9 Apr 2009 21:06:20 -0000 Received: (qmail 6346 invoked by alias); 9 Apr 2009 21:06:20 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: RHEL5 - fence: Use libvirt's autodetection by default To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/RHEL5 X-Git-Reftype: branch X-Git-Oldrev: 99f367d0522a290f770f188f201f7c5f4dcd20d8 X-Git-Newrev: b08a992e52144b2f6fa6424dd4c69ab705f5d4e1 From: Lon Hohberger Message-Id: <20090409210600.A85731201BB@lists.fedorahosted.org> Date: Thu, 09 Apr 2009 21:06:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00067.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=b08a992e52144b2f6fa6424dd4c69ab705f5d4e1 Commit: b08a992e52144b2f6fa6424dd4c69ab705f5d4e1 Parent: 99f367d0522a290f770f188f201f7c5f4dcd20d8 Author: Lon Hohberger AuthorDate: Thu Apr 9 17:04:28 2009 -0400 Committer: Lon Hohberger CommitterDate: Thu Apr 9 17:04:28 2009 -0400 fence: Use libvirt's autodetection by default If no URI is specified, assume libvirt will find the right hypervisor. Signed-off-by: Lon Hohberger --- fence/agents/xvm/fence_xvmd.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/fence/agents/xvm/fence_xvmd.c b/fence/agents/xvm/fence_xvmd.c index 380c42e..6995a08 100644 --- a/fence/agents/xvm/fence_xvmd.c +++ b/fence/agents/xvm/fence_xvmd.c @@ -62,9 +62,9 @@ int cleanup_xml(char *xmldesc, char **ret, size_t *retsz); static char *hypervisor_uris[] = { + NULL, "xen:///", - "qemu:///system", - NULL + "qemu:///system" }; @@ -77,7 +77,7 @@ find_hypervisor(fence_xvm_args_t *args) if (args->uri) return virConnectOpen(args->uri); - for (x = 0; hypervisor_uris[x]; x++) { + for (x = 0; x < (sizeof(hypervisor_uris)/sizeof(char *)); x++) { vp = virConnectOpen(hypervisor_uris[x]); if (vp) break; @@ -86,9 +86,11 @@ find_hypervisor(fence_xvm_args_t *args) if (!vp) return NULL; - args->uri = strdup(hypervisor_uris[x]); - dbg_printf(1, "DISCOVERY: Using %s as hypervisor URI from now on\n", - args->uri); + if (args->uri) { + args->uri = strdup(hypervisor_uris[x]); + dbg_printf(1, "DISCOVERY: Using %s as hypervisor " + "URI from now on\n", args->uri); + } return vp; }