* src/libvirt.c src/xen_internal.[ch]: virConnectOpenReadOnly()

  should not emit error when failing to open the hypervisor proc
  entry point.
Daniel

diff --git a/ChangeLog b/ChangeLog
index e97ae328d139762bb0416546c405e72faca010f0..29dd83d4b4e37f84c367642f19e68c14cd2757a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Feb 27 16:42:46 EST 2006 Daniel Veillard <veillard@redhat.com>
+
+       * src/libvirt.c src/xen_internal.[ch]: virConnectOpenReadOnly()
+         should not emit error when failing to open the hypervisor proc
+         entry point.
+
 Mon Feb 27 16:32:55 EST 2006 Daniel Veillard <veillard@redhat.com>
 
        * include/virterror.h src/libvirt_sym.version: exported

diff --git a/src/libvirt.c b/src/libvirt.c
index 102d18d8a78604ee1620f08aa1b88e99c82ee4be..0bda0b0e7d6d1da3224a5a1d3f1d03799d1a6695 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -140,7 +140,7 @@ virConnectOpen(const char *name) {
         return(NULL);
     }
 
-    handle = xenHypervisorOpen();
+    handle = xenHypervisorOpen(0);
     if (handle == -1) {
         goto failed;
     }
@@ -200,7 +200,7 @@ virConnectOpenReadOnly(const char *name) {
         return(NULL);
     }
 
-    handle = xenHypervisorOpen();
+    handle = xenHypervisorOpen(1);
     if (handle >= 0)
         method++;
     else

diff --git a/src/xen_internal.c b/src/xen_internal.c
index f04c3674a58ebbf732d347287ece2d2ea0518572..98a6dbd7c37b7f9858bb48c6822c65d05d405c90 100644 (file)
--- a/src/xen_internal.c
+++ b/src/xen_internal.c
@@ -59,17 +59,19 @@ virXenError(virErrorNumber error, const char *info, int value) {
 
 /**
  * xenHypervisorOpen:
+ * @quiet: don'r raise an error on failure if set
  *
  * Connects to the Xen hypervisor.
  *
  * Returns the handle or -1 in case of error.
  */
-int xenHypervisorOpen(void) {
+int xenHypervisorOpen(int quiet) {
     int ret;
 
     ret = open(XEN_HYPERVISOR_SOCKET, O_RDWR);
     if (ret < 0) {
-        virXenError(VIR_ERR_NO_XEN, XEN_HYPERVISOR_SOCKET, 0);
+       if (!quiet)
+           virXenError(VIR_ERR_NO_XEN, XEN_HYPERVISOR_SOCKET, 0);
         return(-1);
     }
 

diff --git a/src/xen_internal.h b/src/xen_internal.h
index eb048143745e00b275eb6ea6c1e2f673cc35e33d..a819b441489b22ae0097e7c20f9e09b5b2f5c7a6 100644 (file)
--- a/src/xen_internal.h
+++ b/src/xen_internal.h
@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-int            xenHypervisorOpen               (void);
+int            xenHypervisorOpen               (int quiet);
 int            xenHypervisorClose              (int handle);
 unsigned long  xenHypervisorGetVersion         (int handle);
 int            xenHypervisorDestroyDomain      (int handle,