[libvirt] PATCH: Convert VBox driver to preferred style

Daniel P. Berrange berrange at redhat.com
Tue Jun 2 10:09:24 UTC 2009


The driver function table in the VBox driver is currently using named 
struct member initializers. We previously removed all these from other
drivers, so we have a clearer indication of missing APIs in each driver.
This patch updates VBox to follow the preferred style

Daniel

diff -r f639344b66bc src/vbox/vbox_tmpl.c
--- a/src/vbox/vbox_tmpl.c	Thu May 28 11:36:37 2009 +0100
+++ b/src/vbox/vbox_tmpl.c	Thu May 28 11:55:49 2009 +0100
@@ -4899,64 +4899,72 @@ cleanup:
 virDriver NAME(Driver) = {
     VIR_DRV_VBOX,
     "VBOX",
-    .open                          = vboxOpen,
-    .close                         = vboxClose,
-    .supports_feature              = NULL,
-    .type                          = NULL,
-    .version                       = vboxGetVersion,
-    .getHostname                   = vboxGetHostname,
-    .getMaxVcpus                   = vboxGetMaxVcpus,
-    .nodeGetInfo                   = nodeGetInfo,
-    .getCapabilities               = vboxGetCapabilities,
-    .listDomains                   = vboxListDomains,
-    .numOfDomains                  = vboxNumOfDomains,
-    .domainCreateXML               = vboxDomainCreateXML,
-    .domainLookupByID              = vboxDomainLookupByID,
-    .domainLookupByUUID            = vboxDomainLookupByUUID,
-    .domainLookupByName            = vboxDomainLookupByName,
-    .domainSuspend                 = vboxDomainSuspend,
-    .domainResume                  = vboxDomainResume,
-    .domainShutdown                = vboxDomainShutdown,
-    .domainReboot                  = vboxDomainReboot,
-    .domainDestroy                 = vboxDomainDestroy,
-    .domainGetOSType               = vboxDomainGetOSType,
-    .domainGetMaxMemory            = NULL,
-    .domainSetMaxMemory            = NULL,
-    .domainSetMemory               = vboxDomainSetMemory,
-    .domainGetInfo                 = vboxDomainGetInfo,
-    .domainSave                    = vboxDomainSave,
-    .domainRestore                 = NULL,
-    .domainCoreDump                = NULL,
-    .domainSetVcpus                = NULL,
-    .domainPinVcpu                 = NULL,
-    .domainGetVcpus                = NULL,
-    .domainGetMaxVcpus             = NULL,
-    .domainDumpXML                 = vboxDomainDumpXML,
-    .listDefinedDomains            = vboxListDefinedDomains,
-    .numOfDefinedDomains           = vboxNumOfDefinedDomains,
-    .domainCreate                  = vboxDomainCreate,
-    .domainDefineXML               = vboxDomainDefineXML,
-    .domainUndefine                = vboxDomainUndefine,
-    .domainAttachDevice            = vboxDomainAttachDevice,
-    .domainDetachDevice            = vboxDomainDetachDevice,
-    .domainGetAutostart            = NULL,
-    .domainSetAutostart            = NULL,
-    .domainGetSchedulerType        = NULL,
-    .domainGetSchedulerParameters  = NULL,
-    .domainSetSchedulerParameters  = NULL,
-    .domainMigratePrepare          = NULL,
-    .domainMigratePerform          = NULL,
-    .domainMigrateFinish           = NULL,
-    .domainBlockStats              = NULL,
-    .domainInterfaceStats          = NULL,
-    .domainBlockPeek               = NULL,
-    .domainMemoryPeek              = NULL,
-    .nodeGetCellsFreeMemory        = NULL,
-    .getFreeMemory                 = NULL,
-    .domainEventRegister           = NULL,
-    .domainEventDeregister         = NULL,
-    .domainMigratePrepare2         = NULL,
-    .domainMigrateFinish2          = NULL,
+    vboxOpen, /* open */
+    vboxClose, /* close */
+    NULL, /* supports_feature */
+    NULL, /* type */
+    vboxGetVersion, /* version */
+    vboxGetHostname, /* getHostname */
+    vboxGetMaxVcpus, /* getMaxVcpus */
+    nodeGetInfo, /* nodeGetInfo */
+    vboxGetCapabilities, /* getCapabilities */
+    vboxListDomains, /* listDomains */
+    vboxNumOfDomains, /* numOfDomains */
+    vboxDomainCreateXML, /* domainCreateXML */
+    vboxDomainLookupByID, /* domainLookupByID */
+    vboxDomainLookupByUUID, /* domainLookupByUUID */
+    vboxDomainLookupByName, /* domainLookupByName */
+    vboxDomainSuspend, /* domainSuspend */
+    vboxDomainResume, /* domainResume */
+    vboxDomainShutdown, /* domainShutdown */
+    vboxDomainReboot, /* domainReboot */
+    vboxDomainDestroy, /* domainDestroy */
+    vboxDomainGetOSType, /* domainGetOSType */
+    NULL, /* domainGetMaxMemory */
+    NULL, /* domainSetMaxMemory */
+    vboxDomainSetMemory, /* domainSetMemory */
+    vboxDomainGetInfo, /* domainGetInfo */
+    vboxDomainSave, /* domainSave */
+    NULL, /* domainRestore */
+    NULL, /* domainCoreDump */
+    NULL, /* domainSetVcpus */
+    NULL, /* domainPinVcpu */
+    NULL, /* domainGetVcpus */
+    NULL, /* domainGetMaxVcpus */
+    NULL, /* domainGetSecurityLabel */
+    NULL, /* nodeGetSecurityModel */
+    vboxDomainDumpXML, /* domainDumpXML */
+    NULL, /* domainXmlFromNative */
+    NULL, /* domainXmlToNative */
+    vboxListDefinedDomains, /* listDefinedDomains */
+    vboxNumOfDefinedDomains, /* numOfDefinedDomains */
+    vboxDomainCreate, /* domainCreate */
+    vboxDomainDefineXML, /* domainDefineXML */
+    vboxDomainUndefine, /* domainUndefine */
+    vboxDomainAttachDevice, /* domainAttachDevice */
+    vboxDomainDetachDevice, /* domainDetachDevice */
+    NULL, /* domainGetAutostart */
+    NULL, /* domainSetAutostart */
+    NULL, /* domainGetSchedulerType */
+    NULL, /* domainGetSchedulerParameters */
+    NULL, /* domainSetSchedulerParameters */
+    NULL, /* domainMigratePrepare */
+    NULL, /* domainMigratePerform */
+    NULL, /* domainMigrateFinish */
+    NULL, /* domainBlockStats */
+    NULL, /* domainInterfaceStats */
+    NULL, /* domainBlockPeek */
+    NULL, /* domainMemoryPeek */
+    NULL, /* nodeGetCellsFreeMemory */
+    NULL,  /* getFreeMemory */
+    NULL, /* domainEventRegister */
+    NULL, /* domainEventDeregister */
+    NULL, /* domainMigratePrepare2 */
+    NULL, /* domainMigrateFinish2 */
+    NULL, /* nodeDeviceDettach */
+    NULL, /* nodeDeviceReAttach */
+    NULL, /* nodeDeviceReset */
+
 };
 
 virNetworkDriver NAME(NetworkDriver) = {


-- 
|: Red Hat, Engineering, London   -o-   http://people.redhat.com/berrange/ :|
|: http://libvirt.org  -o-  http://virt-manager.org  -o-  http://ovirt.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505  -o-  F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|




More information about the libvir-list mailing list