[libvirt] [PATCH 06/31] src/xenxs: Remove the whitespace before '; '
Osier Yang
jyang at redhat.com
Tue May 21 10:00:36 UTC 2013
---
src/xenxs/xen_sxpr.c | 20 ++++++++++----------
src/xenxs/xen_xm.c | 16 ++++++++--------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c
index 9a76d04..16737a0 100644
--- a/src/xenxs/xen_sxpr.c
+++ b/src/xenxs/xen_sxpr.c
@@ -676,7 +676,7 @@ xenParseSxprSound(virDomainDefPtr def,
goto no_memory;
- for (i = 0 ; i < (VIR_DOMAIN_SOUND_MODEL_ES1370 + 1) ; i++) {
+ for (i = 0; i < (VIR_DOMAIN_SOUND_MODEL_ES1370 + 1); i++) {
virDomainSoundDefPtr sound;
if (VIR_ALLOC(sound) < 0)
goto no_memory;
@@ -1387,7 +1387,7 @@ xenParseSxpr(const struct sexpr *root,
if (hvm) {
const char *const fds[] = { "fda", "fdb" };
int i;
- for (i = 0 ; i < ARRAY_CARDINALITY(fds) ; i++) {
+ for (i = 0; i < ARRAY_CARDINALITY(fds); i++) {
tmp = sexpr_fmt_node(root, "domain/image/hvm/%s", fds[i]);
if ((tmp != NULL) && (tmp[0] != 0)) {
virDomainDiskDefPtr disk;
@@ -2101,7 +2101,7 @@ xenFormatSxprAllPCI(virDomainDefPtr def,
int hasPCI = 0;
int i;
- for (i = 0 ; i < def->nhostdevs ; i++)
+ for (i = 0; i < def->nhostdevs; i++)
if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
def->hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
hasPCI = 1;
@@ -2124,7 +2124,7 @@ xenFormatSxprAllPCI(virDomainDefPtr def,
*/
virBufferAddLit(buf, "(device (pci ");
- for (i = 0 ; i < def->nhostdevs ; i++) {
+ for (i = 0; i < def->nhostdevs; i++) {
if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
def->hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) {
if (def->hostdevs[i]->managed) {
@@ -2158,7 +2158,7 @@ xenFormatSxprSound(virDomainDefPtr def,
const char *str;
int i;
- for (i = 0 ; i < def->nsounds ; i++) {
+ for (i = 0; i < def->nsounds; i++) {
if (!(str = virDomainSoundModelTypeToString(def->sounds[i]->model))) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("unexpected sound model %d"),
@@ -2333,7 +2333,7 @@ xenFormatSxpr(virConnectPtr conn,
virBufferAsprintf(&buf, "(vcpu_avail %lu)",
(1UL << def->vcpus) - 1);
- for (i = 0 ; i < def->os.nBootDevs ; i++) {
+ for (i = 0; i < def->os.nBootDevs; i++) {
switch (def->os.bootDevs[i]) {
case VIR_DOMAIN_BOOT_FLOPPY:
bootorder[i] = 'a';
@@ -2359,7 +2359,7 @@ xenFormatSxpr(virConnectPtr conn,
virBufferAsprintf(&buf, "(boot %s)", bootorder);
/* some disk devices are defined here */
- for (i = 0 ; i < def->ndisks ; i++) {
+ for (i = 0; i < def->ndisks; i++) {
switch (def->disks[i]->device) {
case VIR_DOMAIN_DISK_DEVICE_CDROM:
/* Only xend <= 3.0.2 wants cdrom config here */
@@ -2397,7 +2397,7 @@ xenFormatSxpr(virConnectPtr conn,
virBufferAddLit(&buf, "(usb 1)");
- for (i = 0 ; i < def->ninputs ; i++)
+ for (i = 0; i < def->ninputs; i++)
if (xenFormatSxprInput(def->inputs[i], &buf) < 0)
goto error;
@@ -2571,12 +2571,12 @@ xenFormatSxpr(virConnectPtr conn,
virBufferAsprintf(&buf, "(localtime %d)", vmlocaltime);
- for (i = 0 ; i < def->ndisks ; i++)
+ for (i = 0; i < def->ndisks; i++)
if (xenFormatSxprDisk(def->disks[i],
&buf, hvm, xendConfigVersion, 0) < 0)
goto error;
- for (i = 0 ; i < def->nnets ; i++)
+ for (i = 0; i < def->nnets; i++)
if (xenFormatSxprNet(conn, def->nets[i],
&buf, hvm, xendConfigVersion, 0) < 0)
goto error;
diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c
index 57ce2e7..11c02c1 100644
--- a/src/xenxs/xen_xm.c
+++ b/src/xenxs/xen_xm.c
@@ -319,7 +319,7 @@ xenParseXM(virConfPtr conf, int xendConfigVersion,
if (xenXMConfigGetString(conf, "boot", &boot, "c") < 0)
goto cleanup;
- for (i = 0 ; i < VIR_DOMAIN_BOOT_LAST && boot[i] ; i++) {
+ for (i = 0; i < VIR_DOMAIN_BOOT_LAST && boot[i]; i++) {
switch (*boot) {
case 'a':
def->os.bootDevs[i] = VIR_DOMAIN_BOOT_FLOPPY;
@@ -1448,7 +1448,7 @@ xenFormatXMPCI(virConfPtr conf,
int hasPCI = 0;
int i;
- for (i = 0 ; i < def->nhostdevs ; i++)
+ for (i = 0; i < def->nhostdevs; i++)
if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
def->hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
hasPCI = 1;
@@ -1464,7 +1464,7 @@ xenFormatXMPCI(virConfPtr conf,
pciVal->type = VIR_CONF_LIST;
pciVal->list = NULL;
- for (i = 0 ; i < def->nhostdevs ; i++) {
+ for (i = 0; i < def->nhostdevs; i++) {
if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
def->hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) {
virConfValuePtr val, tmp;
@@ -1575,7 +1575,7 @@ virConfPtr xenFormatXM(virConnectPtr conn,
xenXMConfigSetString(conf, "kernel", def->os.loader) < 0)
goto no_memory;
- for (i = 0 ; i < def->os.nBootDevs ; i++) {
+ for (i = 0; i < def->os.nBootDevs; i++) {
switch (def->os.bootDevs[i]) {
case VIR_DOMAIN_BOOT_FLOPPY:
boot[i] = 'a';
@@ -1637,7 +1637,7 @@ virConfPtr xenFormatXM(virConnectPtr conn,
}
if (xendConfigVersion == XEND_CONFIG_VERSION_3_0_2) {
- for (i = 0 ; i < def->ndisks ; i++) {
+ for (i = 0; i < def->ndisks; i++) {
if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_CDROM &&
def->disks[i]->dst &&
STREQ(def->disks[i]->dst, "hdc") &&
@@ -1774,7 +1774,7 @@ virConfPtr xenFormatXM(virConnectPtr conn,
xenXMConfigSetString(conf, "device_model", def->emulator) < 0)
goto no_memory;
- for (i = 0 ; i < def->ninputs ; i++) {
+ for (i = 0; i < def->ninputs; i++) {
if (def->inputs[i]->bus == VIR_DOMAIN_INPUT_BUS_USB) {
if (xenXMConfigSetInt(conf, "usb", 1) < 0)
goto no_memory;
@@ -1894,7 +1894,7 @@ virConfPtr xenFormatXM(virConnectPtr conn,
diskVal->type = VIR_CONF_LIST;
diskVal->list = NULL;
- for (i = 0 ; i < def->ndisks ; i++) {
+ for (i = 0; i < def->ndisks; i++) {
if (xendConfigVersion == XEND_CONFIG_VERSION_3_0_2 &&
def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_CDROM &&
def->disks[i]->dst &&
@@ -1921,7 +1921,7 @@ virConfPtr xenFormatXM(virConnectPtr conn,
netVal->type = VIR_CONF_LIST;
netVal->list = NULL;
- for (i = 0 ; i < def->nnets ; i++) {
+ for (i = 0; i < def->nnets; i++) {
if (xenFormatXMNet(conn, netVal,def->nets[i],
hvm, xendConfigVersion) < 0)
goto cleanup;
--
1.8.1.4
More information about the libvir-list
mailing list