Fix return type for Xen open subdriver method impl (John Levon)

diff --git a/ChangeLog b/ChangeLog
index 87235f53b9206ada1dd532bb5aeed4a29e49b172..12564da963da328a5f123dc71bd9e1415c5b9ca1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Wed Dec 17 21:17:39 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
+
+       Fix Xen sub-drivers' 'open' method return type (John Levon)
+       * src/proxy_internal.c, src/remote_internal.c, src/test.c,
+       src/xen_inotify.c, src/xen_inotify.h, src/xen_internal.c,
+       src/xen_internal.h, src/xen_unified.c, src/xend_internal.c,
+       src/xend_internal.h, src/xm_internal.c, src/xm_internal.h,
+       src/xs_internal.c, src/xs_internal.h: s/int/virDrvOpenStatus/
+
 Wed Dec 17 21:10:39 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
 
        Mutex / crash fixes to openvz driver (Anton Protopopov)

diff --git a/src/proxy_internal.c b/src/proxy_internal.c
index 0254ebc5f8d422eda12e13770b5e9544fca4c194..ab976afe6fd4bcc07aaeafedf42c709ecbcbda06 100644 (file)
--- a/src/proxy_internal.c
+++ b/src/proxy_internal.c
@@ -36,7 +36,7 @@
 static int debug = 0;
 
 static int xenProxyClose(virConnectPtr conn);
-static int xenProxyOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags);
+static virDrvOpenStatus xenProxyOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags);
 static int xenProxyGetVersion(virConnectPtr conn, unsigned long *hvVer);
 static int xenProxyNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info);
 static char *xenProxyGetCapabilities(virConnectPtr conn);
@@ -477,7 +477,7 @@ retry:
  *
  * Returns 0 in case of success, and -1 in case of failure
  */
-int
+virDrvOpenStatus
 xenProxyOpen(virConnectPtr conn,
              virConnectAuthPtr auth ATTRIBUTE_UNUSED,
              int flags)

diff --git a/src/remote_internal.c b/src/remote_internal.c
index 0999a4e9bc55538251570c5860b7d69f06c4c6ea..71def558b0c0c6f253fa5aaf02681cbee38fc532 100644 (file)
--- a/src/remote_internal.c
+++ b/src/remote_internal.c
@@ -851,7 +851,7 @@ doRemoteOpen (virConnectPtr conn,
     goto cleanup;
 }
 
-static int
+static virDrvOpenStatus
 remoteOpen (virConnectPtr conn,
             virConnectAuthPtr auth,
             int flags)
@@ -2633,7 +2633,7 @@ remoteDomainMemoryPeek (virDomainPtr domain,
 
 /*----------------------------------------------------------------------*/
 
-static int
+static virDrvOpenStatus
 remoteNetworkOpen (virConnectPtr conn,
                    virConnectAuthPtr auth,
                    int flags)
@@ -3033,7 +3033,7 @@ remoteNetworkSetAutostart (virNetworkPtr network, int autostart)
 
 /*----------------------------------------------------------------------*/
 
-static int
+static virDrvOpenStatus
 remoteStorageOpen (virConnectPtr conn,
                    virConnectAuthPtr auth,
                    int flags)

diff --git a/src/test.c b/src/test.c
index defa00fb859311fc160b438a216a855ca83d4d2f..ed033420fe85fb46a7613f43ef68d42529f17d32 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -590,7 +590,7 @@ static int testOpenFromFile(virConnectPtr conn,
 }
 
 
-static int testOpen(virConnectPtr conn,
+static virDrvOpenStatus testOpen(virConnectPtr conn,
                     virConnectAuthPtr auth ATTRIBUTE_UNUSED,
                     int flags ATTRIBUTE_UNUSED)
 {

diff --git a/src/xen_inotify.c b/src/xen_inotify.c
index 9d433e47084799dabb8c240bb8ad15567d8c78a5..fe1bc76775ca6f220ad51ae8adcc422eab6df129 100644 (file)
--- a/src/xen_inotify.c
+++ b/src/xen_inotify.c
@@ -364,7 +364,7 @@ reread:
  *
  * Returns 0 or -1 in case of error.
  */
-int
+virDrvOpenStatus
 xenInotifyOpen(virConnectPtr conn ATTRIBUTE_UNUSED,
              virConnectAuthPtr auth ATTRIBUTE_UNUSED,
              int flags ATTRIBUTE_UNUSED)

diff --git a/src/xen_inotify.h b/src/xen_inotify.h
index a8ff6929f0744507e922ada205ec3ceaab9c9003..70bc63cbedb1b9065c739198e1fcbc7f4bdda9cc 100644 (file)
--- a/src/xen_inotify.h
+++ b/src/xen_inotify.h
@@ -21,10 +21,13 @@
  */
 #ifndef __VIR_XEN_INOTIFY_H__
 #define __VIR_XEN_INOTIFY_H__
+
 #include "internal.h"
+#include "driver.h"
+
 extern struct xenUnifiedDriver xenInotifyDriver;
 
-int            xenInotifyOpen          (virConnectPtr conn,
+virDrvOpenStatus       xenInotifyOpen  (virConnectPtr conn,
                                          virConnectAuthPtr auth,
                                          int flags);
 int            xenInotifyClose         (virConnectPtr conn);

diff --git a/src/xen_internal.c b/src/xen_internal.c
index 89081eaa663b558f39b49dec64eb357b41bc45fa..ade013092ddc0623fc2d942c3daf3efe8d34e4fa 100644 (file)
--- a/src/xen_internal.c
+++ b/src/xen_internal.c
@@ -2031,7 +2031,7 @@ xenHypervisorInit(void)
  *
  * Returns 0 or -1 in case of error.
  */
-int
+virDrvOpenStatus
 xenHypervisorOpen(virConnectPtr conn,
                   virConnectAuthPtr auth ATTRIBUTE_UNUSED,
                   int flags ATTRIBUTE_UNUSED)

diff --git a/src/xen_internal.h b/src/xen_internal.h
index 16b1495439142ce27cb4fd88819880e9720e13b7..fb2c848b689300a8889ad08b6f7f7972c741374a 100644 (file)
--- a/src/xen_internal.h
+++ b/src/xen_internal.h
@@ -15,6 +15,7 @@
 
 #include "internal.h"
 #include "capabilities.h"
+#include "driver.h"
 
 extern struct xenUnifiedDriver xenHypervisorDriver;
 int    xenHypervisorInit               (void);
@@ -32,7 +33,8 @@ xenHypervisorLookupDomainByUUID(virConnectPtr conn,
 char *
         xenHypervisorDomainGetOSType (virDomainPtr dom);
 
-int    xenHypervisorOpen               (virConnectPtr conn,
+virDrvOpenStatus
+       xenHypervisorOpen               (virConnectPtr conn,
                                          virConnectAuthPtr auth,
                                          int flags);
 int    xenHypervisorClose              (virConnectPtr conn);

diff --git a/src/xen_unified.c b/src/xen_unified.c
index a60bc799f498606792012904f9a67d5983af271e..6daeac86d7ebc2bb2509acf89b0ae624f8032970 100644 (file)
--- a/src/xen_unified.c
+++ b/src/xen_unified.c
@@ -224,7 +224,7 @@ xenUnifiedProbe (void)
     return 0;
 }
 
-static int
+static virDrvOpenStatus
 xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags)
 {
     int i, ret = VIR_DRV_OPEN_DECLINED;

diff --git a/src/xend_internal.c b/src/xend_internal.c
index b839497cfb276bd1b768617b2b607965c49585f5..39a92ff24b4068975fc7d813ace24390b18d448f 100644 (file)
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -2704,7 +2704,7 @@ error:
  *
  * Returns 0 in case of success, -1 in case of error.
  */
-int
+virDrvOpenStatus
 xenDaemonOpen(virConnectPtr conn,
               virConnectAuthPtr auth ATTRIBUTE_UNUSED,
               int flags ATTRIBUTE_UNUSED)

diff --git a/src/xend_internal.h b/src/xend_internal.h
index 768964fc9e1740f6ff5570a507f888d2747a6445..19bb26888d999fb188c58d194599a371b5c976d6 100644 (file)
--- a/src/xend_internal.h
+++ b/src/xend_internal.h
@@ -24,6 +24,7 @@
 #include "internal.h"
 #include "capabilities.h"
 #include "domain_conf.h"
+#include "driver.h"
 #include "buf.h"
 
 int
@@ -129,7 +130,7 @@ xenDaemonFormatSxpr(virConnectPtr conn,
 
 
 /* refactored ones */
-int xenDaemonOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags);
+virDrvOpenStatus xenDaemonOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags);
 int xenDaemonClose(virConnectPtr conn);
 int xenDaemonGetVersion(virConnectPtr conn, unsigned long *hvVer);
 int xenDaemonNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info);

diff --git a/src/xm_internal.c b/src/xm_internal.c
index 6bdf64e4fcd48a4c253fc5f25428acda2fee3d82..77aa3e14fb2fc35bb3eba7be4a3413d14e8341c1 100644 (file)
--- a/src/xm_internal.c
+++ b/src/xm_internal.c
@@ -581,7 +581,7 @@ int xenXMConfigCacheRefresh (virConnectPtr conn) {
  * We only support a single directory, so repeated calls
  * to open all end up using the same cache of files
  */
-int
+virDrvOpenStatus
 xenXMOpen (virConnectPtr conn ATTRIBUTE_UNUSED,
            virConnectAuthPtr auth ATTRIBUTE_UNUSED,
            int flags ATTRIBUTE_UNUSED)

diff --git a/src/xm_internal.h b/src/xm_internal.h
index 7db799fe884762533b28a2a122465ebce73ae50d..0aed3a752b2d73af5b633ca0c853b2a657c906be 100644 (file)
--- a/src/xm_internal.h
+++ b/src/xm_internal.h
@@ -26,6 +26,7 @@
 #define _LIBVIRT_XM_INTERNAL_H_
 
 #include "internal.h"
+#include "driver.h"
 #include "conf.h"
 #include "domain_conf.h"
 
@@ -38,7 +39,7 @@ int xenXMConfigCacheRefresh (virConnectPtr conn);
 int xenXMConfigCacheAddFile(virConnectPtr conn, const char *filename);
 int xenXMConfigCacheRemoveFile(virConnectPtr conn, const char *filename);
 
-int xenXMOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags);
+virDrvOpenStatus xenXMOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags);
 int xenXMClose(virConnectPtr conn);
 const char *xenXMGetType(virConnectPtr conn);
 int xenXMDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info);

diff --git a/src/xs_internal.c b/src/xs_internal.c
index 184cfe5bd5a3cf91d2e28d79b5288b455eda0774..13f51e91c19a1601d9072fe46ab7508d3bba81b9 100644 (file)
--- a/src/xs_internal.c
+++ b/src/xs_internal.c
@@ -281,7 +281,7 @@ virDomainGetVMInfo(virDomainPtr domain, const char *vm, const char *name)
  *
  * Returns 0 or -1 in case of error.
  */
-int
+virDrvOpenStatus
 xenStoreOpen(virConnectPtr conn,
              virConnectAuthPtr auth ATTRIBUTE_UNUSED,
              int flags ATTRIBUTE_UNUSED)

diff --git a/src/xs_internal.h b/src/xs_internal.h
index cd593b4e12027fc9250638c0ccd6ba48c72d039c..f4b46d0ccfb2b607aa4ff92048a01a892b69d7f8 100644 (file)
--- a/src/xs_internal.h
+++ b/src/xs_internal.h
@@ -12,11 +12,12 @@
 #define __VIR_XS_INTERNAL_H__
 
 #include "internal.h"
+#include "driver.h"
 
 extern struct xenUnifiedDriver xenStoreDriver;
 int xenStoreInit (void);
 
-int            xenStoreOpen            (virConnectPtr conn,
+virDrvOpenStatus       xenStoreOpen    (virConnectPtr conn,
                                          virConnectAuthPtr auth,
                                          int flags);
 int            xenStoreClose           (virConnectPtr conn);