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

src/uml: Remove the whitespace before ';'

Browse Source
This commit is contained in:
Osier Yang 2013-05-21 15:21:19 +08:00
parent ba38541567
commit f23c87a711
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/uml/uml_conf.c
View File

@ -407,7 +407,7 @@ virCommandPtr umlBuildCommandLine(virConnectPtr conn,
if (vm->def->os.root) if (vm->def->os.root)
virCommandAddArgPair(cmd, "root", vm->def->os.root); virCommandAddArgPair(cmd, "root", vm->def->os.root);
for (i = 0 ; i < vm->def->ndisks ; i++) { for (i = 0; i < vm->def->ndisks; i++) {
virDomainDiskDefPtr disk = vm->def->disks[i]; virDomainDiskDefPtr disk = vm->def->disks[i];
if (!STRPREFIX(disk->dst, "ubd")) { if (!STRPREFIX(disk->dst, "ubd")) {
@ -419,7 +419,7 @@ virCommandPtr umlBuildCommandLine(virConnectPtr conn,
virCommandAddArgPair(cmd, disk->dst, disk->src); virCommandAddArgPair(cmd, disk->dst, disk->src);
} }
for (i = 0 ; i < vm->def->nnets ; i++) { for (i = 0; i < vm->def->nnets; i++) {
char *ret = umlBuildCommandLineNet(conn, vm->def, vm->def->nets[i], i); char *ret = umlBuildCommandLineNet(conn, vm->def, vm->def->nets[i], i);
if (!ret) if (!ret)
goto error; goto error;
@ -427,10 +427,10 @@ virCommandPtr umlBuildCommandLine(virConnectPtr conn,
VIR_FREE(ret); VIR_FREE(ret);
} }
for (i = 0 ; i < UML_MAX_CHAR_DEVICE ; i++) { for (i = 0; i < UML_MAX_CHAR_DEVICE; i++) {
virDomainChrDefPtr chr = NULL; virDomainChrDefPtr chr = NULL;
char *ret = NULL; char *ret = NULL;
for (j = 0 ; j < vm->def->nconsoles ; j++) for (j = 0; j < vm->def->nconsoles; j++)
if (vm->def->consoles[j]->target.port == i) if (vm->def->consoles[j]->target.port == i)
chr = vm->def->consoles[j]; chr = vm->def->consoles[j];
if (chr) if (chr)
@ -442,10 +442,10 @@ virCommandPtr umlBuildCommandLine(virConnectPtr conn,
VIR_FREE(ret); VIR_FREE(ret);
} }
for (i = 0 ; i < UML_MAX_CHAR_DEVICE ; i++) { for (i = 0; i < UML_MAX_CHAR_DEVICE; i++) {
virDomainChrDefPtr chr = NULL; virDomainChrDefPtr chr = NULL;
char *ret = NULL; char *ret = NULL;
for (j = 0 ; j < vm->def->nserials ; j++) for (j = 0; j < vm->def->nserials; j++)
if (vm->def->serials[j]->target.port == i) if (vm->def->serials[j]->target.port == i)
chr = vm->def->serials[j]; chr = vm->def->serials[j];
if (chr) if (chr)

14
src/uml/uml_driver.c
View File

@ -276,13 +276,13 @@ umlIdentifyChrPTY(struct uml_driver *driver,
{ {
int i; int i;
for (i = 0 ; i < dom->def->nconsoles; i++) for (i = 0; i < dom->def->nconsoles; i++)
if (dom->def->consoles[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY) if (dom->def->consoles[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY)
if (umlIdentifyOneChrPTY(driver, dom, if (umlIdentifyOneChrPTY(driver, dom,
dom->def->consoles[i], "con") < 0) dom->def->consoles[i], "con") < 0)
return -1; return -1;
for (i = 0 ; i < dom->def->nserials; i++) for (i = 0; i < dom->def->nserials; i++)
if (dom->def->serials[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY && if (dom->def->serials[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY &&
umlIdentifyOneChrPTY(driver, dom, umlIdentifyOneChrPTY(driver, dom,
dom->def->serials[i], "ssl") < 0) dom->def->serials[i], "ssl") < 0)
@ -1004,7 +1004,7 @@ error:
static void umlCleanupTapDevices(virDomainObjPtr vm) { static void umlCleanupTapDevices(virDomainObjPtr vm) {
int i; int i;
for (i = 0 ; i < vm->def->nnets ; i++) { for (i = 0; i < vm->def->nnets; i++) {
virDomainNetDefPtr def = vm->def->nets[i]; virDomainNetDefPtr def = vm->def->nets[i];
if (def->type != VIR_DOMAIN_NET_TYPE_BRIDGE && if (def->type != VIR_DOMAIN_NET_TYPE_BRIDGE &&
@ -1092,7 +1092,7 @@ static int umlStartVMDaemon(virConnectPtr conn,
if (!(cmd = umlBuildCommandLine(conn, driver, vm))) if (!(cmd = umlBuildCommandLine(conn, driver, vm)))
goto cleanup; goto cleanup;
for (i = 0 ; i < vm->def->nconsoles ; i++) { for (i = 0; i < vm->def->nconsoles; i++) {
VIR_FREE(vm->def->consoles[i]->info.alias); VIR_FREE(vm->def->consoles[i]->info.alias);
if (virAsprintf(&vm->def->consoles[i]->info.alias, "console%zu", i) < 0) { if (virAsprintf(&vm->def->consoles[i]->info.alias, "console%zu", i) < 0) {
virReportOOMError(); virReportOOMError();
@ -2037,7 +2037,7 @@ static int umlDomainAttachUmlDisk(struct uml_driver *driver,
char *cmd = NULL; char *cmd = NULL;
char *reply = NULL; char *reply = NULL;
for (i = 0 ; i < vm->def->ndisks ; i++) { for (i = 0; i < vm->def->ndisks; i++) {
if (STREQ(vm->def->disks[i]->dst, disk->dst)) { if (STREQ(vm->def->disks[i]->dst, disk->dst)) {
virReportError(VIR_ERR_OPERATION_FAILED, virReportError(VIR_ERR_OPERATION_FAILED,
_("target %s already exists"), disk->dst); _("target %s already exists"), disk->dst);
@ -2163,7 +2163,7 @@ static int umlDomainDetachUmlDisk(struct uml_driver *driver,
char *cmd; char *cmd;
char *reply; char *reply;
for (i = 0 ; i < vm->def->ndisks ; i++) { for (i = 0; i < vm->def->ndisks; i++) {
if (STREQ(vm->def->disks[i]->dst, dev->data.disk->dst)) { if (STREQ(vm->def->disks[i]->dst, dev->data.disk->dst)) {
break; break;
} }
@ -2456,7 +2456,7 @@ umlDomainOpenConsole(virDomainPtr dom,
} }
if (dev_name) { if (dev_name) {
for (i = 0 ; i < vm->def->nconsoles ; i++) { for (i = 0; i < vm->def->nconsoles; i++) {
if (vm->def->consoles[i]->info.alias && if (vm->def->consoles[i]->info.alias &&
STREQ(vm->def->consoles[i]->info.alias, dev_name)) { STREQ(vm->def->consoles[i]->info.alias, dev_name)) {
chr = vm->def->consoles[i]; chr = vm->def->consoles[i];