NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

src/qemu: Remove the whitespace before ';'

Browse Source
This commit is contained in:
Osier Yang 2013-05-21 15:21:20 +08:00
parent f1b3930c85
commit 66194f71df
14 changed files with 183 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/qemu_agent.c
View File

@ -139,7 +139,7 @@ qemuAgentEscapeNonPrintable(const char *text)
{ {
int i; int i;
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
for (i = 0 ; text[i] != '\0' ; i++) { for (i = 0; text[i] != '\0'; i++) {
if (text[i] == '\\') if (text[i] == '\\')
virBufferAddLit(&buf, "\\\\"); virBufferAddLit(&buf, "\\\\");
else if (c_isprint(text[i]) || text[i] == '\n' || else if (c_isprint(text[i]) || text[i] == '\n' ||
@ -281,7 +281,7 @@ qemuAgentIOProcessEvent(qemuAgentPtr mon,
} }
/* /*
for (i = 0 ; i < ARRAY_CARDINALITY(eventHandlers) ; i++) { for (i = 0; i < ARRAY_CARDINALITY(eventHandlers); i++) {
if (STREQ(eventHandlers[i].type, type)) { if (STREQ(eventHandlers[i].type, type)) {
virJSONValuePtr data = virJSONValueObjectGet(obj, "data"); virJSONValuePtr data = virJSONValueObjectGet(obj, "data");
VIR_DEBUG("handle %s handler=%p data=%p", type, VIR_DEBUG("handle %s handler=%p data=%p", type,

32
src/qemu/qemu_capabilities.c
View File

@ -905,7 +905,7 @@ virCapsPtr virQEMUCapsInit(virQEMUCapsCachePtr cache)
* so just probe for them all - we gracefully fail * so just probe for them all - we gracefully fail
* if a qemu-system-$ARCH binary can't be found * if a qemu-system-$ARCH binary can't be found
*/ */
for (i = 0 ; i < VIR_ARCH_LAST ; i++) for (i = 0; i < VIR_ARCH_LAST; i++)
if (virQEMUCapsInitGuest(caps, cache, if (virQEMUCapsInitGuest(caps, cache,
hostarch, hostarch,
i) < 0) i) < 0)
@ -1463,8 +1463,8 @@ virQEMUCapsProcessStringFlags(virQEMUCapsPtr qemuCaps,
char *const*values) char *const*values)
{ {
size_t i, j; size_t i, j;
for (i = 0 ; i < nflags ; i++) { for (i = 0; i < nflags; i++) {
for (j = 0 ; j < nvalues ; j++) { for (j = 0; j < nvalues; j++) {
if (STREQ(values[j], flags[i].value)) { if (STREQ(values[j], flags[i].value)) {
virQEMUCapsSet(qemuCaps, flags[i].flag); virQEMUCapsSet(qemuCaps, flags[i].flag);
break; break;
@ -1479,7 +1479,7 @@ virQEMUCapsFreeStringList(size_t len,
char **values) char **values)
{ {
size_t i; size_t i;
for (i = 0 ; i < len ; i++) for (i = 0; i < len; i++)
VIR_FREE(values[i]); VIR_FREE(values[i]);
VIR_FREE(values); VIR_FREE(values);
} }
@ -1600,7 +1600,7 @@ virQEMUCapsParseDeviceStr(virQEMUCapsPtr qemuCaps, const char *str)
nvalues, values); nvalues, values);
virQEMUCapsFreeStringList(nvalues, values); virQEMUCapsFreeStringList(nvalues, values);
for (i = 0 ; i < ARRAY_CARDINALITY(virQEMUCapsObjectProps); i++) { for (i = 0; i < ARRAY_CARDINALITY(virQEMUCapsObjectProps); i++) {
const char *type = virQEMUCapsObjectProps[i].type; const char *type = virQEMUCapsObjectProps[i].type;
if ((nvalues = virQEMUCapsParseDeviceStrObjectProps(str, if ((nvalues = virQEMUCapsParseDeviceStrObjectProps(str,
type, type,
@ -1740,7 +1740,7 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps)
if (VIR_ALLOC_N(ret->cpuDefinitions, qemuCaps->ncpuDefinitions) < 0) if (VIR_ALLOC_N(ret->cpuDefinitions, qemuCaps->ncpuDefinitions) < 0)
goto no_memory; goto no_memory;
ret->ncpuDefinitions = qemuCaps->ncpuDefinitions; ret->ncpuDefinitions = qemuCaps->ncpuDefinitions;
for (i = 0 ; i < qemuCaps->ncpuDefinitions ; i++) { for (i = 0; i < qemuCaps->ncpuDefinitions; i++) {
if (!(ret->cpuDefinitions[i] = strdup(qemuCaps->cpuDefinitions[i]))) if (!(ret->cpuDefinitions[i] = strdup(qemuCaps->cpuDefinitions[i])))
goto no_memory; goto no_memory;
} }
@ -1750,7 +1750,7 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps)
if (VIR_ALLOC_N(ret->machineAliases, qemuCaps->nmachineTypes) < 0) if (VIR_ALLOC_N(ret->machineAliases, qemuCaps->nmachineTypes) < 0)
goto no_memory; goto no_memory;
ret->nmachineTypes = qemuCaps->nmachineTypes; ret->nmachineTypes = qemuCaps->nmachineTypes;
for (i = 0 ; i < qemuCaps->nmachineTypes ; i++) { for (i = 0; i < qemuCaps->nmachineTypes; i++) {
if (!(ret->machineTypes[i] = strdup(qemuCaps->machineTypes[i]))) if (!(ret->machineTypes[i] = strdup(qemuCaps->machineTypes[i])))
goto no_memory; goto no_memory;
if (qemuCaps->machineAliases[i] && if (qemuCaps->machineAliases[i] &&
@ -1772,14 +1772,14 @@ void virQEMUCapsDispose(void *obj)
virQEMUCapsPtr qemuCaps = obj; virQEMUCapsPtr qemuCaps = obj;
size_t i; size_t i;
for (i = 0 ; i < qemuCaps->nmachineTypes ; i++) { for (i = 0; i < qemuCaps->nmachineTypes; i++) {
VIR_FREE(qemuCaps->machineTypes[i]); VIR_FREE(qemuCaps->machineTypes[i]);
VIR_FREE(qemuCaps->machineAliases[i]); VIR_FREE(qemuCaps->machineAliases[i]);
} }
VIR_FREE(qemuCaps->machineTypes); VIR_FREE(qemuCaps->machineTypes);
VIR_FREE(qemuCaps->machineAliases); VIR_FREE(qemuCaps->machineAliases);
for (i = 0 ; i < qemuCaps->ncpuDefinitions ; i++) { for (i = 0; i < qemuCaps->ncpuDefinitions; i++) {
VIR_FREE(qemuCaps->cpuDefinitions[i]); VIR_FREE(qemuCaps->cpuDefinitions[i]);
} }
VIR_FREE(qemuCaps->cpuDefinitions); VIR_FREE(qemuCaps->cpuDefinitions);
@ -1907,7 +1907,7 @@ int virQEMUCapsGetMachineTypesCaps(virQEMUCapsPtr qemuCaps,
goto no_memory; goto no_memory;
*nmachines = qemuCaps->nmachineTypes; *nmachines = qemuCaps->nmachineTypes;
for (i = 0 ; i < qemuCaps->nmachineTypes ; i++) { for (i = 0; i < qemuCaps->nmachineTypes; i++) {
virCapsGuestMachinePtr mach; virCapsGuestMachinePtr mach;
if (VIR_ALLOC(mach) < 0) if (VIR_ALLOC(mach) < 0)
goto no_memory; goto no_memory;
@ -1943,7 +1943,7 @@ const char *virQEMUCapsGetCanonicalMachine(virQEMUCapsPtr qemuCaps,
if (!name) if (!name)
return NULL; return NULL;
for (i = 0 ; i < qemuCaps->nmachineTypes ; i++) { for (i = 0; i < qemuCaps->nmachineTypes; i++) {
if (!qemuCaps->machineAliases[i]) if (!qemuCaps->machineAliases[i])
continue; continue;
if (STREQ(qemuCaps->machineAliases[i], name)) if (STREQ(qemuCaps->machineAliases[i], name))
@ -1965,7 +1965,7 @@ virQEMUCapsProbeQMPCommands(virQEMUCapsPtr qemuCaps,
if ((ncommands = qemuMonitorGetCommands(mon, &commands)) < 0) if ((ncommands = qemuMonitorGetCommands(mon, &commands)) < 0)
return -1; return -1;
for (i = 0 ; i < ncommands ; i++) { for (i = 0; i < ncommands; i++) {
char *name = commands[i]; char *name = commands[i];
if (STREQ(name, "system_wakeup")) if (STREQ(name, "system_wakeup"))
virQEMUCapsSet(qemuCaps, QEMU_CAPS_WAKEUP); virQEMUCapsSet(qemuCaps, QEMU_CAPS_WAKEUP);
@ -2028,7 +2028,7 @@ virQEMUCapsProbeQMPEvents(virQEMUCapsPtr qemuCaps,
if ((nevents = qemuMonitorGetEvents(mon, &events)) < 0) if ((nevents = qemuMonitorGetEvents(mon, &events)) < 0)
return -1; return -1;
for (i = 0 ; i < nevents ; i++) { for (i = 0; i < nevents; i++) {
char *name = events[i]; char *name = events[i];
if (STREQ(name, "BALLOON_CHANGE")) if (STREQ(name, "BALLOON_CHANGE"))
@ -2059,7 +2059,7 @@ virQEMUCapsProbeQMPObjects(virQEMUCapsPtr qemuCaps,
nvalues, values); nvalues, values);
virQEMUCapsFreeStringList(nvalues, values); virQEMUCapsFreeStringList(nvalues, values);
for (i = 0 ; i < ARRAY_CARDINALITY(virQEMUCapsObjectProps); i++) { for (i = 0; i < ARRAY_CARDINALITY(virQEMUCapsObjectProps); i++) {
const char *type = virQEMUCapsObjectProps[i].type; const char *type = virQEMUCapsObjectProps[i].type;
if ((nvalues = qemuMonitorGetObjectProps(mon, if ((nvalues = qemuMonitorGetObjectProps(mon,
type, type,
@ -2105,7 +2105,7 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps,
goto cleanup; goto cleanup;
} }
for (i = 0 ; i < nmachines ; i++) { for (i = 0; i < nmachines; i++) {
if (machines[i]->alias) { if (machines[i]->alias) {
if (!(qemuCaps->machineAliases[i] = strdup(machines[i]->alias))) { if (!(qemuCaps->machineAliases[i] = strdup(machines[i]->alias))) {
virReportOOMError(); virReportOOMError();
@ -2127,7 +2127,7 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps,
ret = 0; ret = 0;
cleanup: cleanup:
for (i = 0 ; i < nmachines ; i++) for (i = 0; i < nmachines; i++)
qemuMonitorMachineInfoFree(machines[i]); qemuMonitorMachineInfoFree(machines[i]);
VIR_FREE(machines); VIR_FREE(machines);
return ret; return ret;

4
src/qemu/qemu_cgroup.c
View File

@ -550,7 +550,7 @@ qemuSetupDevicesCgroup(virQEMUDriverPtr driver,
goto cleanup; goto cleanup;
} }
for (i = 0; i < vm->def->ndisks ; i++) { for (i = 0; i < vm->def->ndisks; i++) {
if (qemuSetupDiskCgroup(vm, vm->def->disks[i]) < 0) if (qemuSetupDiskCgroup(vm, vm->def->disks[i]) < 0)
goto cleanup; goto cleanup;
} }
@ -586,7 +586,7 @@ qemuSetupDevicesCgroup(virQEMUDriverPtr driver,
} }
} }
for (i = 0; deviceACL[i] != NULL ; i++) { for (i = 0; deviceACL[i] != NULL; i++) {
if (access(deviceACL[i], F_OK) < 0) { if (access(deviceACL[i], F_OK) < 0) {
VIR_DEBUG("Ignoring non-existant device %s", VIR_DEBUG("Ignoring non-existant device %s",
deviceACL[i]); deviceACL[i]);

170
src/qemu/qemu_command.c
View File

@ -756,7 +756,7 @@ qemuAssignDeviceNetAlias(virDomainDefPtr def, virDomainNetDefPtr net, int idx)
if (idx == -1) { if (idx == -1) {
int i; int i;
idx = 0; idx = 0;
for (i = 0 ; i < def->nnets ; i++) { for (i = 0; i < def->nnets; i++) {
int thisidx; int thisidx;
if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) { if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) {
@ -788,7 +788,7 @@ qemuAssignDeviceHostdevAlias(virDomainDefPtr def, virDomainHostdevDefPtr hostdev
if (idx == -1) { if (idx == -1) {
int i; int i;
idx = 0; idx = 0;
for (i = 0 ; i < def->nhostdevs ; i++) { for (i = 0; i < def->nhostdevs; i++) {
int thisidx; int thisidx;
if ((thisidx = qemuDomainDeviceAliasIndex(def->hostdevs[i]->info, "hostdev")) < 0) { if ((thisidx = qemuDomainDeviceAliasIndex(def->hostdevs[i]->info, "hostdev")) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@ -824,7 +824,7 @@ qemuAssignDeviceRedirdevAlias(virDomainDefPtr def, virDomainRedirdevDefPtr redir
if (idx == -1) { if (idx == -1) {
int i; int i;
idx = 0; idx = 0;
for (i = 0 ; i < def->nredirdevs ; i++) { for (i = 0; i < def->nredirdevs; i++) {
int thisidx; int thisidx;
if ((thisidx = qemuDomainDeviceAliasIndex(&def->redirdevs[i]->info, "redir")) < 0) { if ((thisidx = qemuDomainDeviceAliasIndex(&def->redirdevs[i]->info, "redir")) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@ -865,13 +865,13 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps)
{ {
int i; int i;
for (i = 0; i < def->ndisks ; i++) { for (i = 0; i < def->ndisks; i++) {
if (qemuAssignDeviceDiskAlias(def, def->disks[i], qemuCaps) < 0) if (qemuAssignDeviceDiskAlias(def, def->disks[i], qemuCaps) < 0)
return -1; return -1;
} }
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NET_NAME) || if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NET_NAME) ||
virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) {
for (i = 0; i < def->nnets ; i++) { for (i = 0; i < def->nnets; i++) {
/* type='hostdev' interfaces are also on the hostdevs list, /* type='hostdev' interfaces are also on the hostdevs list,
* and will have their alias assigned with other hostdevs. * and will have their alias assigned with other hostdevs.
*/ */
@ -885,55 +885,55 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps)
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE))
return 0; return 0;
for (i = 0; i < def->nfss ; i++) { for (i = 0; i < def->nfss; i++) {
if (virAsprintf(&def->fss[i]->info.alias, "fs%d", i) < 0) if (virAsprintf(&def->fss[i]->info.alias, "fs%d", i) < 0)
goto no_memory; goto no_memory;
} }
for (i = 0; i < def->nsounds ; i++) { for (i = 0; i < def->nsounds; i++) {
if (virAsprintf(&def->sounds[i]->info.alias, "sound%d", i) < 0) if (virAsprintf(&def->sounds[i]->info.alias, "sound%d", i) < 0)
goto no_memory; goto no_memory;
} }
for (i = 0; i < def->nhostdevs ; i++) { for (i = 0; i < def->nhostdevs; i++) {
if (qemuAssignDeviceHostdevAlias(def, def->hostdevs[i], i) < 0) if (qemuAssignDeviceHostdevAlias(def, def->hostdevs[i], i) < 0)
return -1; return -1;
} }
for (i = 0; i < def->nredirdevs ; i++) { for (i = 0; i < def->nredirdevs; i++) {
if (qemuAssignDeviceRedirdevAlias(def, def->redirdevs[i], i) < 0) if (qemuAssignDeviceRedirdevAlias(def, def->redirdevs[i], i) < 0)
return -1; return -1;
} }
for (i = 0; i < def->nvideos ; i++) { for (i = 0; i < def->nvideos; i++) {
if (virAsprintf(&def->videos[i]->info.alias, "video%d", i) < 0) if (virAsprintf(&def->videos[i]->info.alias, "video%d", i) < 0)
goto no_memory; goto no_memory;
} }
for (i = 0; i < def->ncontrollers ; i++) { for (i = 0; i < def->ncontrollers; i++) {
if (qemuAssignDeviceControllerAlias(def->controllers[i]) < 0) if (qemuAssignDeviceControllerAlias(def->controllers[i]) < 0)
return -1; return -1;
} }
for (i = 0; i < def->ninputs ; i++) { for (i = 0; i < def->ninputs; i++) {
if (virAsprintf(&def->inputs[i]->info.alias, "input%d", i) < 0) if (virAsprintf(&def->inputs[i]->info.alias, "input%d", i) < 0)
goto no_memory; goto no_memory;
} }
for (i = 0; i < def->nparallels ; i++) { for (i = 0; i < def->nparallels; i++) {
if (virAsprintf(&def->parallels[i]->info.alias, "parallel%d", i) < 0) if (virAsprintf(&def->parallels[i]->info.alias, "parallel%d", i) < 0)
goto no_memory; goto no_memory;
} }
for (i = 0; i < def->nserials ; i++) { for (i = 0; i < def->nserials; i++) {
if (virAsprintf(&def->serials[i]->info.alias, "serial%d", i) < 0) if (virAsprintf(&def->serials[i]->info.alias, "serial%d", i) < 0)
goto no_memory; goto no_memory;
} }
for (i = 0; i < def->nchannels ; i++) { for (i = 0; i < def->nchannels; i++) {
if (virAsprintf(&def->channels[i]->info.alias, "channel%d", i) < 0) if (virAsprintf(&def->channels[i]->info.alias, "channel%d", i) < 0)
goto no_memory; goto no_memory;
} }
for (i = 0; i < def->nconsoles ; i++) { for (i = 0; i < def->nconsoles; i++) {
if (virAsprintf(&def->consoles[i]->info.alias, "console%d", i) < 0) if (virAsprintf(&def->consoles[i]->info.alias, "console%d", i) < 0)
goto no_memory; goto no_memory;
} }
for (i = 0; i < def->nhubs ; i++) { for (i = 0; i < def->nhubs; i++) {
if (virAsprintf(&def->hubs[i]->info.alias, "hub%d", i) < 0) if (virAsprintf(&def->hubs[i]->info.alias, "hub%d", i) < 0)
goto no_memory; goto no_memory;
} }
for (i = 0; i < def->nsmartcards ; i++) { for (i = 0; i < def->nsmartcards; i++) {
if (virAsprintf(&def->smartcards[i]->info.alias, "smartcard%d", i) < 0) if (virAsprintf(&def->smartcards[i]->info.alias, "smartcard%d", i) < 0)
goto no_memory; goto no_memory;
} }
@ -1066,20 +1066,20 @@ qemuDomainPrimeS390VirtioDevices(virDomainDefPtr def,
*/ */
int i; int i;
for (i = 0; i < def->ndisks ; i++) { for (i = 0; i < def->ndisks; i++) {
if (def->disks[i]->bus == VIR_DOMAIN_DISK_BUS_VIRTIO && if (def->disks[i]->bus == VIR_DOMAIN_DISK_BUS_VIRTIO &&
def->disks[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) def->disks[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE)
def->disks[i]->info.type = type; def->disks[i]->info.type = type;
} }
for (i = 0; i < def->nnets ; i++) { for (i = 0; i < def->nnets; i++) {
if (STREQ(def->nets[i]->model,"virtio") && if (STREQ(def->nets[i]->model,"virtio") &&
def->nets[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { def->nets[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
def->nets[i]->info.type = type; def->nets[i]->info.type = type;
} }
} }
for (i = 0; i < def->ncontrollers ; i++) { for (i = 0; i < def->ncontrollers; i++) {
if ((def->controllers[i]->type == if ((def->controllers[i]->type ==
VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL || VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL ||
def->controllers[i]->type == def->controllers[i]->type ==
@ -1292,7 +1292,7 @@ int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def,
/* Default values match QEMU. See spapr_(llan|vscsi|vty).c */ /* Default values match QEMU. See spapr_(llan|vscsi|vty).c */
for (i = 0 ; i < def->nnets; i++) { for (i = 0; i < def->nnets; i++) {
if (def->nets[i]->model && if (def->nets[i]->model &&
STREQ(def->nets[i]->model, "spapr-vlan")) STREQ(def->nets[i]->model, "spapr-vlan"))
def->nets[i]->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO; def->nets[i]->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO;
@ -1301,7 +1301,7 @@ int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def,
goto cleanup; goto cleanup;
} }
for (i = 0 ; i < def->ncontrollers; i++) { for (i = 0; i < def->ncontrollers; i++) {
model = def->controllers[i]->model; model = def->controllers[i]->model;
if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI) { if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI) {
if (qemuSetScsiControllerModel(def, qemuCaps, &model) < 0) if (qemuSetScsiControllerModel(def, qemuCaps, &model) < 0)
@ -1316,7 +1316,7 @@ int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def,
goto cleanup; goto cleanup;
} }
for (i = 0 ; i < def->nserials; i++) { for (i = 0; i < def->nserials; i++) {
if (def->serials[i]->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && if (def->serials[i]->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL &&
(def->os.arch == VIR_ARCH_PPC64) && (def->os.arch == VIR_ARCH_PPC64) &&
STREQ(def->os.machine, "pseries")) STREQ(def->os.machine, "pseries"))
@ -1909,7 +1909,7 @@ qemuAssignDevicePCISlots(virDomainDefPtr def,
virDevicePCIAddressPtr addrptr; virDevicePCIAddressPtr addrptr;
/* Verify that first IDE and USB controllers (if any) is on the PIIX3, fn 1 */ /* Verify that first IDE and USB controllers (if any) is on the PIIX3, fn 1 */
for (i = 0; i < def->ncontrollers ; i++) { for (i = 0; i < def->ncontrollers; i++) {
/* First IDE controller lives on the PIIX3 at slot=1, function=1 */ /* First IDE controller lives on the PIIX3 at slot=1, function=1 */
if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE && if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE &&
def->controllers[i]->idx == 0) { def->controllers[i]->idx == 0) {
@ -2027,7 +2027,7 @@ qemuAssignDevicePCISlots(virDomainDefPtr def,
} }
} }
for (i = 0; i < def->nfss ; i++) { for (i = 0; i < def->nfss; i++) {
if (def->fss[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) if (def->fss[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE)
continue; continue;
@ -2038,7 +2038,7 @@ qemuAssignDevicePCISlots(virDomainDefPtr def,
} }
/* Network interfaces */ /* Network interfaces */
for (i = 0; i < def->nnets ; i++) { for (i = 0; i < def->nnets; i++) {
/* type='hostdev' network devices might be USB, and are also /* type='hostdev' network devices might be USB, and are also
* in hostdevs list anyway, so handle them with other hostdevs * in hostdevs list anyway, so handle them with other hostdevs
* instead of here. * instead of here.
@ -2052,7 +2052,7 @@ qemuAssignDevicePCISlots(virDomainDefPtr def,
} }
/* Sound cards */ /* Sound cards */
for (i = 0; i < def->nsounds ; i++) { for (i = 0; i < def->nsounds; i++) {
if (def->sounds[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) if (def->sounds[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE)
continue; continue;
/* Skip ISA sound card, and PCSPK */ /* Skip ISA sound card, and PCSPK */
@ -2065,7 +2065,7 @@ qemuAssignDevicePCISlots(virDomainDefPtr def,
} }
/* Device controllers (SCSI, USB, but not IDE, FDC or CCID) */ /* Device controllers (SCSI, USB, but not IDE, FDC or CCID) */
for (i = 0; i < def->ncontrollers ; i++) { for (i = 0; i < def->ncontrollers; i++) {
/* PCI controllers have been dealt with earlier */ /* PCI controllers have been dealt with earlier */
if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI)
continue; continue;
@ -2095,7 +2095,7 @@ qemuAssignDevicePCISlots(virDomainDefPtr def,
if (IS_USB2_CONTROLLER(def->controllers[i])) { if (IS_USB2_CONTROLLER(def->controllers[i])) {
virDevicePCIAddress addr = { 0, 0, 0, 0, false }; virDevicePCIAddress addr = { 0, 0, 0, 0, false };
memset(&tmp_addr, 0, sizeof(tmp_addr)); memset(&tmp_addr, 0, sizeof(tmp_addr));
for (j = 0 ; j < i ; j++) { for (j = 0; j < i; j++) {
if (IS_USB2_CONTROLLER(def->controllers[j]) && if (IS_USB2_CONTROLLER(def->controllers[j]) &&
def->controllers[j]->idx == def->controllers[i]->idx) { def->controllers[j]->idx == def->controllers[i]->idx) {
addr = def->controllers[j]->info.addr.pci; addr = def->controllers[j]->info.addr.pci;
@ -2141,7 +2141,7 @@ qemuAssignDevicePCISlots(virDomainDefPtr def,
} }
/* Disks (VirtIO only for now) */ /* Disks (VirtIO only for now) */
for (i = 0; i < def->ndisks ; i++) { for (i = 0; i < def->ndisks; i++) {
/* Only VirtIO disks use PCI addrs */ /* Only VirtIO disks use PCI addrs */
if (def->disks[i]->bus != VIR_DOMAIN_DISK_BUS_VIRTIO) if (def->disks[i]->bus != VIR_DOMAIN_DISK_BUS_VIRTIO)
continue; continue;
@ -2165,7 +2165,7 @@ qemuAssignDevicePCISlots(virDomainDefPtr def,
} }
/* Host PCI devices */ /* Host PCI devices */
for (i = 0; i < def->nhostdevs ; i++) { for (i = 0; i < def->nhostdevs; i++) {
if (def->hostdevs[i]->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) if (def->hostdevs[i]->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE)
continue; continue;
if (def->hostdevs[i]->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || if (def->hostdevs[i]->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS ||
@ -2201,7 +2201,7 @@ qemuAssignDevicePCISlots(virDomainDefPtr def,
} }
/* Further non-primary video cards which have to be qxl type */ /* Further non-primary video cards which have to be qxl type */
for (i = 1; i < def->nvideos ; i++) { for (i = 1; i < def->nvideos; i++) {
if (def->videos[i]->type != VIR_DOMAIN_VIDEO_TYPE_QXL) { if (def->videos[i]->type != VIR_DOMAIN_VIDEO_TYPE_QXL) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("non-primary video device must be type of 'qxl'")); _("non-primary video device must be type of 'qxl'"));
@ -2212,19 +2212,19 @@ qemuAssignDevicePCISlots(virDomainDefPtr def,
if (qemuDomainPCIAddressSetNextAddr(addrs, &def->videos[i]->info) < 0) if (qemuDomainPCIAddressSetNextAddr(addrs, &def->videos[i]->info) < 0)
goto error; goto error;
} }
for (i = 0; i < def->ninputs ; i++) { for (i = 0; i < def->ninputs; i++) {
/* Nada - none are PCI based (yet) */ /* Nada - none are PCI based (yet) */
} }
for (i = 0; i < def->nparallels ; i++) { for (i = 0; i < def->nparallels; i++) {
/* Nada - none are PCI based (yet) */ /* Nada - none are PCI based (yet) */
} }
for (i = 0; i < def->nserials ; i++) { for (i = 0; i < def->nserials; i++) {
/* Nada - none are PCI based (yet) */ /* Nada - none are PCI based (yet) */
} }
for (i = 0; i < def->nchannels ; i++) { for (i = 0; i < def->nchannels; i++) {
/* Nada - none are PCI based (yet) */ /* Nada - none are PCI based (yet) */
} }
for (i = 0; i < def->nhubs ; i++) { for (i = 0; i < def->nhubs; i++) {
/* Nada - none are PCI based (yet) */ /* Nada - none are PCI based (yet) */
} }
@ -6255,7 +6255,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg,
break; break;
} }
for (i = 0 ; i < VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST ; i++) { for (i = 0; i < VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST; i++) {
switch (graphics->data.spice.channels[i]) { switch (graphics->data.spice.channels[i]) {
case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE: case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE:
if (tlsPort <= 0) { if (tlsPort <= 0) {
@ -6910,7 +6910,7 @@ qemuBuildCommandLine(virConnectPtr conn,
if (!emitBootindex) { if (!emitBootindex) {
char boot[VIR_DOMAIN_BOOT_LAST+1]; char boot[VIR_DOMAIN_BOOT_LAST+1];
for (i = 0 ; i < def->os.nBootDevs ; i++) { for (i = 0; i < def->os.nBootDevs; i++) {
switch (def->os.bootDevs[i]) { switch (def->os.bootDevs[i]) {
case VIR_DOMAIN_BOOT_CDROM: case VIR_DOMAIN_BOOT_CDROM:
boot[i] = 'd'; boot[i] = 'd';
@ -7003,7 +7003,7 @@ qemuBuildCommandLine(virConnectPtr conn,
virCommandAddArgList(cmd, "-bootloader", def->os.bootloader, NULL); virCommandAddArgList(cmd, "-bootloader", def->os.bootloader, NULL);
} }
for (i = 0 ; i < def->ndisks ; i++) { for (i = 0; i < def->ndisks; i++) {
virDomainDiskDefPtr disk = def->disks[i]; virDomainDiskDefPtr disk = def->disks[i];
if (disk->driverName != NULL && if (disk->driverName != NULL &&
@ -7083,7 +7083,7 @@ qemuBuildCommandLine(virConnectPtr conn,
if (usbcontroller == 0) if (usbcontroller == 0)
virCommandAddArg(cmd, "-usb"); virCommandAddArg(cmd, "-usb");
for (i = 0 ; i < def->nhubs ; i++) { for (i = 0; i < def->nhubs; i++) {
virDomainHubDefPtr hub = def->hubs[i]; virDomainHubDefPtr hub = def->hubs[i];
char *optstr; char *optstr;
@ -7101,7 +7101,7 @@ qemuBuildCommandLine(virConnectPtr conn,
if ((virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_BOOT) || emitBootindex)) { if ((virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_BOOT) || emitBootindex)) {
/* bootDevs will get translated into either bootindex=N or boot=on /* bootDevs will get translated into either bootindex=N or boot=on
* depending on what qemu supports */ * depending on what qemu supports */
for (i = 0 ; i < def->os.nBootDevs ; i++) { for (i = 0; i < def->os.nBootDevs; i++) {
switch (def->os.bootDevs[i]) { switch (def->os.bootDevs[i]) {
case VIR_DOMAIN_BOOT_CDROM: case VIR_DOMAIN_BOOT_CDROM:
bootCD = i + 1; bootCD = i + 1;
@ -7116,7 +7116,7 @@ qemuBuildCommandLine(virConnectPtr conn,
} }
} }
for (i = 0 ; i < def->ndisks ; i++) { for (i = 0; i < def->ndisks; i++) {
char *optstr; char *optstr;
int bootindex = 0; int bootindex = 0;
virDomainDiskDefPtr disk = def->disks[i]; virDomainDiskDefPtr disk = def->disks[i];
@ -7212,7 +7212,7 @@ qemuBuildCommandLine(virConnectPtr conn,
} }
} }
} else { } else {
for (i = 0 ; i < def->ndisks ; i++) { for (i = 0; i < def->ndisks; i++) {
char dev[NAME_MAX]; char dev[NAME_MAX];
char *file; char *file;
const char *fmt; const char *fmt;
@ -7299,7 +7299,7 @@ qemuBuildCommandLine(virConnectPtr conn,
} }
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_FSDEV)) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_FSDEV)) {
for (i = 0 ; i < def->nfss ; i++) { for (i = 0; i < def->nfss; i++) {
char *optstr; char *optstr;
virDomainFSDefPtr fs = def->fss[i]; virDomainFSDefPtr fs = def->fss[i];
@ -7334,7 +7334,7 @@ qemuBuildCommandLine(virConnectPtr conn,
/* convert <boot dev='network'/> to bootindex since we didn't emit /* convert <boot dev='network'/> to bootindex since we didn't emit
* -boot n * -boot n
*/ */
for (i = 0 ; i < def->os.nBootDevs ; i++) { for (i = 0; i < def->os.nBootDevs; i++) {
if (def->os.bootDevs[i] == VIR_DOMAIN_BOOT_NET) { if (def->os.bootDevs[i] == VIR_DOMAIN_BOOT_NET) {
bootNet = i + 1; bootNet = i + 1;
break; break;
@ -7342,7 +7342,7 @@ qemuBuildCommandLine(virConnectPtr conn,
} }
} }
for (i = 0 ; i < def->nnets ; i++) { for (i = 0; i < def->nnets; i++) {
virDomainNetDefPtr net = def->nets[i]; virDomainNetDefPtr net = def->nets[i];
char *nic, *host; char *nic, *host;
char tapfd_name[50] = ""; char tapfd_name[50] = "";
@ -7567,7 +7567,7 @@ qemuBuildCommandLine(virConnectPtr conn,
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE))
virCommandAddArgList(cmd, "-serial", "none", NULL); virCommandAddArgList(cmd, "-serial", "none", NULL);
} else { } else {
for (i = 0 ; i < def->nserials ; i++) { for (i = 0; i < def->nserials; i++) {
virDomainChrDefPtr serial = def->serials[i]; virDomainChrDefPtr serial = def->serials[i];
char *devstr; char *devstr;
@ -7604,7 +7604,7 @@ qemuBuildCommandLine(virConnectPtr conn,
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE))
virCommandAddArgList(cmd, "-parallel", "none", NULL); virCommandAddArgList(cmd, "-parallel", "none", NULL);
} else { } else {
for (i = 0 ; i < def->nparallels ; i++) { for (i = 0; i < def->nparallels; i++) {
virDomainChrDefPtr parallel = def->parallels[i]; virDomainChrDefPtr parallel = def->parallels[i];
char *devstr; char *devstr;
@ -7633,7 +7633,7 @@ qemuBuildCommandLine(virConnectPtr conn,
} }
} }
for (i = 0 ; i < def->nchannels ; i++) { for (i = 0; i < def->nchannels; i++) {
virDomainChrDefPtr channel = def->channels[i]; virDomainChrDefPtr channel = def->channels[i];
char *devstr; char *devstr;
char *addr; char *addr;
@ -7703,7 +7703,7 @@ qemuBuildCommandLine(virConnectPtr conn,
} }
/* Explicit console devices */ /* Explicit console devices */
for (i = 0 ; i < def->nconsoles ; i++) { for (i = 0; i < def->nconsoles; i++) {
virDomainChrDefPtr console = def->consoles[i]; virDomainChrDefPtr console = def->consoles[i];
char *devstr; char *devstr;
@ -7786,7 +7786,7 @@ qemuBuildCommandLine(virConnectPtr conn,
VIR_FREE(optstr); VIR_FREE(optstr);
} }
for (i = 0 ; i < def->ninputs ; i++) { for (i = 0; i < def->ninputs; i++) {
virDomainInputDefPtr input = def->inputs[i]; virDomainInputDefPtr input = def->inputs[i];
if (input->bus == VIR_DOMAIN_INPUT_BUS_USB) { if (input->bus == VIR_DOMAIN_INPUT_BUS_USB) {
@ -7805,7 +7805,7 @@ qemuBuildCommandLine(virConnectPtr conn,
} }
} }
for (i = 0 ; i < def->ngraphics ; ++i) { for (i = 0; i < def->ngraphics; ++i) {
switch (def->graphics[i]->type) { switch (def->graphics[i]->type) {
case VIR_DOMAIN_GRAPHICS_TYPE_SDL: case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
++sdl; ++sdl;
@ -7830,7 +7830,7 @@ qemuBuildCommandLine(virConnectPtr conn,
goto error; goto error;
} }
for (i = 0 ; i < def->ngraphics ; ++i) { for (i = 0; i < def->ngraphics; ++i) {
if (qemuBuildGraphicsCommandLine(cfg, cmd, def, qemuCaps, if (qemuBuildGraphicsCommandLine(cfg, cmd, def, qemuCaps,
def->graphics[i]) < 0) def->graphics[i]) < 0)
goto error; goto error;
@ -7847,7 +7847,7 @@ qemuBuildCommandLine(virConnectPtr conn,
(primaryVideoType == VIR_DOMAIN_VIDEO_TYPE_QXL && (primaryVideoType == VIR_DOMAIN_VIDEO_TYPE_QXL &&
virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_QXL_VGA))) virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_QXL_VGA)))
) { ) {
for (i = 0 ; i < def->nvideos ; i++) { for (i = 0; i < def->nvideos; i++) {
char *str; char *str;
virCommandAddArg(cmd, "-device"); virCommandAddArg(cmd, "-device");
if (!(str = qemuBuildDeviceVideoStr(def->videos[i], qemuCaps, !i))) if (!(str = qemuBuildDeviceVideoStr(def->videos[i], qemuCaps, !i)))
@ -7913,7 +7913,7 @@ qemuBuildCommandLine(virConnectPtr conn,
if (def->nvideos > 1) { if (def->nvideos > 1) {
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) {
for (i = 1 ; i < def->nvideos ; i++) { for (i = 1; i < def->nvideos; i++) {
char *str; char *str;
if (def->videos[i]->type != VIR_DOMAIN_VIDEO_TYPE_QXL) { if (def->videos[i]->type != VIR_DOMAIN_VIDEO_TYPE_QXL) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@ -7977,7 +7977,7 @@ qemuBuildCommandLine(virConnectPtr conn,
/* Add sound hardware */ /* Add sound hardware */
if (def->nsounds) { if (def->nsounds) {
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) {
for (i = 0 ; i < def->nsounds ; i++) { for (i = 0; i < def->nsounds; i++) {
virDomainSoundDefPtr sound = def->sounds[i]; virDomainSoundDefPtr sound = def->sounds[i];
char *str = NULL; char *str = NULL;
@ -7997,7 +7997,7 @@ qemuBuildCommandLine(virConnectPtr conn,
char *codecstr = NULL; char *codecstr = NULL;
int ii; int ii;
for (ii = 0 ; ii < sound->ncodecs ; ii++) { for (ii = 0; ii < sound->ncodecs; ii++) {
virCommandAddArg(cmd, "-device"); virCommandAddArg(cmd, "-device");
if (!(codecstr = qemuBuildSoundCodecStr(sound, sound->codecs[ii], qemuCaps))) { if (!(codecstr = qemuBuildSoundCodecStr(sound, sound->codecs[ii], qemuCaps))) {
goto error; goto error;
@ -8030,7 +8030,7 @@ qemuBuildCommandLine(virConnectPtr conn,
if (VIR_ALLOC_N(modstr, size+1) < 0) if (VIR_ALLOC_N(modstr, size+1) < 0)
goto no_memory; goto no_memory;
for (i = 0 ; i < def->nsounds && size > 0 ; i++) { for (i = 0; i < def->nsounds && size > 0; i++) {
virDomainSoundDefPtr sound = def->sounds[i]; virDomainSoundDefPtr sound = def->sounds[i];
const char *model = virDomainSoundModelTypeToString(sound->model); const char *model = virDomainSoundModelTypeToString(sound->model);
if (!model) { if (!model) {
@ -8097,7 +8097,7 @@ qemuBuildCommandLine(virConnectPtr conn,
} }
/* Add redirected devices */ /* Add redirected devices */
for (i = 0 ; i < def->nredirdevs ; i++) { for (i = 0; i < def->nredirdevs; i++) {
virDomainRedirdevDefPtr redirdev = def->redirdevs[i]; virDomainRedirdevDefPtr redirdev = def->redirdevs[i];
char *devstr; char *devstr;
@ -8123,7 +8123,7 @@ qemuBuildCommandLine(virConnectPtr conn,
/* Add host passthrough hardware */ /* Add host passthrough hardware */
for (i = 0 ; i < def->nhostdevs ; i++) { for (i = 0; i < def->nhostdevs; i++) {
virDomainHostdevDefPtr hostdev = def->hostdevs[i]; virDomainHostdevDefPtr hostdev = def->hostdevs[i];
char *devstr; char *devstr;
@ -8578,7 +8578,7 @@ static int qemuStringToArgvEnv(const char *args,
/* Iterate over list of args, finding first arg not containing /* Iterate over list of args, finding first arg not containing
* the '=' character (eg, skip over env vars FOO=bar) */ * the '=' character (eg, skip over env vars FOO=bar) */
for (envend = 0 ; ((envend < argcount) && for (envend = 0; ((envend < argcount) &&
(strchr(arglist[envend], '=') != NULL)); (strchr(arglist[envend], '=') != NULL));
envend++) envend++)
; /* nada */ ; /* nada */
@ -8587,7 +8587,7 @@ static int qemuStringToArgvEnv(const char *args,
if (envend > 0) { if (envend > 0) {
if (VIR_REALLOC_N(progenv, envend+1) < 0) if (VIR_REALLOC_N(progenv, envend+1) < 0)
goto no_memory; goto no_memory;
for (i = 0 ; i < envend ; i++) { for (i = 0; i < envend; i++) {
progenv[i] = arglist[i]; progenv[i] = arglist[i];
arglist[i] = NULL; arglist[i] = NULL;
} }
@ -8597,7 +8597,7 @@ static int qemuStringToArgvEnv(const char *args,
/* Copy the list of argv */ /* Copy the list of argv */
if (VIR_REALLOC_N(progargv, argcount-envend + 1) < 0) if (VIR_REALLOC_N(progargv, argcount-envend + 1) < 0)
goto no_memory; goto no_memory;
for (i = envend ; i < argcount ; i++) for (i = envend; i < argcount; i++)
progargv[i-envend] = arglist[i]; progargv[i-envend] = arglist[i];
progargv[i-envend] = NULL; progargv[i-envend] = NULL;
@ -8609,10 +8609,10 @@ static int qemuStringToArgvEnv(const char *args,
return 0; return 0;
no_memory: no_memory:
for (i = 0 ; progenv && progenv[i] ; i++) for (i = 0; progenv && progenv[i]; i++)
VIR_FREE(progenv[i]); VIR_FREE(progenv[i]);
VIR_FREE(progenv); VIR_FREE(progenv);
for (i = 0 ; i < argcount ; i++) for (i = 0; i < argcount; i++)
VIR_FREE(arglist[i]); VIR_FREE(arglist[i]);
VIR_FREE(arglist); VIR_FREE(arglist);
virReportOOMError(); virReportOOMError();
@ -8629,7 +8629,7 @@ static const char *qemuFindEnv(const char **progenv,
int i; int i;
int len = strlen(name); int len = strlen(name);
for (i = 0 ; progenv && progenv[i] ; i++) { for (i = 0; progenv && progenv[i]; i++) {
if (STREQLEN(progenv[i], name, len) && if (STREQLEN(progenv[i], name, len) &&
progenv[i][len] == '=') progenv[i][len] == '=')
return progenv[i] + len + 1; return progenv[i] + len + 1;
@ -8735,7 +8735,7 @@ qemuParseKeywords(const char *str,
no_memory: no_memory:
virReportOOMError(); virReportOOMError();
error: error:
for (i = 0 ; i < keywordCount ; i++) { for (i = 0; i < keywordCount; i++) {
VIR_FREE(keywords[i]); VIR_FREE(keywords[i]);
VIR_FREE(values[i]); VIR_FREE(values[i]);
} }
@ -8781,7 +8781,7 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt,
def->device = VIR_DOMAIN_DISK_DEVICE_DISK; def->device = VIR_DOMAIN_DISK_DEVICE_DISK;
def->type = VIR_DOMAIN_DISK_TYPE_FILE; def->type = VIR_DOMAIN_DISK_TYPE_FILE;
for (i = 0 ; i < nkeywords ; i++) { for (i = 0; i < nkeywords; i++) {
if (STREQ(keywords[i], "file")) { if (STREQ(keywords[i], "file")) {
if (values[i] && STRNEQ(values[i], "")) { if (values[i] && STRNEQ(values[i], "")) {
def->src = values[i]; def->src = values[i];
@ -9061,7 +9061,7 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt,
} }
cleanup: cleanup:
for (i = 0 ; i < nkeywords ; i++) { for (i = 0; i < nkeywords; i++) {
VIR_FREE(keywords[i]); VIR_FREE(keywords[i]);
VIR_FREE(values[i]); VIR_FREE(values[i]);
} }
@ -9084,7 +9084,7 @@ qemuFindNICForVLAN(int nnics,
int wantvlan) int wantvlan)
{ {
int i; int i;
for (i = 0 ; i < nnics ; i++) { for (i = 0; i < nnics; i++) {
int gotvlan; int gotvlan;
const char *tmp = strstr(nics[i], "vlan="); const char *tmp = strstr(nics[i], "vlan=");
char *end; char *end;
@ -9160,7 +9160,7 @@ qemuParseCommandLineNet(virDomainXMLOptionPtr xmlopt,
else else
def->type = VIR_DOMAIN_NET_TYPE_ETHERNET; def->type = VIR_DOMAIN_NET_TYPE_ETHERNET;
for (i = 0 ; i < nkeywords ; i++) { for (i = 0; i < nkeywords; i++) {
if (STREQ(keywords[i], "vlan")) { if (STREQ(keywords[i], "vlan")) {
if (virStrToLong_i(values[i], NULL, 10, &wantvlan) < 0) { if (virStrToLong_i(values[i], NULL, 10, &wantvlan) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
@ -9200,7 +9200,7 @@ qemuParseCommandLineNet(virDomainXMLOptionPtr xmlopt,
goto cleanup; goto cleanup;
} }
for (i = 0 ; i < nkeywords ; i++) { for (i = 0; i < nkeywords; i++) {
VIR_FREE(keywords[i]); VIR_FREE(keywords[i]);
VIR_FREE(values[i]); VIR_FREE(values[i]);
} }
@ -9219,7 +9219,7 @@ qemuParseCommandLineNet(virDomainXMLOptionPtr xmlopt,
nkeywords = 0; nkeywords = 0;
} }
for (i = 0 ; i < nkeywords ; i++) { for (i = 0; i < nkeywords; i++) {
if (STREQ(keywords[i], "macaddr")) { if (STREQ(keywords[i], "macaddr")) {
genmac = 0; genmac = 0;
if (virMacAddrParse(values[i], &def->mac) < 0) { if (virMacAddrParse(values[i], &def->mac) < 0) {
@ -9255,7 +9255,7 @@ qemuParseCommandLineNet(virDomainXMLOptionPtr xmlopt,
virDomainNetGenerateMAC(xmlopt, &def->mac); virDomainNetGenerateMAC(xmlopt, &def->mac);
cleanup: cleanup:
for (i = 0 ; i < nkeywords ; i++) { for (i = 0; i < nkeywords; i++) {
VIR_FREE(keywords[i]); VIR_FREE(keywords[i]);
VIR_FREE(values[i]); VIR_FREE(values[i]);
} }
@ -9794,7 +9794,7 @@ static void
qemuParseCommandLineBootDevs(virDomainDefPtr def, const char *str) { qemuParseCommandLineBootDevs(virDomainDefPtr def, const char *str) {
int n, b = 0; int n, b = 0;
for (n = 0 ; str[n] && b < VIR_DOMAIN_BOOT_LAST ; n++) { for (n = 0; str[n] && b < VIR_DOMAIN_BOOT_LAST; n++) {
if (str[n] == 'a') if (str[n] == 'a')
def->os.bootDevs[b++] = VIR_DOMAIN_BOOT_FLOPPY; def->os.bootDevs[b++] = VIR_DOMAIN_BOOT_FLOPPY;
else if (str[n] == 'c') else if (str[n] == 'c')
@ -9916,7 +9916,7 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps,
/* One initial loop to get list of NICs, so we /* One initial loop to get list of NICs, so we
* can correlate them later */ * can correlate them later */
for (i = 1 ; progargv[i] ; i++) { for (i = 1; progargv[i]; i++) {
const char *arg = progargv[i]; const char *arg = progargv[i];
/* Make sure we have a single - for all options to /* Make sure we have a single - for all options to
simplify next logic */ simplify next logic */
@ -9934,7 +9934,7 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps,
} }
/* Now the real processing loop */ /* Now the real processing loop */
for (i = 1 ; progargv[i] ; i++) { for (i = 1; progargv[i]; i++) {
const char *arg = progargv[i]; const char *arg = progargv[i];
/* Make sure we have a single - for all options to /* Make sure we have a single - for all options to
simplify next logic */ simplify next logic */
@ -10603,7 +10603,7 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps,
if (def->ndisks > 0 && ceph_args) { if (def->ndisks > 0 && ceph_args) {
char *hosts, *port, *saveptr = NULL, *token; char *hosts, *port, *saveptr = NULL, *token;
virDomainDiskDefPtr first_rbd_disk = NULL; virDomainDiskDefPtr first_rbd_disk = NULL;
for (i = 0 ; i < def->ndisks ; i++) { for (i = 0; i < def->ndisks; i++) {
if (def->disks[i]->type == VIR_DOMAIN_DISK_TYPE_NETWORK && if (def->disks[i]->type == VIR_DOMAIN_DISK_TYPE_NETWORK &&
def->disks[i]->protocol == VIR_DOMAIN_DISK_PROTOCOL_RBD) { def->disks[i]->protocol == VIR_DOMAIN_DISK_PROTOCOL_RBD) {
first_rbd_disk = def->disks[i]; first_rbd_disk = def->disks[i];
@ -10785,11 +10785,11 @@ virDomainDefPtr qemuParseCommandLineString(virCapsPtr qemuCaps,
pidfile, monConfig, monJSON); pidfile, monConfig, monJSON);
cleanup: cleanup:
for (i = 0 ; progargv && progargv[i] ; i++) for (i = 0; progargv && progargv[i]; i++)
VIR_FREE(progargv[i]); VIR_FREE(progargv[i]);
VIR_FREE(progargv); VIR_FREE(progargv);
for (i = 0 ; progenv && progenv[i] ; i++) for (i = 0; progenv && progenv[i]; i++)
VIR_FREE(progenv[i]); VIR_FREE(progenv[i]);
VIR_FREE(progenv); VIR_FREE(progenv);
@ -10847,7 +10847,7 @@ static int qemuParseProcFileStrings(int pid_value,
cleanup: cleanup:
if (ret < 0) { if (ret < 0) {
for (i = 0 ; str && str[i] ; i++) for (i = 0; str && str[i]; i++)
VIR_FREE(str[i]); VIR_FREE(str[i]);
VIR_FREE(str); VIR_FREE(str);
} }
@ -10897,10 +10897,10 @@ virDomainDefPtr qemuParseCommandLinePid(virCapsPtr qemuCaps,
cleanup: cleanup:
VIR_FREE(exepath); VIR_FREE(exepath);
for (i = 0 ; progargv && progargv[i] ; i++) for (i = 0; progargv && progargv[i]; i++)
VIR_FREE(progargv[i]); VIR_FREE(progargv[i]);
VIR_FREE(progargv); VIR_FREE(progargv);
for (i = 0 ; progenv && progenv[i] ; i++) for (i = 0; progenv && progenv[i]; i++)
VIR_FREE(progenv[i]); VIR_FREE(progenv[i]);
VIR_FREE(progenv); VIR_FREE(progenv);
return def; return def;

4
src/qemu/qemu_conf.c
View File

@ -922,13 +922,13 @@ virQEMUCloseCallbacksRun(virQEMUCloseCallbacksPtr closeCallbacks,
if (!list) if (!list)
return; return;
for (i = 0 ; i < list->nentries ; i++) { for (i = 0; i < list->nentries; i++) {
virHashRemoveEntry(closeCallbacks->list, virHashRemoveEntry(closeCallbacks->list,
list->entries[i].uuid); list->entries[i].uuid);
} }
virObjectUnlock(closeCallbacks); virObjectUnlock(closeCallbacks);
for (i = 0 ; i < list->nentries ; i++) { for (i = 0; i < list->nentries; i++) {
virDomainObjPtr vm; virDomainObjPtr vm;
if (!(vm = virDomainObjListFindByUUID(driver->domains, if (!(vm = virDomainObjListFindByUUID(driver->domains,

12
src/qemu/qemu_domain.c
View File

@ -291,7 +291,7 @@ qemuDomainObjPrivateXMLFormat(virBufferPtr buf, void *data)
if (priv->nvcpupids) { if (priv->nvcpupids) {
int i; int i;
virBufferAddLit(buf, " <vcpus>\n"); virBufferAddLit(buf, " <vcpus>\n");
for (i = 0 ; i < priv->nvcpupids ; i++) { for (i = 0; i < priv->nvcpupids; i++) {
virBufferAsprintf(buf, " <vcpu pid='%d'/>\n", priv->vcpupids[i]); virBufferAsprintf(buf, " <vcpu pid='%d'/>\n", priv->vcpupids[i]);
} }
virBufferAddLit(buf, " </vcpus>\n"); virBufferAddLit(buf, " </vcpus>\n");
@ -300,7 +300,7 @@ qemuDomainObjPrivateXMLFormat(virBufferPtr buf, void *data)
if (priv->qemuCaps) { if (priv->qemuCaps) {
int i; int i;
virBufferAddLit(buf, " <qemuCaps>\n"); virBufferAddLit(buf, " <qemuCaps>\n");
for (i = 0 ; i < QEMU_CAPS_LAST ; i++) { for (i = 0; i < QEMU_CAPS_LAST; i++) {
if (virQEMUCapsGet(priv->qemuCaps, i)) { if (virQEMUCapsGet(priv->qemuCaps, i)) {
virBufferAsprintf(buf, " <flag name='%s'/>\n", virBufferAsprintf(buf, " <flag name='%s'/>\n",
virQEMUCapsTypeToString(i)); virQEMUCapsTypeToString(i));
@ -392,7 +392,7 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, void *data)
goto error; goto error;
} }
for (i = 0 ; i < n ; i++) { for (i = 0; i < n; i++) {
char *pidstr = virXMLPropString(nodes[i], "pid"); char *pidstr = virXMLPropString(nodes[i], "pid");
if (!pidstr) if (!pidstr)
goto error; goto error;
@ -415,7 +415,7 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, void *data)
if (!(qemuCaps = virQEMUCapsNew())) if (!(qemuCaps = virQEMUCapsNew()))
goto error; goto error;
for (i = 0 ; i < n ; i++) { for (i = 0; i < n; i++) {
char *str = virXMLPropString(nodes[i], "name"); char *str = virXMLPropString(nodes[i], "name");
if (str) { if (str) {
int flag = virQEMUCapsTypeFromString(str); int flag = virQEMUCapsTypeFromString(str);
@ -1502,10 +1502,10 @@ void qemuDomainObjCheckTaint(virQEMUDriverPtr driver,
if (obj->def->cpu && obj->def->cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH) if (obj->def->cpu && obj->def->cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH)
qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_HOST_CPU, logFD); qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_HOST_CPU, logFD);
for (i = 0 ; i < obj->def->ndisks ; i++) for (i = 0; i < obj->def->ndisks; i++)
qemuDomainObjCheckDiskTaint(driver, obj, obj->def->disks[i], logFD); qemuDomainObjCheckDiskTaint(driver, obj, obj->def->disks[i], logFD);
for (i = 0 ; i < obj->def->nnets ; i++) for (i = 0; i < obj->def->nnets; i++)
qemuDomainObjCheckNetTaint(driver, obj, obj->def->nets[i], logFD); qemuDomainObjCheckNetTaint(driver, obj, obj->def->nets[i], logFD);
virObjectUnref(cfg); virObjectUnref(cfg);

30
src/qemu/qemu_driver.c
View File

@ -911,7 +911,7 @@ qemuStateStop(void) {
/* First we pause all VMs to make them stop dirtying /* First we pause all VMs to make them stop dirtying
pages, etc. We remember if any VMs were paused so pages, etc. We remember if any VMs were paused so
we can restore that on resume. */ we can restore that on resume. */
for (i = 0 ; i < numDomains ; i++) { for (i = 0; i < numDomains; i++) {
flags[i] = VIR_DOMAIN_SAVE_RUNNING; flags[i] = VIR_DOMAIN_SAVE_RUNNING;
if (virDomainGetState(domains[i], &state, NULL, 0) == 0) { if (virDomainGetState(domains[i], &state, NULL, 0) == 0) {
if (state == VIR_DOMAIN_PAUSED) { if (state == VIR_DOMAIN_PAUSED) {
@ -923,12 +923,12 @@ qemuStateStop(void) {
ret = 0; ret = 0;
/* Then we save the VMs to disk */ /* Then we save the VMs to disk */
for (i = 0 ; i < numDomains ; i++) for (i = 0; i < numDomains; i++)
if (virDomainManagedSave(domains[i], flags[i]) < 0) if (virDomainManagedSave(domains[i], flags[i]) < 0)
ret = -1; ret = -1;
cleanup: cleanup:
for (i = 0 ; i < numDomains ; i++) for (i = 0; i < numDomains; i++)
virDomainFree(domains[i]); virDomainFree(domains[i]);
VIR_FREE(domains); VIR_FREE(domains);
VIR_FREE(flags); VIR_FREE(flags);
@ -3535,7 +3535,7 @@ static int qemuDomainHotplugVcpus(virQEMUDriverPtr driver,
* in reverse order to onlining, so any partial fail leaves us in a * in reverse order to onlining, so any partial fail leaves us in a
* reasonably sensible state */ * reasonably sensible state */
if (nvcpus > vcpus) { if (nvcpus > vcpus) {
for (i = vcpus ; i < nvcpus ; i++) { for (i = vcpus; i < nvcpus; i++) {
/* Online new CPU */ /* Online new CPU */
rc = qemuMonitorSetCPU(priv->mon, i, 1); rc = qemuMonitorSetCPU(priv->mon, i, 1);
if (rc == 0) if (rc == 0)
@ -3546,7 +3546,7 @@ static int qemuDomainHotplugVcpus(virQEMUDriverPtr driver,
vcpus++; vcpus++;
} }
} else { } else {
for (i = vcpus - 1 ; i >= nvcpus ; i--) { for (i = vcpus - 1; i >= nvcpus; i--) {
/* Offline old CPU */ /* Offline old CPU */
rc = qemuMonitorSetCPU(priv->mon, i, 0); rc = qemuMonitorSetCPU(priv->mon, i, 0);
if (rc == 0) if (rc == 0)
@ -4345,7 +4345,7 @@ qemuDomainGetVcpus(virDomainPtr dom,
if (maxinfo >= 1) { if (maxinfo >= 1) {
if (info != NULL) { if (info != NULL) {
memset(info, 0, sizeof(*info) * maxinfo); memset(info, 0, sizeof(*info) * maxinfo);
for (i = 0 ; i < maxinfo ; i++) { for (i = 0; i < maxinfo; i++) {
info[i].number = i; info[i].number = i;
info[i].state = VIR_VCPU_RUNNING; info[i].state = VIR_VCPU_RUNNING;
@ -4365,7 +4365,7 @@ qemuDomainGetVcpus(virDomainPtr dom,
if (cpumaps != NULL) { if (cpumaps != NULL) {
memset(cpumaps, 0, maplen * maxinfo); memset(cpumaps, 0, maplen * maxinfo);
if (priv->vcpupids != NULL) { if (priv->vcpupids != NULL) {
for (v = 0 ; v < maxinfo ; v++) { for (v = 0; v < maxinfo; v++) {
unsigned char *cpumap = VIR_GET_CPUMAP(cpumaps, maplen, v); unsigned char *cpumap = VIR_GET_CPUMAP(cpumaps, maplen, v);
virBitmapPtr map = NULL; virBitmapPtr map = NULL;
unsigned char *tmpmap = NULL; unsigned char *tmpmap = NULL;
@ -5230,7 +5230,7 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn,
* directly. We convert those configs into generic 'ethernet' * directly. We convert those configs into generic 'ethernet'
* config and assume the user has suitable 'ifup-qemu' scripts * config and assume the user has suitable 'ifup-qemu' scripts
*/ */
for (i = 0 ; i < def->nnets ; i++) { for (i = 0; i < def->nnets; i++) {
virDomainNetDefPtr net = def->nets[i]; virDomainNetDefPtr net = def->nets[i];
int bootIndex = net->info.bootIndex; int bootIndex = net->info.bootIndex;
char *model = net->model; char *model = net->model;
@ -5309,7 +5309,7 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn,
goto cleanup; goto cleanup;
/* do fake auto-alloc of graphics ports, if such config is used */ /* do fake auto-alloc of graphics ports, if such config is used */
for (i = 0 ; i < def->ngraphics; ++i) { for (i = 0; i < def->ngraphics; ++i) {
virDomainGraphicsDefPtr graphics = def->graphics[i]; virDomainGraphicsDefPtr graphics = def->graphics[i];
if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC &&
!graphics->data.vnc.socket && graphics->data.vnc.autoport) { !graphics->data.vnc.socket && graphics->data.vnc.autoport) {
@ -5322,7 +5322,7 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn,
if (graphics->data.spice.autoport) { if (graphics->data.spice.autoport) {
/* check if tlsPort or port need allocation */ /* check if tlsPort or port need allocation */
for (j = 0 ; j < VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST ; j++) { for (j = 0; j < VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST; j++) {
switch (graphics->data.spice.channels[j]) { switch (graphics->data.spice.channels[j]) {
case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE: case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE:
needTLSPort = true; needTLSPort = true;
@ -8766,7 +8766,7 @@ qemuDomainInterfaceStats(virDomainPtr dom,
} }
/* Check the path is one of the domain's network interfaces. */ /* Check the path is one of the domain's network interfaces. */
for (i = 0 ; i < vm->def->nnets ; i++) { for (i = 0; i < vm->def->nnets; i++) {
if (vm->def->nets[i]->ifname && if (vm->def->nets[i]->ifname &&
STREQ(vm->def->nets[i]->ifname, path)) { STREQ(vm->def->nets[i]->ifname, path)) {
ret = 0; ret = 0;
@ -13019,16 +13019,16 @@ qemuDomainOpenConsole(virDomainPtr dom,
priv = vm->privateData; priv = vm->privateData;
if (dev_name) { if (dev_name) {
for (i = 0 ; !chr && i < vm->def->nconsoles ; i++) { for (i = 0; !chr && i < vm->def->nconsoles; i++) {
if (vm->def->consoles[i]->info.alias && if (vm->def->consoles[i]->info.alias &&
STREQ(dev_name, vm->def->consoles[i]->info.alias)) STREQ(dev_name, vm->def->consoles[i]->info.alias))
chr = vm->def->consoles[i]; chr = vm->def->consoles[i];
} }
for (i = 0 ; !chr && i < vm->def->nserials ; i++) { for (i = 0; !chr && i < vm->def->nserials; i++) {
if (STREQ(dev_name, vm->def->serials[i]->info.alias)) if (STREQ(dev_name, vm->def->serials[i]->info.alias))
chr = vm->def->serials[i]; chr = vm->def->serials[i];
} }
for (i = 0 ; !chr && i < vm->def->nparallels ; i++) { for (i = 0; !chr && i < vm->def->nparallels; i++) {
if (STREQ(dev_name, vm->def->parallels[i]->info.alias)) if (STREQ(dev_name, vm->def->parallels[i]->info.alias))
chr = vm->def->parallels[i]; chr = vm->def->parallels[i];
} }
@ -13097,7 +13097,7 @@ qemuDomainOpenChannel(virDomainPtr dom,
priv = vm->privateData; priv = vm->privateData;
if (name) { if (name) {
for (i = 0 ; !chr && i < vm->def->nchannels ; i++) { for (i = 0; !chr && i < vm->def->nchannels; i++) {
if (STREQ(name, vm->def->channels[i]->info.alias)) if (STREQ(name, vm->def->channels[i]->info.alias))
chr = vm->def->channels[i]; chr = vm->def->channels[i];

8
src/qemu/qemu_hostdev.c
View File

@ -43,7 +43,7 @@ qemuGetPciHostDeviceList(virDomainHostdevDefPtr *hostdevs, int nhostdevs)
if (!(list = virPCIDeviceListNew())) if (!(list = virPCIDeviceListNew()))
return NULL; return NULL;
for (i = 0 ; i < nhostdevs ; i++) { for (i = 0; i < nhostdevs; i++) {
virDomainHostdevDefPtr hostdev = hostdevs[i]; virDomainHostdevDefPtr hostdev = hostdevs[i];
virPCIDevicePtr dev; virPCIDevicePtr dev;
@ -93,7 +93,7 @@ qemuGetActivePciHostDeviceList(virQEMUDriverPtr driver,
if (!(list = virPCIDeviceListNew())) if (!(list = virPCIDeviceListNew()))
return NULL; return NULL;
for (i = 0 ; i < nhostdevs ; i++) { for (i = 0; i < nhostdevs; i++) {
virDomainHostdevDefPtr hostdev = hostdevs[i]; virDomainHostdevDefPtr hostdev = hostdevs[i];
virPCIDevicePtr dev; virPCIDevicePtr dev;
virPCIDevicePtr activeDev; virPCIDevicePtr activeDev;
@ -822,7 +822,7 @@ qemuPrepareHostUSBDevices(virQEMUDriverPtr driver,
/* Loop 1: build temporary list /* Loop 1: build temporary list
*/ */
for (i = 0 ; i < nhostdevs ; i++) { for (i = 0; i < nhostdevs; i++) {
virDomainHostdevDefPtr hostdev = hostdevs[i]; virDomainHostdevDefPtr hostdev = hostdevs[i];
bool required = true; bool required = true;
virUSBDevicePtr usb; virUSBDevicePtr usb;
@ -904,7 +904,7 @@ qemuPrepareHostdevSCSIDevices(virQEMUDriverPtr driver,
goto cleanup; goto cleanup;
/* Loop 2: build temporary list */ /* Loop 2: build temporary list */
for (i = 0 ; i < nhostdevs ; i++) { for (i = 0; i < nhostdevs; i++) {
virDomainHostdevDefPtr hostdev = hostdevs[i]; virDomainHostdevDefPtr hostdev = hostdevs[i];
virSCSIDevicePtr scsi; virSCSIDevicePtr scsi;

14
src/qemu/qemu_hotplug.c
View File

@ -235,7 +235,7 @@ int qemuDomainAttachVirtioDiskDevice(virConnectPtr conn,
disk->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390; disk->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390;
} }
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);
@ -426,7 +426,7 @@ qemuDomainFindOrCreateSCSIDiskController(virQEMUDriverPtr driver,
int i; int i;
virDomainControllerDefPtr cont; virDomainControllerDefPtr cont;
for (i = 0 ; i < vm->def->ncontrollers ; i++) { for (i = 0; i < vm->def->ncontrollers; i++) {
cont = vm->def->controllers[i]; cont = vm->def->controllers[i];
if (cont->type != VIR_DOMAIN_CONTROLLER_TYPE_SCSI) if (cont->type != VIR_DOMAIN_CONTROLLER_TYPE_SCSI)
@ -478,7 +478,7 @@ int qemuDomainAttachSCSIDisk(virConnectPtr conn,
int ret = -1; int ret = -1;
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
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);
@ -515,7 +515,7 @@ int qemuDomainAttachSCSIDisk(virConnectPtr conn,
if (!(drivestr = qemuBuildDriveStr(conn, disk, false, priv->qemuCaps))) if (!(drivestr = qemuBuildDriveStr(conn, disk, false, priv->qemuCaps)))
goto error; goto error;
for (i = 0 ; i <= disk->info.addr.drive.controller ; i++) { for (i = 0; i <= disk->info.addr.drive.controller; i++) {
cont = qemuDomainFindOrCreateSCSIDiskController(driver, vm, i); cont = qemuDomainFindOrCreateSCSIDiskController(driver, vm, i);
if (!cont) if (!cont)
goto error; goto error;
@ -601,7 +601,7 @@ int qemuDomainAttachUsbMassstorageDevice(virConnectPtr conn,
char *devstr = NULL; char *devstr = NULL;
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
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);
@ -1897,7 +1897,7 @@ static virDomainGraphicsDefPtr qemuDomainFindGraphics(virDomainObjPtr vm,
{ {
int i; int i;
for (i = 0 ; i < vm->def->ngraphics ; i++) { for (i = 0; i < vm->def->ngraphics; i++) {
if (vm->def->graphics[i]->type == dev->type) if (vm->def->graphics[i]->type == dev->type)
return vm->def->graphics[i]; return vm->def->graphics[i];
} }
@ -2061,7 +2061,7 @@ static inline int qemuFindDisk(virDomainDefPtr def, const char *dst)
{ {
int i; int i;
for (i = 0 ; i < def->ndisks ; i++) { for (i = 0; i < def->ndisks; i++) {
if (STREQ(def->disks[i]->dst, dst)) { if (STREQ(def->disks[i]->dst, dst)) {
return i; return i;
} }

6
src/qemu/qemu_migration.c
View File

@ -610,7 +610,7 @@ qemuMigrationCookieXMLFormat(virQEMUDriverPtr driver,
virBufferEscapeString(buf, " <hostname>%s</hostname>\n", mig->localHostname); virBufferEscapeString(buf, " <hostname>%s</hostname>\n", mig->localHostname);
virBufferAsprintf(buf, " <hostuuid>%s</hostuuid>\n", hostuuidstr); virBufferAsprintf(buf, " <hostuuid>%s</hostuuid>\n", hostuuidstr);
for (i = 0 ; i < QEMU_MIGRATION_COOKIE_FLAG_LAST ; i++) { for (i = 0; i < QEMU_MIGRATION_COOKIE_FLAG_LAST; i++) {
if (mig->flagsMandatory & (1 << i)) if (mig->flagsMandatory & (1 << i))
virBufferAsprintf(buf, " <feature name='%s'/>\n", virBufferAsprintf(buf, " <feature name='%s'/>\n",
qemuMigrationCookieFlagTypeToString(i)); qemuMigrationCookieFlagTypeToString(i));
@ -866,7 +866,7 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig,
if ((n = virXPathNodeSet("./feature", ctxt, &nodes)) < 0) if ((n = virXPathNodeSet("./feature", ctxt, &nodes)) < 0)
goto error; goto error;
for (i = 0 ; i < n ; i++) { for (i = 0; i < n; i++) {
int val; int val;
char *str = virXMLPropString(nodes[i], "name"); char *str = virXMLPropString(nodes[i], "name");
if (!str) { if (!str) {
@ -1467,7 +1467,7 @@ qemuMigrationIsSafe(virDomainDefPtr def)
{ {
int i; int i;
for (i = 0 ; i < def->ndisks ; i++) { for (i = 0; i < def->ndisks; i++) {
virDomainDiskDefPtr disk = def->disks[i]; virDomainDiskDefPtr disk = def->disks[i];
/* Our code elsewhere guarantees shared disks are either readonly (in /* Our code elsewhere guarantees shared disks are either readonly (in

2
src/qemu/qemu_monitor.c
View File

@ -225,7 +225,7 @@ static char * qemuMonitorEscapeNonPrintable(const char *text)
{ {
int i; int i;
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
for (i = 0 ; text[i] != '\0' ; i++) { for (i = 0; text[i] != '\0'; i++) {
if (c_isprint(text[i]) || if (c_isprint(text[i]) ||
text[i] == '\n' || text[i] == '\n' ||
(text[i] == '\r' && text[i+1] == '\n')) (text[i] == '\r' && text[i+1] == '\n'))

34
src/qemu/qemu_monitor_json.c
View File

@ -515,7 +515,7 @@ static void
qemuFreeKeywords(int nkeywords, char **keywords, char **values) qemuFreeKeywords(int nkeywords, char **keywords, char **values)
{ {
int i; int i;
for (i = 0 ; i < nkeywords ; i++) { for (i = 0; i < nkeywords; i++) {
VIR_FREE(keywords[i]); VIR_FREE(keywords[i]);
VIR_FREE(values[i]); VIR_FREE(values[i]);
} }
@ -540,7 +540,7 @@ qemuMonitorJSONKeywordStringToJSON(const char *str, const char *firstkeyword)
if (nkeywords < 0) if (nkeywords < 0)
goto error; goto error;
for (i = 0 ; i < nkeywords ; i++) { for (i = 0; i < nkeywords; i++) {
if (values[i] == NULL) { if (values[i] == NULL) {
if (i != 0) { if (i != 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
@ -1208,7 +1208,7 @@ qemuMonitorJSONExtractCPUInfo(virJSONValuePtr reply,
goto cleanup; goto cleanup;
} }
for (i = 0 ; i < ncpus ; i++) { for (i = 0; i < ncpus; i++) {
virJSONValuePtr entry = virJSONValueArrayGet(data, i); virJSONValuePtr entry = virJSONValueArrayGet(data, i);
int thread; int thread;
if (!entry) { if (!entry) {
@ -1643,7 +1643,7 @@ int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon,
goto cleanup; goto cleanup;
} }
for (i = 0 ; i < virJSONValueArraySize(devices) ; i++) { for (i = 0; i < virJSONValueArraySize(devices); i++) {
virJSONValuePtr dev = virJSONValueArrayGet(devices, i); virJSONValuePtr dev = virJSONValueArrayGet(devices, i);
virJSONValuePtr stats; virJSONValuePtr stats;
const char *thisdev; const char *thisdev;
@ -1797,7 +1797,7 @@ int qemuMonitorJSONGetBlockStatsParamsNumber(qemuMonitorPtr mon,
goto cleanup; goto cleanup;
} }
for (i = 0 ; i < stats->data.object.npairs; i++) { for (i = 0; i < stats->data.object.npairs; i++) {
const char *key = stats->data.object.pairs[i].key; const char *key = stats->data.object.pairs[i].key;
if (STREQ(key, "rd_bytes") || if (STREQ(key, "rd_bytes") ||
@ -1857,7 +1857,7 @@ int qemuMonitorJSONGetBlockExtent(qemuMonitorPtr mon,
goto cleanup; goto cleanup;
} }
for (i = 0 ; i < virJSONValueArraySize(devices) ; i++) { for (i = 0; i < virJSONValueArraySize(devices); i++) {
virJSONValuePtr dev = virJSONValueArrayGet(devices, i); virJSONValuePtr dev = virJSONValueArrayGet(devices, i);
virJSONValuePtr stats; virJSONValuePtr stats;
virJSONValuePtr parent; virJSONValuePtr parent;
@ -2923,7 +2923,7 @@ static int qemuMonitorJSONExtractPtyPaths(virJSONValuePtr reply,
goto cleanup; goto cleanup;
} }
for (i = 0 ; i < virJSONValueArraySize(data) ; i++) { for (i = 0; i < virJSONValueArraySize(data); i++) {
virJSONValuePtr entry = virJSONValueArrayGet(data, i); virJSONValuePtr entry = virJSONValueArrayGet(data, i);
const char *type; const char *type;
const char *id; const char *id;
@ -3984,7 +3984,7 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon,
goto cleanup; goto cleanup;
} }
for (i = 0 ; i < n ; i++) { for (i = 0; i < n; i++) {
virJSONValuePtr child = virJSONValueArrayGet(data, i); virJSONValuePtr child = virJSONValueArrayGet(data, i);
const char *tmp; const char *tmp;
qemuMonitorMachineInfoPtr info; qemuMonitorMachineInfoPtr info;
@ -4032,7 +4032,7 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon,
cleanup: cleanup:
if (ret < 0 && infolist) { if (ret < 0 && infolist) {
for (i = 0 ; i < n ; i++) for (i = 0; i < n; i++)
qemuMonitorMachineInfoFree(infolist[i]); qemuMonitorMachineInfoFree(infolist[i]);
VIR_FREE(infolist); VIR_FREE(infolist);
} }
@ -4098,7 +4098,7 @@ int qemuMonitorJSONGetCPUDefinitions(qemuMonitorPtr mon,
goto cleanup; goto cleanup;
} }
for (i = 0 ; i < n ; i++) { for (i = 0; i < n; i++) {
virJSONValuePtr child = virJSONValueArrayGet(data, i); virJSONValuePtr child = virJSONValueArrayGet(data, i);
const char *tmp; const char *tmp;
@ -4170,7 +4170,7 @@ int qemuMonitorJSONGetCommands(qemuMonitorPtr mon,
goto cleanup; goto cleanup;
} }
for (i = 0 ; i < n ; i++) { for (i = 0; i < n; i++) {
virJSONValuePtr child = virJSONValueArrayGet(data, i); virJSONValuePtr child = virJSONValueArrayGet(data, i);
const char *tmp; const char *tmp;
@ -4247,7 +4247,7 @@ int qemuMonitorJSONGetEvents(qemuMonitorPtr mon,
goto cleanup; goto cleanup;
} }
for (i = 0 ; i < n ; i++) { for (i = 0; i < n; i++) {
virJSONValuePtr child = virJSONValueArrayGet(data, i); virJSONValuePtr child = virJSONValueArrayGet(data, i);
const char *tmp; const char *tmp;
@ -4328,7 +4328,7 @@ qemuMonitorJSONGetCommandLineOptionParameters(qemuMonitorPtr mon,
goto cleanup; goto cleanup;
} }
for (i = 0 ; i < n ; i++) { for (i = 0; i < n; i++) {
virJSONValuePtr child = virJSONValueArrayGet(array, i); virJSONValuePtr child = virJSONValueArrayGet(array, i);
const char *tmp; const char *tmp;
@ -4363,7 +4363,7 @@ qemuMonitorJSONGetCommandLineOptionParameters(qemuMonitorPtr mon,
goto cleanup; goto cleanup;
} }
for (i = 0 ; i < n ; i++) { for (i = 0; i < n; i++) {
virJSONValuePtr child = virJSONValueArrayGet(data, i); virJSONValuePtr child = virJSONValueArrayGet(data, i);
const char *tmp; const char *tmp;
@ -4490,7 +4490,7 @@ int qemuMonitorJSONGetObjectTypes(qemuMonitorPtr mon,
goto cleanup; goto cleanup;
} }
for (i = 0 ; i < n ; i++) { for (i = 0; i < n; i++) {
virJSONValuePtr child = virJSONValueArrayGet(data, i); virJSONValuePtr child = virJSONValueArrayGet(data, i);
const char *tmp; const char *tmp;
@ -4570,7 +4570,7 @@ int qemuMonitorJSONGetObjectProps(qemuMonitorPtr mon,
goto cleanup; goto cleanup;
} }
for (i = 0 ; i < n ; i++) { for (i = 0; i < n; i++) {
virJSONValuePtr child = virJSONValueArrayGet(data, i); virJSONValuePtr child = virJSONValueArrayGet(data, i);
const char *tmp; const char *tmp;
@ -4917,7 +4917,7 @@ qemuMonitorJSONGetStringArray(qemuMonitorPtr mon, const char *qmpCmd,
goto cleanup; goto cleanup;
} }
for (i = 0 ; i < n ; i++) { for (i = 0; i < n; i++) {
virJSONValuePtr child = virJSONValueArrayGet(data, i); virJSONValuePtr child = virJSONValueArrayGet(data, i);
const char *tmp; const char *tmp;

2
src/qemu/qemu_monitor_text.c
View File

@ -168,7 +168,7 @@ int qemuMonitorTextIOProcess(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
/* Blank out the password prompt so we don't re-trigger /* Blank out the password prompt so we don't re-trigger
* if we have to go back to sleep for more I/O */ * if we have to go back to sleep for more I/O */
for (i = 0 ; i < strlen(PASSWORD_PROMPT) ; i++) for (i = 0; i < strlen(PASSWORD_PROMPT); i++)
start[i] = ' '; start[i] = ' ';
/* Handled, so skip forward over password prompt */ /* Handled, so skip forward over password prompt */

44
src/qemu/qemu_process.c
View File

@ -199,7 +199,7 @@ qemuFindAgentConfig(virDomainDefPtr def)
virDomainChrSourceDefPtr config = NULL; virDomainChrSourceDefPtr config = NULL;
int i; int i;
for (i = 0 ; i < def->nchannels ; i++) { for (i = 0; i < def->nchannels; i++) {
virDomainChrDefPtr channel = def->channels[i]; virDomainChrDefPtr channel = def->channels[i];
if (channel->targetType != VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO) if (channel->targetType != VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO)
@ -1052,7 +1052,7 @@ no_memory:
VIR_FREE(remoteAddr); VIR_FREE(remoteAddr);
} }
if (subject) { if (subject) {
for (i = 0 ; i < subject->nidentity ; i++) { for (i = 0; i < subject->nidentity; i++) {
VIR_FREE(subject->identities[i].type); VIR_FREE(subject->identities[i].type);
VIR_FREE(subject->identities[i].name); VIR_FREE(subject->identities[i].name);
} }
@ -1511,7 +1511,7 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices,
int i; int i;
const char *prefix = chardevfmt ? "char" : ""; const char *prefix = chardevfmt ? "char" : "";
for (i = 0 ; i < count ; i++) { for (i = 0; i < count; i++) {
virDomainChrDefPtr chr = devices[i]; virDomainChrDefPtr chr = devices[i];
if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) { if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) {
char id[32]; char id[32];
@ -1606,7 +1606,7 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm,
device args. This code must match that ordering.... */ device args. This code must match that ordering.... */
/* first comes the serial devices */ /* first comes the serial devices */
for (i = 0 ; i < vm->def->nserials ; i++) { for (i = 0; i < vm->def->nserials; i++) {
virDomainChrDefPtr chr = vm->def->serials[i]; virDomainChrDefPtr chr = vm->def->serials[i];
if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) { if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) {
if ((ret = qemuProcessExtractTTYPath(output, &offset, if ((ret = qemuProcessExtractTTYPath(output, &offset,
@ -1616,7 +1616,7 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm,
} }
/* then the parallel devices */ /* then the parallel devices */
for (i = 0 ; i < vm->def->nparallels ; i++) { for (i = 0; i < vm->def->nparallels; i++) {
virDomainChrDefPtr chr = vm->def->parallels[i]; virDomainChrDefPtr chr = vm->def->parallels[i];
if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) { if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) {
if ((ret = qemuProcessExtractTTYPath(output, &offset, if ((ret = qemuProcessExtractTTYPath(output, &offset,
@ -1626,7 +1626,7 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm,
} }
/* then the channel devices */ /* then the channel devices */
for (i = 0 ; i < vm->def->nchannels ; i++) { for (i = 0; i < vm->def->nchannels; i++) {
virDomainChrDefPtr chr = vm->def->channels[i]; virDomainChrDefPtr chr = vm->def->channels[i];
if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) { if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) {
if ((ret = qemuProcessExtractTTYPath(output, &offset, if ((ret = qemuProcessExtractTTYPath(output, &offset,
@ -1635,7 +1635,7 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm,
} }
} }
for (i = 0 ; i < vm->def->nconsoles ; i++) { for (i = 0; i < vm->def->nconsoles; i++) {
virDomainChrDefPtr chr = vm->def->consoles[i]; virDomainChrDefPtr chr = vm->def->consoles[i];
/* For historical reasons, console[0] can be just an alias /* For historical reasons, console[0] can be just an alias
* for serial[0]; That's why we need to update it as well */ * for serial[0]; That's why we need to update it as well */
@ -1989,7 +1989,7 @@ qemuProcessInitPasswords(virConnectPtr conn,
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
int i; int i;
for (i = 0 ; i < vm->def->ngraphics; ++i) { for (i = 0; i < vm->def->ngraphics; ++i) {
virDomainGraphicsDefPtr graphics = vm->def->graphics[i]; virDomainGraphicsDefPtr graphics = vm->def->graphics[i];
if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
ret = qemuDomainChangeGraphicsPasswords(driver, vm, ret = qemuDomainChangeGraphicsPasswords(driver, vm,
@ -2008,7 +2008,7 @@ qemuProcessInitPasswords(virConnectPtr conn,
goto cleanup; goto cleanup;
if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) {
for (i = 0 ; i < vm->def->ndisks ; i++) { for (i = 0; i < vm->def->ndisks; i++) {
char *secret; char *secret;
size_t secretLen; size_t secretLen;
const char *alias; const char *alias;
@ -2082,7 +2082,7 @@ qemuProcessAssignNextPCIAddress(virDomainDeviceInfo *info,
VIR_DEBUG("Look for %x:%x out of %d", vendor, product, naddrs); VIR_DEBUG("Look for %x:%x out of %d", vendor, product, naddrs);
for (i = 0 ; (i < naddrs) && !found; i++) { for (i = 0; (i < naddrs) && !found; i++) {
VIR_DEBUG("Maybe %x:%x", addrs[i].vendor, addrs[i].product); VIR_DEBUG("Maybe %x:%x", addrs[i].vendor, addrs[i].product);
if (addrs[i].vendor == vendor && if (addrs[i].vendor == vendor &&
addrs[i].product == product) { addrs[i].product == product) {
@ -2299,7 +2299,7 @@ qemuProcessDetectPCIAddresses(virDomainObjPtr vm,
* actual device data structure instead ? * actual device data structure instead ?
*/ */
for (i = 0 ; i < vm->def->ndisks ; i++) { for (i = 0; i < vm->def->ndisks; i++) {
if (qemuProcessGetPCIDiskVendorProduct(vm->def->disks[i], &vendor, &product) < 0) if (qemuProcessGetPCIDiskVendorProduct(vm->def->disks[i], &vendor, &product) < 0)
continue; continue;
@ -2313,7 +2313,7 @@ qemuProcessDetectPCIAddresses(virDomainObjPtr vm,
} }
} }
for (i = 0 ; i < vm->def->nnets ; i++) { for (i = 0; i < vm->def->nnets; i++) {
if (qemuProcessGetPCINetVendorProduct(vm->def->nets[i], &vendor, &product) < 0) if (qemuProcessGetPCINetVendorProduct(vm->def->nets[i], &vendor, &product) < 0)
continue; continue;
@ -2327,7 +2327,7 @@ qemuProcessDetectPCIAddresses(virDomainObjPtr vm,
} }
} }
for (i = 0 ; i < vm->def->ncontrollers ; i++) { for (i = 0; i < vm->def->ncontrollers; i++) {
if (qemuProcessGetPCIControllerVendorProduct(vm->def->controllers[i], &vendor, &product) < 0) if (qemuProcessGetPCIControllerVendorProduct(vm->def->controllers[i], &vendor, &product) < 0)
continue; continue;
@ -2341,7 +2341,7 @@ qemuProcessDetectPCIAddresses(virDomainObjPtr vm,
} }
} }
for (i = 0 ; i < vm->def->nvideos ; i++) { for (i = 0; i < vm->def->nvideos; i++) {
if (qemuProcessGetPCIVideoVendorProduct(vm->def->videos[i], &vendor, &product) < 0) if (qemuProcessGetPCIVideoVendorProduct(vm->def->videos[i], &vendor, &product) < 0)
continue; continue;
@ -2355,7 +2355,7 @@ qemuProcessDetectPCIAddresses(virDomainObjPtr vm,
} }
} }
for (i = 0 ; i < vm->def->nsounds ; i++) { for (i = 0; i < vm->def->nsounds; i++) {
if (qemuProcessGetPCISoundVendorProduct(vm->def->sounds[i], &vendor, &product) < 0) if (qemuProcessGetPCISoundVendorProduct(vm->def->sounds[i], &vendor, &product) < 0)
continue; continue;
@ -2611,7 +2611,7 @@ qemuProcessNotifyNets(virDomainDefPtr def)
{ {
int ii; int ii;
for (ii = 0 ; ii < def->nnets ; ii++) { for (ii = 0; ii < def->nnets; ii++) {
virDomainNetDefPtr net = def->nets[ii]; virDomainNetDefPtr net = def->nets[ii];
if (networkNotifyActualDevice(net) < 0) if (networkNotifyActualDevice(net) < 0)
return -1; return -1;
@ -2629,7 +2629,7 @@ qemuProcessFiltersInstantiate(virConnectPtr conn,
if (!conn) if (!conn)
return 1; return 1;
for (i = 0 ; i < def->nnets ; i++) { for (i = 0; i < def->nnets; i++) {
virDomainNetDefPtr net = def->nets[i]; virDomainNetDefPtr net = def->nets[i];
if ((net->filter) && (net->ifname)) { if ((net->filter) && (net->ifname)) {
if (virDomainConfNWFilterInstantiate(conn, def->uuid, net) < 0) { if (virDomainConfNWFilterInstantiate(conn, def->uuid, net) < 0) {
@ -3242,7 +3242,7 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driver,
if (graphics->data.spice.autoport) { if (graphics->data.spice.autoport) {
/* check if tlsPort or port need allocation */ /* check if tlsPort or port need allocation */
for (i = 0 ; i < VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST ; i++) { for (i = 0; i < VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST; i++) {
switch (graphics->data.spice.channels[i]) { switch (graphics->data.spice.channels[i]) {
case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE: case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE:
needTLSPort = true; needTLSPort = true;
@ -3458,7 +3458,7 @@ int qemuProcessStart(virConnectPtr conn,
VIR_DEBUG("Ensuring no historical cgroup is lying around"); VIR_DEBUG("Ensuring no historical cgroup is lying around");
qemuRemoveCgroup(vm); qemuRemoveCgroup(vm);
for (i = 0 ; i < vm->def->ngraphics; ++i) { for (i = 0; i < vm->def->ngraphics; ++i) {
virDomainGraphicsDefPtr graphics = vm->def->graphics[i]; virDomainGraphicsDefPtr graphics = vm->def->graphics[i];
if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
if (qemuProcessVNCAllocatePorts(driver, graphics) < 0) if (qemuProcessVNCAllocatePorts(driver, graphics) < 0)
@ -3525,7 +3525,7 @@ int qemuProcessStart(virConnectPtr conn,
flags & VIR_QEMU_PROCESS_START_COLD) < 0) flags & VIR_QEMU_PROCESS_START_COLD) < 0)
goto cleanup; goto cleanup;
for (i = 0; i < vm->def->ndisks ; i++) { for (i = 0; i < vm->def->ndisks; i++) {
if (qemuDomainDetermineDiskChain(driver, vm->def->disks[i], if (qemuDomainDetermineDiskChain(driver, vm->def->disks[i],
false) < 0) false) < 0)
goto cleanup; goto cleanup;
@ -4013,7 +4013,7 @@ void qemuProcessStop(virQEMUDriverPtr driver,
if (cfg->macFilter) { if (cfg->macFilter) {
def = vm->def; def = vm->def;
for (i = 0 ; i < def->nnets ; i++) { for (i = 0; i < def->nnets; i++) {
virDomainNetDefPtr net = def->nets[i]; virDomainNetDefPtr net = def->nets[i];
if (net->ifname == NULL) if (net->ifname == NULL)
continue; continue;
@ -4146,7 +4146,7 @@ retry:
/* Remove VNC and Spice ports from port reservation bitmap, but only if /* Remove VNC and Spice ports from port reservation bitmap, but only if
they were reserved by the driver (autoport=yes) they were reserved by the driver (autoport=yes)
*/ */
for (i = 0 ; i < vm->def->ngraphics; ++i) { for (i = 0; i < vm->def->ngraphics; ++i) {
virDomainGraphicsDefPtr graphics = vm->def->graphics[i]; virDomainGraphicsDefPtr graphics = vm->def->graphics[i];
if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
if (graphics->data.vnc.autoport) { if (graphics->data.vnc.autoport) {