[Libvir] [PATCH] If xenHypervisorInit fails, produce an error message

["Richard W.M. Jones" <rjones redhat com>]

.. and if opening the Xen HV file under /proc fails, show us the errno.

Rich.

--
Emerging Technologies, Red Hat  http://et.redhat.com/~rjones/
64 Baker Street, London, W1U 7DF     Mobile: +44 7866 314 421

Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod
Street, Windsor, Berkshire, SL4 1TE, United Kingdom.
Registered in England and Wales under Company Registration No. 3798903
Directors: Michael Cunningham (USA), Charlie Peters (USA) and David
Owens (Ireland)

diff -urN --exclude=CVS --exclude=.git --exclude='*.pem' --exclude=demoCA --exclude=.gitignore --exclude='*.orig' --exclude='*.bak' libvirt-cvs/src/xen_internal.c libvirt-remote/src/xen_internal.c
--- libvirt-cvs/src/xen_internal.c	2007-04-17 19:49:32.000000000 +0100
+++ libvirt-remote/src/xen_internal.c	2007-04-27 15:50:38.000000000 +0100
@@ -1517,21 +1517,24 @@
  */
 int
 xenHypervisorOpen(virConnectPtr conn ATTRIBUTE_UNUSED,
-                  const char *name ATTRIBUTE_UNUSED, int flags)
+                  const char *name ATTRIBUTE_UNUSED,
+                  int flags ATTRIBUTE_UNUSED)
 {
     int ret;
     xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData;
 
     if (initialized == 0)
-        if (xenHypervisorInit() == -1)
+        if (xenHypervisorInit() == -1) {
+            virXenError (VIR_ERR_NO_XEN, "xenHypervisorInit failed", 0);
             return -1;
+        }
 
     priv->handle = -1;
 
     ret = open(XEN_HYPERVISOR_SOCKET, O_RDWR);
     if (ret < 0) {
         if (!(flags & VIR_DRV_OPEN_QUIET))
-            virXenError(VIR_ERR_NO_XEN, XEN_HYPERVISOR_SOCKET, 0);
+            virXenError(VIR_ERR_NO_XEN, XEN_HYPERVISOR_SOCKET, errno);
         return (-1);
     }

Attachment: smime.p7s
Description: S/MIME Cryptographic Signature