Convert all drivers to use old-style struct initializers; this makes a handy

built-in TODO list for each driver.  Also rip out the internal getURI method;
it is never used by any of the drivers, and was buggy to boot.

diff --git a/ChangeLog b/ChangeLog
index 7b89892f24ad7e3ca986ec045a239bfa6df57e4c..573ecf54e52807a41037fafbe256a91ed25a90a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Tue Mar 31 17:40:00 CEST 2009 Chris Lalancette <clalance@redhat.com>
+       * src/lxc_driver.c, src/openvz_driver.c, src/qemu_driver.c,
+       src/remote_internal.c, src/test.c, src/uml_driver.c, src/xen_unified.c,
+       src/driver.h, src/libvirt.c, src/proxy_internal.c, src/xen_inotify.c,
+       src/xen_internal.c, src/xen_unified.h, src/xend_internal.c,
+       src/xm_internal.c, src/xs_internal.c: Convert all drivers to use
+       old-style struct initializers; this makes a handy built-in TODO list
+       for each driver.  Also rip out the internal getURI method; it was never
+       used by any of the drivers, and was buggy to boot.
+
 Tue Mar 31 14:44:16 CEST 2009 Daniel Veillard <veillard@redhat.com>
 
        * libvirt.spec.in: better modularization of the spec file,

diff --git a/src/driver.h b/src/driver.h
index 62d6fbc29b8bd4d444913efa7c9204fc26195ebe..88c2b0a5f166ecb3eb9dd0b94a149914b9ff803b 100644 (file)
--- a/src/driver.h
+++ b/src/driver.h
@@ -351,7 +351,6 @@ struct _virDriver {
     virDrvGetType                      type;
     virDrvGetVersion           version;
     virDrvGetHostname       getHostname;
-    virDrvGetURI            getURI;
     virDrvGetMaxVcpus          getMaxVcpus;
     virDrvNodeGetInfo          nodeGetInfo;
     virDrvGetCapabilities              getCapabilities;

diff --git a/src/libvirt.c b/src/libvirt.c
index f29df6bea31e7f7bf6874c2d47f998f12d2994b2..d6de7730285695a678ae998b13125af43a424d76 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -1321,15 +1321,6 @@ virConnectGetURI (virConnectPtr conn)
         return NULL;
     }
 
-    /* Drivers may override getURI, but if they don't then
-     * we provide a default implementation.
-     */
-    if (conn->driver->getURI) {
-        name = conn->driver->getURI (conn);
-        if (!name)
-            goto error;
-    }
-
     name = (char *)xmlSaveUri(conn->uri);
     if (!name) {
         virReportOOMError (conn);

diff --git a/src/lxc_driver.c b/src/lxc_driver.c
index c08ca9cdef29cdcc14c27db1303607e4f751d691..9cfe7e02b7fdf6079ccbe4130a7435f37cc6c252 100644 (file)
--- a/src/lxc_driver.c
+++ b/src/lxc_driver.c
@@ -1414,7 +1414,6 @@ static virDriver lxcDriver = {
     NULL, /* type */
     lxcVersion, /* version */
     NULL, /* getHostname */
-    NULL, /* getURI */
     NULL, /* getMaxVcpus */
     NULL, /* nodeGetInfo */
     NULL, /* getCapabilities */
@@ -1469,7 +1468,7 @@ static virDriver lxcDriver = {
     NULL, /* domainEventDeregister */
     NULL, /* domainMigratePrepare2 */
     NULL, /* domainMigrateFinish2 */
-    NULL, /* nodeDeviceAttach */
+    NULL, /* nodeDeviceDettach */
     NULL, /* nodeDeviceReAttach */
     NULL, /* nodeDeviceReset */
 };

diff --git a/src/openvz_driver.c b/src/openvz_driver.c
index ac2c089813a71e4afb0ae96152cff0fd8f45318d..755e449d9c9144a642274a206afb85bf545f5c3b 100644 (file)
--- a/src/openvz_driver.c
+++ b/src/openvz_driver.c
@@ -1314,8 +1314,7 @@ static virDriver openvzDriver = {
     NULL, /* supports_feature */
     openvzGetType, /* type */
     openvzGetVersion, /* version */
-    NULL, /* hostname */
-    NULL, /* uri */
+    NULL, /* getHostname */
     openvzGetMaxVCPUs, /* getMaxVcpus */
     openvzGetNodeInfo, /* nodeGetInfo */
     openvzGetCapabilities, /* getCapabilities */
@@ -1345,8 +1344,8 @@ static virDriver openvzDriver = {
     NULL, /* domainGetSecurityLabel */
     NULL, /* nodeGetSecurityModel */
     openvzDomainDumpXML, /* domainDumpXML */
-    openvzListDefinedDomains, /* listDomains */
-    openvzNumDefinedDomains, /* numOfDomains */
+    openvzListDefinedDomains, /* listDefinedDomains */
+    openvzNumDefinedDomains, /* numOfDefinedDomains */
     openvzDomainCreate, /* domainCreate */
     openvzDomainDefineXML, /* domainDefineXML */
     openvzDomainUndefine, /* domainUndefine */
@@ -1365,12 +1364,12 @@ static virDriver openvzDriver = {
     NULL, /* domainBlockPeek */
     NULL, /* domainMemoryPeek */
     NULL, /* nodeGetCellsFreeMemory */
-    NULL, /* nodeGetFreeMemory */
+    NULL, /* getFreeMemory */
     NULL, /* domainEventRegister */
     NULL, /* domainEventDeregister */
     NULL, /* domainMigratePrepare2 */
     NULL, /* domainMigrateFinish2 */
-    NULL, /* nodeDeviceAttach */
+    NULL, /* nodeDeviceDettach */
     NULL, /* nodeDeviceReAttach */
     NULL, /* nodeDeviceReset */
 };

diff --git a/src/proxy_internal.c b/src/proxy_internal.c
index 6a34e7e60027dc646d08b2ff55c8ed1fc2020589..56e8db89fa9cc32cf033285f63dbce1f6273ba2c 100644 (file)
--- a/src/proxy_internal.c
+++ b/src/proxy_internal.c
@@ -50,7 +50,6 @@ struct xenUnifiedDriver xenProxyDriver = {
     xenProxyClose, /* close */
     xenProxyGetVersion, /* version */
     NULL, /* hostname */
-    NULL, /* URI */
     xenProxyNodeGetInfo, /* nodeGetInfo */
     xenProxyGetCapabilities, /* getCapabilities */
     xenProxyListDomains, /* listDomains */

diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index b2974bb47b493b929d4bf0c7f28ce754ba5e480f..8408d9731f625bb0ec82a7220bb6cdd2aa31462b 100644 (file)
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -5035,8 +5035,7 @@ static virDriver qemuDriver = {
     qemudSupportsFeature, /* supports_feature */
     qemudGetType, /* type */
     qemudGetVersion, /* version */
-    qemudGetHostname, /* hostname */
-    NULL, /* URI  */
+    qemudGetHostname, /* getHostname */
     qemudGetMaxVCPUs, /* getMaxVcpus */
     qemudGetNodeInfo, /* nodeGetInfo */
     qemudGetCapabilities, /* getCapabilities */
@@ -5071,8 +5070,8 @@ static virDriver qemuDriver = {
     qemudDomainGetSecurityLabel, /* domainGetSecurityLabel */
     qemudNodeGetSecurityModel, /* nodeGetSecurityModel */
     qemudDomainDumpXML, /* domainDumpXML */
-    qemudListDefinedDomains, /* listDomains */
-    qemudNumDefinedDomains, /* numOfDomains */
+    qemudListDefinedDomains, /* listDefinedDomains */
+    qemudNumDefinedDomains, /* numOfDefinedDomains */
     qemudDomainStart, /* domainCreate */
     qemudDomainDefine, /* domainDefineXML */
     qemudDomainUndefine, /* domainUndefine */

diff --git a/src/remote_internal.c b/src/remote_internal.c
index 9e6304b1166123956eb4f2c848ef864466b459c9..200dd4a620219697f7634f5ba7a8304efee4cfb1 100644 (file)
--- a/src/remote_internal.c
+++ b/src/remote_internal.c
@@ -6837,71 +6837,71 @@ unsigned long remoteVersion(void)
 }
 
 static virDriver driver = {
-    .no = VIR_DRV_REMOTE,
-    .name = "remote",
-    .open = remoteOpen,
-    .close = remoteClose,
-    .supports_feature = remoteSupportsFeature,
-        .type = remoteType,
-        .version = remoteGetVersion,
-    .getHostname = remoteGetHostname,
-        .getMaxVcpus = remoteGetMaxVcpus,
-        .nodeGetInfo = remoteNodeGetInfo,
-    .getCapabilities = remoteGetCapabilities,
-    .listDomains = remoteListDomains,
-    .numOfDomains = remoteNumOfDomains,
-    .domainCreateXML = remoteDomainCreateXML,
-    .domainLookupByID = remoteDomainLookupByID,
-    .domainLookupByUUID = remoteDomainLookupByUUID,
-    .domainLookupByName = remoteDomainLookupByName,
-    .domainSuspend = remoteDomainSuspend,
-    .domainResume = remoteDomainResume,
-    .domainShutdown = remoteDomainShutdown,
-    .domainReboot = remoteDomainReboot,
-    .domainDestroy = remoteDomainDestroy,
-    .domainGetOSType = remoteDomainGetOSType,
-    .domainGetMaxMemory = remoteDomainGetMaxMemory,
-    .domainSetMaxMemory = remoteDomainSetMaxMemory,
-    .domainSetMemory = remoteDomainSetMemory,
-    .domainGetInfo = remoteDomainGetInfo,
-    .domainSave = remoteDomainSave,
-    .domainRestore = remoteDomainRestore,
-    .domainCoreDump = remoteDomainCoreDump,
-    .domainSetVcpus = remoteDomainSetVcpus,
-    .domainPinVcpu = remoteDomainPinVcpu,
-    .domainGetVcpus = remoteDomainGetVcpus,
-    .domainGetMaxVcpus = remoteDomainGetMaxVcpus,
-    .domainGetSecurityLabel = remoteDomainGetSecurityLabel,
-    .nodeGetSecurityModel = remoteNodeGetSecurityModel,
-    .domainDumpXML = remoteDomainDumpXML,
-    .listDefinedDomains = remoteListDefinedDomains,
-    .numOfDefinedDomains = remoteNumOfDefinedDomains,
-    .domainCreate = remoteDomainCreate,
-    .domainDefineXML = remoteDomainDefineXML,
-    .domainUndefine = remoteDomainUndefine,
-    .domainAttachDevice = remoteDomainAttachDevice,
-    .domainDetachDevice = remoteDomainDetachDevice,
-    .domainGetAutostart = remoteDomainGetAutostart,
-    .domainSetAutostart = remoteDomainSetAutostart,
-    .domainGetSchedulerType = remoteDomainGetSchedulerType,
-    .domainGetSchedulerParameters = remoteDomainGetSchedulerParameters,
-    .domainSetSchedulerParameters = remoteDomainSetSchedulerParameters,
-    .domainMigratePrepare = remoteDomainMigratePrepare,
-    .domainMigratePerform = remoteDomainMigratePerform,
-    .domainMigrateFinish = remoteDomainMigrateFinish,
-    .domainBlockStats = remoteDomainBlockStats,
-    .domainInterfaceStats = remoteDomainInterfaceStats,
-    .domainBlockPeek = remoteDomainBlockPeek,
-    .domainMemoryPeek = remoteDomainMemoryPeek,
-    .nodeGetCellsFreeMemory = remoteNodeGetCellsFreeMemory,
-    .getFreeMemory = remoteNodeGetFreeMemory,
-    .domainEventRegister = remoteDomainEventRegister,
-    .domainEventDeregister = remoteDomainEventDeregister,
-    .domainMigratePrepare2 = remoteDomainMigratePrepare2,
-    .domainMigrateFinish2 = remoteDomainMigrateFinish2,
-    .nodeDeviceDettach = remoteNodeDeviceDettach,
-    .nodeDeviceReAttach = remoteNodeDeviceReAttach,
-    .nodeDeviceReset = remoteNodeDeviceReset,
+    VIR_DRV_REMOTE,
+    "remote",
+    remoteOpen, /* open */
+    remoteClose, /* close */
+    remoteSupportsFeature, /* supports_feature */
+    remoteType, /* type */
+    remoteGetVersion, /* version */
+    remoteGetHostname, /* getHostname */
+    remoteGetMaxVcpus, /* getMaxVcpus */
+    remoteNodeGetInfo, /* nodeGetInfo */
+    remoteGetCapabilities, /* getCapabilities */
+    remoteListDomains, /* listDomains */
+    remoteNumOfDomains, /* numOfDomains */
+    remoteDomainCreateXML, /* domainCreateXML */
+    remoteDomainLookupByID, /* domainLookupByID */
+    remoteDomainLookupByUUID, /* domainLookupByUUID */
+    remoteDomainLookupByName, /* domainLookupByName */
+    remoteDomainSuspend, /* domainSuspend */
+    remoteDomainResume, /* domainResume */
+    remoteDomainShutdown, /* domainShutdown */
+    remoteDomainReboot, /* domainReboot */
+    remoteDomainDestroy, /* domainDestroy */
+    remoteDomainGetOSType, /* domainGetOSType */
+    remoteDomainGetMaxMemory, /* domainGetMaxMemory */
+    remoteDomainSetMaxMemory, /* domainSetMaxMemory */
+    remoteDomainSetMemory, /* domainSetMemory */
+    remoteDomainGetInfo, /* domainGetInfo */
+    remoteDomainSave, /* domainSave */
+    remoteDomainRestore, /* domainRestore */
+    remoteDomainCoreDump, /* domainCoreDump */
+    remoteDomainSetVcpus, /* domainSetVcpus */
+    remoteDomainPinVcpu, /* domainPinVcpu */
+    remoteDomainGetVcpus, /* domainGetVcpus */
+    remoteDomainGetMaxVcpus, /* domainGetMaxVcpus */
+    remoteDomainGetSecurityLabel, /* domainGetSecurityLabel */
+    remoteNodeGetSecurityModel, /* nodeGetSecurityModel */
+    remoteDomainDumpXML, /* domainDumpXML */
+    remoteListDefinedDomains, /* listDefinedDomains */
+    remoteNumOfDefinedDomains, /* numOfDefinedDomains */
+    remoteDomainCreate, /* domainCreate */
+    remoteDomainDefineXML, /* domainDefineXML */
+    remoteDomainUndefine, /* domainUndefine */
+    remoteDomainAttachDevice, /* domainAttachDevice */
+    remoteDomainDetachDevice, /* domainDetachDevice */
+    remoteDomainGetAutostart, /* domainGetAutostart */
+    remoteDomainSetAutostart, /* domainSetAutostart */
+    remoteDomainGetSchedulerType, /* domainGetSchedulerType */
+    remoteDomainGetSchedulerParameters, /* domainGetSchedulerParameters */
+    remoteDomainSetSchedulerParameters, /* domainSetSchedulerParameters */
+    remoteDomainMigratePrepare, /* domainMigratePrepare */
+    remoteDomainMigratePerform, /* domainMigratePerform */
+    remoteDomainMigrateFinish, /* domainMigrateFinish */
+    remoteDomainBlockStats, /* domainBlockStats */
+    remoteDomainInterfaceStats, /* domainInterfaceStats */
+    remoteDomainBlockPeek, /* domainBlockPeek */
+    remoteDomainMemoryPeek, /* domainMemoryPeek */
+    remoteNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */
+    remoteNodeGetFreeMemory, /* getFreeMemory */
+    remoteDomainEventRegister, /* domainEventRegister */
+    remoteDomainEventDeregister, /* domainEventDeregister */
+    remoteDomainMigratePrepare2, /* domainMigratePrepare2 */
+    remoteDomainMigrateFinish2, /* domainMigrateFinish2 */
+    remoteNodeDeviceDettach, /* nodeDeviceDettach */
+    remoteNodeDeviceReAttach, /* nodeDeviceReAttach */
+    remoteNodeDeviceReset, /* nodeDeviceReset */
 };
 
 static virNetworkDriver network_driver = {

diff --git a/src/test.c b/src/test.c
index 32292ebfcbf9d24d2faa1b6fd66910e5a613fafe..a5422e9d84066e495e78f39007a62fde521316c6 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -3474,8 +3474,7 @@ static virDriver testDriver = {
     NULL, /* supports_feature */
     NULL, /* type */
     testGetVersion, /* version */
-    testGetHostname, /* hostname */
-    NULL, /* URI */
+    testGetHostname, /* getHostname */
     testGetMaxVCPUs, /* getMaxVcpus */
     testNodeGetInfo, /* nodeGetInfo */
     testGetCapabilities, /* getCapabilities */
@@ -3530,7 +3529,7 @@ static virDriver testDriver = {
     testDomainEventDeregister, /* domainEventDeregister */
     NULL, /* domainMigratePrepare2 */
     NULL, /* domainMigrateFinish2 */
-    NULL, /* nodeDeviceAttach */
+    NULL, /* nodeDeviceDettach */
     NULL, /* nodeDeviceReAttach */
     NULL, /* nodeDeviceReset */
 };

diff --git a/src/uml_driver.c b/src/uml_driver.c
index f7400f958b6a53d9e65b11e619492a7e4ef081c8..0457f13c865b8f11352fc828dec032e554d1f042 100644 (file)
--- a/src/uml_driver.c
+++ b/src/uml_driver.c
@@ -1829,8 +1829,7 @@ static virDriver umlDriver = {
     NULL, /* supports_feature */
     umlGetType, /* type */
     umlGetVersion, /* version */
-    umlGetHostname, /* hostname */
-    NULL, /* URI  */
+    umlGetHostname, /* getHostname */
     NULL, /* getMaxVcpus */
     umlGetNodeInfo, /* nodeGetInfo */
     umlGetCapabilities, /* getCapabilities */
@@ -1860,8 +1859,8 @@ static virDriver umlDriver = {
     NULL, /* domainGetSecurityLabel */
     NULL, /* nodeGetSecurityModel */
     umlDomainDumpXML, /* domainDumpXML */
-    umlListDefinedDomains, /* listDomains */
-    umlNumDefinedDomains, /* numOfDomains */
+    umlListDefinedDomains, /* listDefinedDomains */
+    umlNumDefinedDomains, /* numOfDefinedDomains */
     umlDomainStart, /* domainCreate */
     umlDomainDefine, /* domainDefineXML */
     umlDomainUndefine, /* domainUndefine */
@@ -1887,10 +1886,10 @@ static virDriver umlDriver = {
     NULL, /* getFreeMemory */
 #endif
     NULL, /* domainEventRegister */
-    NULL, /* domainEventUnregister */
+    NULL, /* domainEventDeregister */
     NULL, /* domainMigratePrepare2 */
     NULL, /* domainMigrateFinish2 */
-    NULL, /* nodeDeviceAttach */
+    NULL, /* nodeDeviceDettach */
     NULL, /* nodeDeviceReAttach */
     NULL, /* nodeDeviceReset */
 };

diff --git a/src/xen_inotify.c b/src/xen_inotify.c
index b3677c859604bb441240f896b6b27c764954316a..f4716ca405cc8c623e0f0abb6cceb1a00aea8cc5 100644 (file)
--- a/src/xen_inotify.c
+++ b/src/xen_inotify.c
@@ -54,7 +54,6 @@ struct xenUnifiedDriver xenInotifyDriver = {
     xenInotifyClose, /* close */
     NULL, /* version */
     NULL, /* hostname */
-    NULL, /* URI */
     NULL, /* nodeGetInfo */
     NULL, /* getCapabilities */
     NULL, /* listDomains */

diff --git a/src/xen_internal.c b/src/xen_internal.c
index a866af16f1baf12e789c8a59e9b0be369bf34eba..7a88ca2f7d4c0bb72207ac6c3d7ac3de5e632e79 100644 (file)
--- a/src/xen_internal.c
+++ b/src/xen_internal.c
@@ -697,7 +697,6 @@ struct xenUnifiedDriver xenHypervisorDriver = {
     xenHypervisorClose, /* close */
     xenHypervisorGetVersion, /* version */
     NULL, /* hostname */
-    NULL, /* URI */
     NULL, /* nodeGetInfo */
     xenHypervisorGetCapabilities, /* getCapabilities */
     xenHypervisorListDomains, /* listDomains */

diff --git a/src/xen_unified.c b/src/xen_unified.c
index 8e64f51118391ad0b28c4ed9c0cb62257dc21159..04b31192d6531ed34ed4130256d4332f83a4fa1d 100644 (file)
--- a/src/xen_unified.c
+++ b/src/xen_unified.c
@@ -1424,63 +1424,71 @@ xenUnifiedDomainEventDeregister (virConnectPtr conn,
 
 /* The interface which we export upwards to libvirt.c. */
 static virDriver xenUnifiedDriver = {
-    .no = VIR_DRV_XEN_UNIFIED,
-    .name = "Xen",
-    .open                      = xenUnifiedOpen,
-    .close                     = xenUnifiedClose,
-    .supports_feature   = xenUnifiedSupportsFeature,
-    .type                      = xenUnifiedType,
-    .version                   = xenUnifiedGetVersion,
-    .getHostname    = xenUnifiedGetHostname,
-    .getMaxVcpus                       = xenUnifiedGetMaxVcpus,
-    .nodeGetInfo                       = xenUnifiedNodeGetInfo,
-    .getCapabilities           = xenUnifiedGetCapabilities,
-    .listDomains                       = xenUnifiedListDomains,
-    .numOfDomains              = xenUnifiedNumOfDomains,
-    .domainCreateXML           = xenUnifiedDomainCreateXML,
-    .domainLookupByID          = xenUnifiedDomainLookupByID,
-    .domainLookupByUUID                = xenUnifiedDomainLookupByUUID,
-    .domainLookupByName                = xenUnifiedDomainLookupByName,
-    .domainSuspend             = xenUnifiedDomainSuspend,
-    .domainResume              = xenUnifiedDomainResume,
-    .domainShutdown            = xenUnifiedDomainShutdown,
-    .domainReboot              = xenUnifiedDomainReboot,
-    .domainDestroy             = xenUnifiedDomainDestroy,
-    .domainGetOSType           = xenUnifiedDomainGetOSType,
-    .domainGetMaxMemory                = xenUnifiedDomainGetMaxMemory,
-    .domainSetMaxMemory                = xenUnifiedDomainSetMaxMemory,
-    .domainSetMemory           = xenUnifiedDomainSetMemory,
-    .domainGetInfo             = xenUnifiedDomainGetInfo,
-    .domainSave                        = xenUnifiedDomainSave,
-    .domainRestore             = xenUnifiedDomainRestore,
-    .domainCoreDump            = xenUnifiedDomainCoreDump,
-    .domainSetVcpus            = xenUnifiedDomainSetVcpus,
-    .domainPinVcpu             = xenUnifiedDomainPinVcpu,
-    .domainGetVcpus            = xenUnifiedDomainGetVcpus,
-    .domainGetMaxVcpus                 = xenUnifiedDomainGetMaxVcpus,
-    .domainDumpXML             = xenUnifiedDomainDumpXML,
-    .listDefinedDomains                = xenUnifiedListDefinedDomains,
-    .numOfDefinedDomains               = xenUnifiedNumOfDefinedDomains,
-    .domainCreate              = xenUnifiedDomainCreate,
-    .domainDefineXML           = xenUnifiedDomainDefineXML,
-    .domainUndefine            = xenUnifiedDomainUndefine,
-    .domainAttachDevice                = xenUnifiedDomainAttachDevice,
-    .domainDetachDevice                = xenUnifiedDomainDetachDevice,
-    .domainGetAutostart             = xenUnifiedDomainGetAutostart,
-    .domainSetAutostart             = xenUnifiedDomainSetAutostart,
-    .domainGetSchedulerType    = xenUnifiedDomainGetSchedulerType,
-    .domainGetSchedulerParameters      = xenUnifiedDomainGetSchedulerParameters,
-    .domainSetSchedulerParameters      = xenUnifiedDomainSetSchedulerParameters,
-    .domainMigratePrepare              = xenUnifiedDomainMigratePrepare,
-    .domainMigratePerform              = xenUnifiedDomainMigratePerform,
-    .domainMigrateFinish               = xenUnifiedDomainMigrateFinish,
-    .domainBlockStats  = xenUnifiedDomainBlockStats,
-    .domainInterfaceStats = xenUnifiedDomainInterfaceStats,
-    .domainBlockPeek   = xenUnifiedDomainBlockPeek,
-    .nodeGetCellsFreeMemory = xenUnifiedNodeGetCellsFreeMemory,
-    .getFreeMemory = xenUnifiedNodeGetFreeMemory,
-    .domainEventRegister = xenUnifiedDomainEventRegister,
-    .domainEventDeregister = xenUnifiedDomainEventDeregister,
+    VIR_DRV_XEN_UNIFIED,
+    "Xen",
+    xenUnifiedOpen, /* open */
+    xenUnifiedClose, /* close */
+    xenUnifiedSupportsFeature, /* supports_feature */
+    xenUnifiedType, /* type */
+    xenUnifiedGetVersion, /* version */
+    xenUnifiedGetHostname, /* getHostname */
+    xenUnifiedGetMaxVcpus, /* getMaxVcpus */
+    xenUnifiedNodeGetInfo, /* nodeGetInfo */
+    xenUnifiedGetCapabilities, /* getCapabilities */
+    xenUnifiedListDomains, /* listDomains */
+    xenUnifiedNumOfDomains, /* numOfDomains */
+    xenUnifiedDomainCreateXML, /* domainCreateXML */
+    xenUnifiedDomainLookupByID, /* domainLookupByID */
+    xenUnifiedDomainLookupByUUID, /* domainLookupByUUID */
+    xenUnifiedDomainLookupByName, /* domainLookupByName */
+    xenUnifiedDomainSuspend, /* domainSuspend */
+    xenUnifiedDomainResume, /* domainResume */
+    xenUnifiedDomainShutdown, /* domainShutdown */
+    xenUnifiedDomainReboot, /* domainReboot */
+    xenUnifiedDomainDestroy, /* domainDestroy */
+    xenUnifiedDomainGetOSType, /* domainGetOSType */
+    xenUnifiedDomainGetMaxMemory, /* domainGetMaxMemory */
+    xenUnifiedDomainSetMaxMemory, /* domainSetMaxMemory */
+    xenUnifiedDomainSetMemory, /* domainSetMemory */
+    xenUnifiedDomainGetInfo, /* domainGetInfo */
+    xenUnifiedDomainSave, /* domainSave */
+    xenUnifiedDomainRestore, /* domainRestore */
+    xenUnifiedDomainCoreDump, /* domainCoreDump */
+    xenUnifiedDomainSetVcpus, /* domainSetVcpus */
+    xenUnifiedDomainPinVcpu, /* domainPinVcpu */
+    xenUnifiedDomainGetVcpus, /* domainGetVcpus */
+    xenUnifiedDomainGetMaxVcpus, /* domainGetMaxVcpus */
+    NULL, /* domainGetSecurityLabel */
+    NULL, /* nodeGetSecurityModel */
+    xenUnifiedDomainDumpXML, /* domainDumpXML */
+    xenUnifiedListDefinedDomains, /* listDefinedDomains */
+    xenUnifiedNumOfDefinedDomains, /* numOfDefinedDomains */
+    xenUnifiedDomainCreate, /* domainCreate */
+    xenUnifiedDomainDefineXML, /* domainDefineXML */
+    xenUnifiedDomainUndefine, /* domainUndefine */
+    xenUnifiedDomainAttachDevice, /* domainAttachDevice */
+    xenUnifiedDomainDetachDevice, /* domainDetachDevice */
+    xenUnifiedDomainGetAutostart, /* domainGetAutostart */
+    xenUnifiedDomainSetAutostart, /* domainSetAutostart */
+    xenUnifiedDomainGetSchedulerType, /* domainGetSchedulerType */
+    xenUnifiedDomainGetSchedulerParameters, /* domainGetSchedulerParameters */
+    xenUnifiedDomainSetSchedulerParameters, /* domainSetSchedulerParameters */
+    xenUnifiedDomainMigratePrepare, /* domainMigratePrepare */
+    xenUnifiedDomainMigratePerform, /* domainMigratePerform */
+    xenUnifiedDomainMigrateFinish, /* domainMigrateFinish */
+    xenUnifiedDomainBlockStats, /* domainBlockStats */
+    xenUnifiedDomainInterfaceStats, /* domainInterfaceStats */
+    xenUnifiedDomainBlockPeek, /* domainBlockPeek */
+    NULL, /* domainMemoryPeek */
+    xenUnifiedNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */
+    xenUnifiedNodeGetFreeMemory, /* getFreeMemory */
+    xenUnifiedDomainEventRegister, /* domainEventRegister */
+    xenUnifiedDomainEventDeregister, /* domainEventDeregister */
+    NULL, /* domainMigratePrepare2 */
+    NULL, /* domainMigrateFinish2 */
+    NULL, /* nodeDeviceDettach */
+    NULL, /* nodeDeviceReAttach */
+    NULL, /* nodeDeviceReset */
 };
 
 /**

diff --git a/src/xen_unified.h b/src/xen_unified.h
index 3123bd71dee2695f0cd83922767515d142deded2..6ec19c19ba756e1128ac4109e48c4765a9ca6955 100644 (file)
--- a/src/xen_unified.h
+++ b/src/xen_unified.h
@@ -61,7 +61,6 @@ struct xenUnifiedDriver {
         virDrvClose                    close;
         virDrvGetVersion               version;
     virDrvGetHostname       getHostname;
-    virDrvGetURI            getURI;
         virDrvNodeGetInfo              nodeGetInfo;
         virDrvGetCapabilities          getCapabilities;
         virDrvListDomains              listDomains;

diff --git a/src/xend_internal.c b/src/xend_internal.c
index c6d6fa49f1a66ec943cc10fe0cd39ced0aadecd2..cc2e803d7872c48e8922bed3036b08d4b8c14ac1 100644 (file)
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -4839,7 +4839,6 @@ struct xenUnifiedDriver xenDaemonDriver = {
     xenDaemonClose,              /* close */
     xenDaemonGetVersion,         /* version */
     NULL,                        /* hostname */
-    NULL,                        /* URI */
     xenDaemonNodeGetInfo,        /* nodeGetInfo */
     NULL,                        /* getCapabilities */
     xenDaemonListDomains,        /* listDomains */

diff --git a/src/xm_internal.c b/src/xm_internal.c
index 851939196680995512dc67ce131c2cf2049c5371..5456a8d59d75f801faae8c62a9c237436cd775f5 100644 (file)
--- a/src/xm_internal.c
+++ b/src/xm_internal.c
@@ -82,7 +82,6 @@ struct xenUnifiedDriver xenXMDriver = {
     xenXMClose, /* close */
     NULL, /* version */
     NULL, /* hostname */
-    NULL, /* URI */
     NULL, /* nodeGetInfo */
     NULL, /* getCapabilities */
     NULL, /* listDomains */

diff --git a/src/xs_internal.c b/src/xs_internal.c
index 50cc575f806cbd5251d141d33d56679c797f9932..1f54b1f0e7c70410ec5c0b176c1655ddfcf68186 100644 (file)
--- a/src/xs_internal.c
+++ b/src/xs_internal.c
@@ -49,7 +49,6 @@ struct xenUnifiedDriver xenStoreDriver = {
     xenStoreClose, /* close */
     NULL, /* version */
     NULL, /* hostname */
-    NULL, /* URI */
     NULL, /* nodeGetInfo */
     NULL, /* getCapabilities */
     xenStoreListDomains, /* listDomains */