--- src/vbox/vbox_common.c | 4 ++-- src/vbox/vbox_common.h | 4 ++-- src/vbox/vbox_snapshot_conf.c | 4 ++-- src/vbox/vbox_tmpl.c | 6 +++--- src/vbox/vbox_uniformed_api.h | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 718a2f8..067ed97 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -1519,8 +1519,8 @@ vboxAttachParallel(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) * LPT2 (Base Addr: 0x278 (decimal: 632), IRQ: 5) * TODO: make this more flexible */ - if ((def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_DEV) || - (def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY) || + 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_FILE) || (def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_PIPE)) { gVBoxAPI.UIParallelPort.SetPath(parallelPort, pathUtf16); diff --git a/src/vbox/vbox_common.h b/src/vbox/vbox_common.h index eb7fd76..fc517ac 100644 --- a/src/vbox/vbox_common.h +++ b/src/vbox/vbox_common.h @@ -64,7 +64,7 @@ typedef short PRInt16; typedef unsigned int PRUint32; typedef int PRInt32; -# define PR_INT32(x) x +# define PR_INT32(x) x # define PR_UINT32(x) x ## U # define PR_INT32_MAX PR_INT32(2147483647) @@ -76,7 +76,7 @@ typedef unsigned long PRUint64; typedef int PRIntn; typedef unsigned int PRUintn; -typedef double PRFloat64; +typedef double PRFloat64; typedef size_t PRSize; typedef ptrdiff_t PRPtrdiff; diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c index 57df1fd..2520a02 100644 --- a/src/vbox/vbox_snapshot_conf.c +++ b/src/vbox/vbox_snapshot_conf.c @@ -27,7 +27,7 @@ #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"); static virVBoxSnapshotConfHardDiskPtr @@ -256,7 +256,7 @@ virVBoxSnapshotConfRetrieveSnapshot(xmlNodePtr snapshotNode, if (n && VIR_ALLOC_N(snapshot->children, n) < 0) goto cleanup; snapshot->nchildren = n; - for (i = 0; i < snapshot->nchildren; i++) { + for (i = 0; i < snapshot->nchildren; i++) { snapshot->children[i] = virVBoxSnapshotConfRetrieveSnapshot(nodes[i], xPathContext); if (snapshot->children[i] == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index ef53694..cc86bf7 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -2171,15 +2171,15 @@ _dumpIDEHDDsOld(virDomainDefPtr def, VBOX_UTF8_TO_UTF16(hddBus, &hddBusUtf16); def->ndisks = 0; - machine->vtbl->GetHardDisk(machine, hddBusUtf16, 0, 0, &hardDiskPM); + machine->vtbl->GetHardDisk(machine, hddBusUtf16, 0, 0, &hardDiskPM); if (hardDiskPM) def->ndisks++; - machine->vtbl->GetHardDisk(machine, hddBusUtf16, 0, 1, &hardDiskPS); + machine->vtbl->GetHardDisk(machine, hddBusUtf16, 0, 1, &hardDiskPS); if (hardDiskPS) def->ndisks++; - machine->vtbl->GetHardDisk(machine, hddBusUtf16, 1, 1, &hardDiskSS); + machine->vtbl->GetHardDisk(machine, hddBusUtf16, 1, 1, &hardDiskSS); if (hardDiskSS) def->ndisks++; diff --git a/src/vbox/vbox_uniformed_api.h b/src/vbox/vbox_uniformed_api.h index 5d190ce..a469968 100644 --- a/src/vbox/vbox_uniformed_api.h +++ b/src/vbox/vbox_uniformed_api.h @@ -116,7 +116,7 @@ typedef struct { virObjectEventStatePtr domainEvents; int fdWatch; IVirtualBoxCallback *vboxCallback; - nsIEventQueue *vboxQueue; + nsIEventQueue *vboxQueue; int volatile vboxCallBackRefCount; -- 2.4.10 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list