External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

vbox: remove more extra spaces

Browse Source
This commit is contained in:
Ján Tomko 2016-02-09 12:38:36 +01:00
parent a3dd574a07
commit 4d569245f0
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/vbox/vbox_common.c
View File

@ -1519,8 +1519,8 @@ vboxAttachParallel(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine)
* LPT2 (Base Addr: 0x278 (decimal: 632), IRQ: 5) * LPT2 (Base Addr: 0x278 (decimal: 632), IRQ: 5)
* TODO: make this more flexible * TODO: make this more flexible
*/ */
if ((def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_DEV) || if ((def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_DEV) ||
(def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY) || (def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY) ||
(def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_FILE) || (def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_FILE) ||
(def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_PIPE)) { (def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_PIPE)) {
gVBoxAPI.UIParallelPort.SetPath(parallelPort, pathUtf16); gVBoxAPI.UIParallelPort.SetPath(parallelPort, pathUtf16);

4
src/vbox/vbox_common.h
View File

@ -64,7 +64,7 @@ typedef short PRInt16;
typedef unsigned int PRUint32; typedef unsigned int PRUint32;
typedef int PRInt32; typedef int PRInt32;
# define PR_INT32(x) x # define PR_INT32(x) x
# define PR_UINT32(x) x ## U # define PR_UINT32(x) x ## U
# define PR_INT32_MAX PR_INT32(2147483647) # define PR_INT32_MAX PR_INT32(2147483647)
@ -76,7 +76,7 @@ typedef unsigned long PRUint64;
typedef int PRIntn; typedef int PRIntn;
typedef unsigned int PRUintn; typedef unsigned int PRUintn;
typedef double PRFloat64; typedef double PRFloat64;
typedef size_t PRSize; typedef size_t PRSize;
typedef ptrdiff_t PRPtrdiff; typedef ptrdiff_t PRPtrdiff;

4
src/vbox/vbox_snapshot_conf.c
View File

@ -27,7 +27,7 @@
#include <libxml/xpathInternals.h> #include <libxml/xpathInternals.h>
#define VIR_FROM_THIS VIR_FROM_VBOX #define VIR_FROM_THIS VIR_FROM_VBOX
VIR_LOG_INIT("vbox.vbox_snapshot_conf"); VIR_LOG_INIT("vbox.vbox_snapshot_conf");
static virVBoxSnapshotConfHardDiskPtr static virVBoxSnapshotConfHardDiskPtr
@ -256,7 +256,7 @@ virVBoxSnapshotConfRetrieveSnapshot(xmlNodePtr snapshotNode,
if (n && VIR_ALLOC_N(snapshot->children, n) < 0) if (n && VIR_ALLOC_N(snapshot->children, n) < 0)
goto cleanup; goto cleanup;
snapshot->nchildren = n; snapshot->nchildren = n;
for (i = 0; i < snapshot->nchildren; i++) { for (i = 0; i < snapshot->nchildren; i++) {
snapshot->children[i] = virVBoxSnapshotConfRetrieveSnapshot(nodes[i], xPathContext); snapshot->children[i] = virVBoxSnapshotConfRetrieveSnapshot(nodes[i], xPathContext);
if (snapshot->children[i] == NULL) { if (snapshot->children[i] == NULL) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",

6
src/vbox/vbox_tmpl.c
View File

@ -2171,15 +2171,15 @@ _dumpIDEHDDsOld(virDomainDefPtr def,
VBOX_UTF8_TO_UTF16(hddBus, &hddBusUtf16); VBOX_UTF8_TO_UTF16(hddBus, &hddBusUtf16);
def->ndisks = 0; def->ndisks = 0;
machine->vtbl->GetHardDisk(machine, hddBusUtf16, 0, 0, &hardDiskPM); machine->vtbl->GetHardDisk(machine, hddBusUtf16, 0, 0, &hardDiskPM);
if (hardDiskPM) if (hardDiskPM)
def->ndisks++; def->ndisks++;
machine->vtbl->GetHardDisk(machine, hddBusUtf16, 0, 1, &hardDiskPS); machine->vtbl->GetHardDisk(machine, hddBusUtf16, 0, 1, &hardDiskPS);
if (hardDiskPS) if (hardDiskPS)
def->ndisks++; def->ndisks++;
machine->vtbl->GetHardDisk(machine, hddBusUtf16, 1, 1, &hardDiskSS); machine->vtbl->GetHardDisk(machine, hddBusUtf16, 1, 1, &hardDiskSS);
if (hardDiskSS) if (hardDiskSS)
def->ndisks++; def->ndisks++;

2
src/vbox/vbox_uniformed_api.h
View File

@ -116,7 +116,7 @@ typedef struct {
virObjectEventStatePtr domainEvents; virObjectEventStatePtr domainEvents;
int fdWatch; int fdWatch;
IVirtualBoxCallback *vboxCallback; IVirtualBoxCallback *vboxCallback;
nsIEventQueue *vboxQueue; nsIEventQueue *vboxQueue;
int volatile vboxCallBackRefCount; int volatile vboxCallBackRefCount;