External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 22:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

maint: fix comma style issues: vbox

Browse Source 
Most of our code base uses space after comma but not before;
fix the remaining uses before adding a syntax check.

* src/vbox/vbox_tmpl.c: Consistently use commas.

Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Eric Blake 2013-11-19 16:35:10 -07:00
parent 1c324631fb
commit eeed3bc63c
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/vbox/vbox_tmpl.c
View File

@ -1071,7 +1071,7 @@ static virDrvOpenStatus vboxConnectOpen(virConnectPtr conn,
static int vboxConnectClose(virConnectPtr conn) { static int vboxConnectClose(virConnectPtr conn) {
vboxGlobalData *data = conn->privateData; vboxGlobalData *data = conn->privateData;
VIR_DEBUG("%s: in vboxClose",conn->driver->name); VIR_DEBUG("%s: in vboxClose", conn->driver->name);
vboxUninitialize(data); vboxUninitialize(data);
conn->privateData = NULL; conn->privateData = NULL;
@ -1081,7 +1081,7 @@ static int vboxConnectClose(virConnectPtr conn) {
static int vboxConnectGetVersion(virConnectPtr conn, unsigned long *version) { static int vboxConnectGetVersion(virConnectPtr conn, unsigned long *version) {
vboxGlobalData *data = conn->privateData; vboxGlobalData *data = conn->privateData;
VIR_DEBUG("%s: in vboxGetVersion",conn->driver->name); VIR_DEBUG("%s: in vboxGetVersion", conn->driver->name);
vboxDriverLock(data); vboxDriverLock(data);
*version = data->version; *version = data->version;
@ -1154,7 +1154,8 @@ static int vboxConnectListDomains(virConnectPtr conn, int *ids, int nids) {
rc = vboxArrayGet(&machines, data->vboxObj, data->vboxObj->vtbl->GetMachines); rc = vboxArrayGet(&machines, data->vboxObj, data->vboxObj->vtbl->GetMachines);
if (NS_FAILED(rc)) { if (NS_FAILED(rc)) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Could not get list of Domains, rc=%08x"),(unsigned)rc); _("Could not get list of Domains, rc=%08x"),
(unsigned)rc);
goto cleanup; goto cleanup;
} }
@ -4374,18 +4375,18 @@ vboxAttachNetwork(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine)
adapter->vtbl->SetEnabled(adapter, 1); adapter->vtbl->SetEnabled(adapter, 1);
if (def->nets[i]->model) { if (def->nets[i]->model) {
if (STRCASEEQ(def->nets[i]->model , "Am79C970A")) { if (STRCASEEQ(def->nets[i]->model, "Am79C970A")) {
adapterType = NetworkAdapterType_Am79C970A; adapterType = NetworkAdapterType_Am79C970A;
} else if (STRCASEEQ(def->nets[i]->model , "Am79C973")) { } else if (STRCASEEQ(def->nets[i]->model, "Am79C973")) {
adapterType = NetworkAdapterType_Am79C973; adapterType = NetworkAdapterType_Am79C973;
} else if (STRCASEEQ(def->nets[i]->model , "82540EM")) { } else if (STRCASEEQ(def->nets[i]->model, "82540EM")) {
adapterType = NetworkAdapterType_I82540EM; adapterType = NetworkAdapterType_I82540EM;
} else if (STRCASEEQ(def->nets[i]->model , "82545EM")) { } else if (STRCASEEQ(def->nets[i]->model, "82545EM")) {
adapterType = NetworkAdapterType_I82545EM; adapterType = NetworkAdapterType_I82545EM;
} else if (STRCASEEQ(def->nets[i]->model , "82543GC")) { } else if (STRCASEEQ(def->nets[i]->model, "82543GC")) {
adapterType = NetworkAdapterType_I82543GC; adapterType = NetworkAdapterType_I82543GC;
#if VBOX_API_VERSION >= 3001 #if VBOX_API_VERSION >= 3001
} else if (STRCASEEQ(def->nets[i]->model , "virtio")) { } else if (STRCASEEQ(def->nets[i]->model, "virtio")) {
adapterType = NetworkAdapterType_Virtio; adapterType = NetworkAdapterType_Virtio;
#endif /* VBOX_API_VERSION >= 3001 */ #endif /* VBOX_API_VERSION >= 3001 */
} }
@ -7730,7 +7731,7 @@ static virNetworkPtr vboxNetworkDefineCreateXML(virConnectPtr conn, const char *
} }
} }
VBOX_UTF8_TO_UTF16(networkNameUtf8 , &networkNameUtf16); VBOX_UTF8_TO_UTF16(networkNameUtf8, &networkNameUtf16);
/* Currently support only one dhcp server per network /* Currently support only one dhcp server per network
* with contigious address space from start to end * with contigious address space from start to end
@ -7922,7 +7923,7 @@ static int vboxNetworkUndefineDestroy(virNetworkPtr network, bool removeinterfac
} }
#endif /* VBOX_API_VERSION != 2002 */ #endif /* VBOX_API_VERSION != 2002 */
VBOX_UTF8_TO_UTF16(networkNameUtf8 , &networkNameUtf16); VBOX_UTF8_TO_UTF16(networkNameUtf8, &networkNameUtf16);
data->vboxObj->vtbl->FindDHCPServerByNetworkName(data->vboxObj, data->vboxObj->vtbl->FindDHCPServerByNetworkName(data->vboxObj,
networkNameUtf16, networkNameUtf16,
@ -7985,7 +7986,7 @@ static int vboxNetworkCreate(virNetworkPtr network) {
IDHCPServer *dhcpServer = NULL; IDHCPServer *dhcpServer = NULL;
VBOX_UTF8_TO_UTF16(networkNameUtf8 , &networkNameUtf16); VBOX_UTF8_TO_UTF16(networkNameUtf8, &networkNameUtf16);
data->vboxObj->vtbl->FindDHCPServerByNetworkName(data->vboxObj, data->vboxObj->vtbl->FindDHCPServerByNetworkName(data->vboxObj,
networkNameUtf16, networkNameUtf16,
@ -8066,7 +8067,7 @@ static char *vboxNetworkGetXMLDesc(virNetworkPtr network,
networkInterface->vtbl->GetId(networkInterface, &vboxnet0IID.value); networkInterface->vtbl->GetId(networkInterface, &vboxnet0IID.value);
vboxIIDToUUID(&vboxnet0IID, def->uuid); vboxIIDToUUID(&vboxnet0IID, def->uuid);
VBOX_UTF8_TO_UTF16(networkNameUtf8 , &networkNameUtf16); VBOX_UTF8_TO_UTF16(networkNameUtf8, &networkNameUtf16);
def->forward.type = VIR_NETWORK_FORWARD_NONE; def->forward.type = VIR_NETWORK_FORWARD_NONE;