Remove init method

diff --git a/ChangeLog b/ChangeLog
index 114e913e76fb3665e4cb93beeeb56aed2a636b96..1544186b9b5b4bd6067d4c6549d76ca939de14c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Feb 16 11:03:24 EST 2007 Daniel P. Berrange <berrange@redhat.com>
+
+       * src/driver.h, src/proxy_internal.c, src/qemu_internal.c,
+       src/test.c, src/xen_internal.c, src/xend_internal.c,
+       src/xm_internal.c, src/xs_internal.c: Remove the unused
+       'init' method from the internal driver API (from Rich Jones)
+
 Fri Feb 16 10:36:24 EST 2007 Daniel P. Berrange <berrange@redhat.com>
 
        * qemud/internal.h, qemud/qemud.c, libvirt.spec.in: Remove

diff --git a/src/driver.h b/src/driver.h
index c467ad0333885585e45440eb90f2234d1c4b5999..7d79b1132e2c051c7834b0e529ded5196d330a0a 100644 (file)
--- a/src/driver.h
+++ b/src/driver.h
@@ -32,8 +32,6 @@ typedef enum {
     VIR_DRV_OPEN_RO = 2
 } virDrvOpenFlag;
 
-typedef int
-       (*virDrvInit)                   (void);
 typedef int
        (*virDrvOpen)                   (virConnectPtr conn,
                                         const char *name,
@@ -150,7 +148,6 @@ struct _virDriver {
        int            no;      /* the number virDrvNo */
        const char * name;      /* the name of the driver */
        unsigned long ver;      /* the version of the backend */
-       virDrvInit                      init;
        virDrvOpen                      open;
        virDrvClose                     close;
        virDrvGetType                   type;

diff --git a/src/proxy_internal.c b/src/proxy_internal.c
index 1e6e453cf8f550def8cb373e2e56e8f157bd145f..c7c325b161a77f470e4a737e2590f34a216bb7dc 100644 (file)
--- a/src/proxy_internal.c
+++ b/src/proxy_internal.c
@@ -46,7 +46,6 @@ static virDriver xenProxyDriver = {
     VIR_DRV_XEN_PROXY,
     "XenProxy",
     0,
-    NULL, /* init */
     xenProxyOpen, /* open */
     xenProxyClose, /* close */
     NULL, /* type */

diff --git a/src/qemu_internal.c b/src/qemu_internal.c
index a65b07301cedfa579252e193e6292625d0bce6d8..3fcf10fffb75326c9d062e7b6545f09c2a6d509c 100644 (file)
--- a/src/qemu_internal.c
+++ b/src/qemu_internal.c
@@ -1097,7 +1097,6 @@ static virDriver qemuDriver = {
     VIR_DRV_QEMU,
     "QEMU",
     LIBVIR_VERSION_NUMBER,
-    NULL, /* init */
     qemuOpen, /* open */
     qemuClose, /* close */
     NULL, /* type */

diff --git a/src/test.c b/src/test.c
index 4025f99dcf019ced948afb87782cdb7be1928a7e..5052cbd52e03ea012e6e482318ed92943c6244aa 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -90,7 +90,6 @@ static virDriver testDriver = {
     VIR_DRV_TEST,
     "Test",
     LIBVIR_VERSION_NUMBER,
-    NULL, /* init */
     testOpen, /* open */
     testClose, /* close */
     NULL, /* type */

diff --git a/src/xen_internal.c b/src/xen_internal.c
index f885c662f042dc50f0ec6294550edd425d974e65..32c550e3a7fc4e524329ac2b7d0ebe2327027c22 100644 (file)
--- a/src/xen_internal.c
+++ b/src/xen_internal.c
@@ -411,7 +411,6 @@ typedef struct xen_op_v2_dom xen_op_v2_dom;
 static const char * xenHypervisorGetType(virConnectPtr conn);
 static unsigned long xenHypervisorGetMaxMemory(virDomainPtr domain);
 #endif
-static int xenHypervisorInit(void);
 
 #ifndef PROXY
 static virDriver xenHypervisorDriver = {
@@ -420,7 +419,6 @@ static virDriver xenHypervisorDriver = {
     (DOM0_INTERFACE_VERSION >> 24) * 1000000 +
     ((DOM0_INTERFACE_VERSION >> 16) & 0xFF) * 1000 +
     (DOM0_INTERFACE_VERSION & 0xFFFF),
-    xenHypervisorInit, /* init */
     xenHypervisorOpen, /* open */
     xenHypervisorClose, /* close */
     xenHypervisorGetType, /* type */
@@ -1127,7 +1125,8 @@ virXen_getvcpusinfo(int handle, int id, unsigned int vcpu, virVcpuInfoPtr ipt,
  * Initialize the hypervisor layer. Try to detect the kind of interface
  * used i.e. pre or post changeset 10277
  */
-int xenHypervisorInit(void)
+int
+xenHypervisorInit(void)
 {
     int fd, ret, cmd;
     hypercall_t hc;

diff --git a/src/xend_internal.c b/src/xend_internal.c
index 2ec32a8a3258b0d4fa12f709b704935b1e6b6721..d78cbba2e31d14e9a0e4d011dbec5db3a71d008b 100644 (file)
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -62,7 +62,6 @@ static virDriver xenDaemonDriver = {
     (DOM0_INTERFACE_VERSION >> 24) * 1000000 +
     ((DOM0_INTERFACE_VERSION >> 16) & 0xFF) * 1000 +
     (DOM0_INTERFACE_VERSION & 0xFFFF),
-    NULL, /* init */
     xenDaemonOpen, /* open */
     xenDaemonClose, /* close */
     xenDaemonGetType, /* type */

diff --git a/src/xm_internal.c b/src/xm_internal.c
index ccc24b13fbc521fbf2bf8909a3c9971adff008c8..2e1d88e7061ddeb7fc10b11eee9dd572bcc0518e 100644 (file)
--- a/src/xm_internal.c
+++ b/src/xm_internal.c
@@ -69,7 +69,6 @@ static virDriver xenXMDriver = {
     (DOM0_INTERFACE_VERSION >> 24) * 1000000 +
     ((DOM0_INTERFACE_VERSION >> 16) & 0xFF) * 1000 +
     (DOM0_INTERFACE_VERSION & 0xFFFF),
-    NULL, /* init */
     xenXMOpen, /* open */
     xenXMClose, /* close */
     xenXMGetType, /* type */

diff --git a/src/xs_internal.c b/src/xs_internal.c
index 9dca5b29ec4cfef64691161b64a3aaa1e2fe58e7..bf7e36e3431b9182aa72298659250159c3863323 100644 (file)
--- a/src/xs_internal.c
+++ b/src/xs_internal.c
@@ -40,7 +40,6 @@ static virDriver xenStoreDriver = {
     (DOM0_INTERFACE_VERSION >> 24) * 1000000 +
     ((DOM0_INTERFACE_VERSION >> 16) & 0xFF) * 1000 +
     (DOM0_INTERFACE_VERSION & 0xFFFF),
-    NULL, /* init */
     xenStoreOpen, /* open */
     xenStoreClose, /* close */
     NULL, /* type */