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

Convert 'int i' to 'size_t i' in src/qemu files

Browse Source 
Convert the type of loop iterators named 'i', 'j', k',
'ii', 'jj', 'kk', to be 'size_t' instead of 'int' or
'unsigned int', also santizing 'ii', 'jj', 'kk' to use
the normal 'i', 'j', 'k' naming

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-07-08 15:09:33 +01:00
parent 581102abde
commit 50760e2a8a
14 changed files with 265 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/qemu/qemu_agent.c
View File

@ -137,7 +137,7 @@ VIR_ONCE_GLOBAL_INIT(qemuAgent)
static char * static char *
qemuAgentEscapeNonPrintable(const char *text) qemuAgentEscapeNonPrintable(const char *text)
{ {
int i; size_t 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] == '\\')
@ -169,7 +169,8 @@ qemuAgentOpenUnix(const char *monitor, pid_t cpid, bool *inProgress)
struct sockaddr_un addr; struct sockaddr_un addr;
int monfd; int monfd;
int timeout = 3; /* In seconds */ int timeout = 3; /* In seconds */
int ret, i = 0; int ret;
size_t i = 0;
*inProgress = false; *inProgress = false;
@ -359,7 +360,7 @@ static int qemuAgentIOProcessData(qemuAgentPtr mon,
qemuAgentMessagePtr msg) qemuAgentMessagePtr msg)
{ {
int used = 0; int used = 0;
int i = 0; size_t i = 0;
#if DEBUG_IO #if DEBUG_IO
# if DEBUG_RAW_IO # if DEBUG_RAW_IO
char *str1 = qemuAgentEscapeNonPrintable(data); char *str1 = qemuAgentEscapeNonPrintable(data);
@ -1461,7 +1462,7 @@ qemuAgentGetVCPUs(qemuAgentPtr mon,
qemuAgentCPUInfoPtr *info) qemuAgentCPUInfoPtr *info)
{ {
int ret = -1; int ret = -1;
int i; size_t i;
virJSONValuePtr cmd; virJSONValuePtr cmd;
virJSONValuePtr reply = NULL; virJSONValuePtr reply = NULL;
virJSONValuePtr data = NULL; virJSONValuePtr data = NULL;

7
src/qemu/qemu_capabilities.c
View File

@ -663,7 +663,7 @@ virQEMUCapsInitGuest(virCapsPtr caps,
virArch guestarch) virArch guestarch)
{ {
virCapsGuestPtr guest; virCapsGuestPtr guest;
int i; size_t i;
bool haskvm = false; bool haskvm = false;
bool haskqemu = false; bool haskqemu = false;
char *kvmbin = NULL; char *kvmbin = NULL;
@ -869,7 +869,7 @@ error:
virCapsPtr virQEMUCapsInit(virQEMUCapsCachePtr cache) virCapsPtr virQEMUCapsInit(virQEMUCapsCachePtr cache)
{ {
virCapsPtr caps; virCapsPtr caps;
int i; size_t i;
virArch hostarch = virArchFromHost(); virArch hostarch = virArchFromHost();
if ((caps = virCapabilitiesNew(hostarch, if ((caps = virCapabilitiesNew(hostarch,
@ -2160,7 +2160,8 @@ static int
virQEMUCapsProbeQMPTPM(virQEMUCapsPtr qemuCaps, virQEMUCapsProbeQMPTPM(virQEMUCapsPtr qemuCaps,
qemuMonitorPtr mon) qemuMonitorPtr mon)
{ {
int nentries, i; int nentries;
size_t i;
char **entries = NULL; char **entries = NULL;
if ((nentries = qemuMonitorGetTPMModels(mon, &entries)) < 0) if ((nentries = qemuMonitorGetTPMModels(mon, &entries)) < 0)

12
src/qemu/qemu_cgroup.c
View File

@ -413,7 +413,7 @@ qemuSetupBlkioCgroup(virDomainObjPtr vm)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
int rc = -1; int rc = -1;
int i; size_t i;
if (!virCgroupHasController(priv->cgroup, if (!virCgroupHasController(priv->cgroup,
VIR_CGROUP_CONTROLLER_BLKIO)) { VIR_CGROUP_CONTROLLER_BLKIO)) {
@ -516,7 +516,7 @@ qemuSetupDevicesCgroup(virQEMUDriverPtr driver,
const char *const *deviceACL = NULL; const char *const *deviceACL = NULL;
int rc = -1; int rc = -1;
int ret = -1; int ret = -1;
int i; size_t i;
if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES)) if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES))
return 0; return 0;
@ -882,7 +882,7 @@ int qemuSetupCgroupVcpuPin(virCgroupPtr cgroup,
int nvcpupin, int nvcpupin,
int vcpuid) int vcpuid)
{ {
int i; size_t i;
for (i = 0; i < nvcpupin; i++) { for (i = 0; i < nvcpupin; i++) {
if (vcpuid == vcpupin[i]->vcpuid) { if (vcpuid == vcpupin[i]->vcpuid) {
@ -926,7 +926,7 @@ int qemuSetupCgroupForVcpu(virDomainObjPtr vm)
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
virDomainDefPtr def = vm->def; virDomainDefPtr def = vm->def;
int rc; int rc;
unsigned int i, j; size_t i, j;
unsigned long long period = vm->def->cputune.period; unsigned long long period = vm->def->cputune.period;
long long quota = vm->def->cputune.quota; long long quota = vm->def->cputune.quota;
@ -957,7 +957,7 @@ int qemuSetupCgroupForVcpu(virDomainObjPtr vm)
if (rc < 0) { if (rc < 0) {
virReportSystemError(-rc, virReportSystemError(-rc,
_("Unable to create vcpu cgroup for %s(vcpu:" _("Unable to create vcpu cgroup for %s(vcpu:"
" %d)"), " %zu)"),
vm->def->name, i); vm->def->name, i);
goto cleanup; goto cleanup;
} }
@ -966,7 +966,7 @@ int qemuSetupCgroupForVcpu(virDomainObjPtr vm)
rc = virCgroupAddTask(cgroup_vcpu, priv->vcpupids[i]); rc = virCgroupAddTask(cgroup_vcpu, priv->vcpupids[i]);
if (rc < 0) { if (rc < 0) {
virReportSystemError(-rc, virReportSystemError(-rc,
_("unable to add vcpu %d task %d to cgroup"), _("unable to add vcpu %zu task %d to cgroup"),
i, priv->vcpupids[i]); i, priv->vcpupids[i]);
goto cleanup; goto cleanup;
} }

110
src/qemu/qemu_command.c
View File

@ -402,7 +402,7 @@ qemuNetworkIfaceConnect(virDomainDefPtr def,
cleanup: cleanup:
if (ret < 0) { if (ret < 0) {
int i; size_t i;
for (i = 0; i < *tapfdSize; i++) for (i = 0; i < *tapfdSize; i++)
VIR_FORCE_CLOSE(tapfd[i]); VIR_FORCE_CLOSE(tapfd[i]);
if (template_ifname) if (template_ifname)
@ -437,7 +437,7 @@ qemuOpenVhostNet(virDomainDefPtr def,
int *vhostfd, int *vhostfd,
int *vhostfdSize) int *vhostfdSize)
{ {
int i; size_t i;
/* If the config says explicitly to not use vhost, return now */ /* If the config says explicitly to not use vhost, return now */
if (net->driver.virtio.name == VIR_DOMAIN_NET_BACKEND_TYPE_QEMU) { if (net->driver.virtio.name == VIR_DOMAIN_NET_BACKEND_TYPE_QEMU) {
@ -487,7 +487,7 @@ qemuOpenVhostNet(virDomainDefPtr def,
"but is unavailable")); "but is unavailable"));
goto error; goto error;
} }
VIR_WARN("Unable to open vhost-net. Opened so far %d, requested %d", VIR_WARN("Unable to open vhost-net. Opened so far %zu, requested %d",
i, *vhostfdSize); i, *vhostfdSize);
*vhostfdSize = i; *vhostfdSize = i;
break; break;
@ -507,10 +507,10 @@ int
qemuNetworkPrepareDevices(virDomainDefPtr def) qemuNetworkPrepareDevices(virDomainDefPtr def)
{ {
int ret = -1; int ret = -1;
int ii; size_t i;
for (ii = 0; ii < def->nnets; ii++) { for (i = 0; i < def->nnets; i++) {
virDomainNetDefPtr net = def->nets[ii]; virDomainNetDefPtr net = def->nets[i];
int actualType; int actualType;
/* If appropriate, grab a physical device from the configured /* If appropriate, grab a physical device from the configured
@ -777,7 +777,7 @@ int
qemuAssignDeviceNetAlias(virDomainDefPtr def, virDomainNetDefPtr net, int idx) qemuAssignDeviceNetAlias(virDomainDefPtr def, virDomainNetDefPtr net, int idx)
{ {
if (idx == -1) { if (idx == -1) {
int i; size_t i;
idx = 0; idx = 0;
for (i = 0; i < def->nnets; i++) { for (i = 0; i < def->nnets; i++) {
int thisidx; int thisidx;
@ -804,7 +804,7 @@ int
qemuAssignDeviceHostdevAlias(virDomainDefPtr def, virDomainHostdevDefPtr hostdev, int idx) qemuAssignDeviceHostdevAlias(virDomainDefPtr def, virDomainHostdevDefPtr hostdev, int idx)
{ {
if (idx == -1) { if (idx == -1) {
int i; size_t i;
idx = 0; idx = 0;
for (i = 0; i < def->nhostdevs; i++) { for (i = 0; i < def->nhostdevs; i++) {
int thisidx; int thisidx;
@ -837,7 +837,7 @@ int
qemuAssignDeviceRedirdevAlias(virDomainDefPtr def, virDomainRedirdevDefPtr redirdev, int idx) qemuAssignDeviceRedirdevAlias(virDomainDefPtr def, virDomainRedirdevDefPtr redirdev, int idx)
{ {
if (idx == -1) { if (idx == -1) {
int i; size_t i;
idx = 0; idx = 0;
for (i = 0; i < def->nredirdevs; i++) { for (i = 0; i < def->nredirdevs; i++) {
int thisidx; int thisidx;
@ -867,7 +867,7 @@ qemuAssignDeviceControllerAlias(virDomainControllerDefPtr controller)
int int
qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps)
{ {
int i; size_t 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)
@ -890,11 +890,11 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps)
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%zu", i) < 0)
return -1; return -1;
} }
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%zu", i) < 0)
return -1; return -1;
} }
for (i = 0; i < def->nhostdevs; i++) { for (i = 0; i < def->nhostdevs; i++) {
@ -906,7 +906,7 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps)
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%zu", i) < 0)
return -1; return -1;
} }
for (i = 0; i < def->ncontrollers; i++) { for (i = 0; i < def->ncontrollers; i++) {
@ -914,31 +914,31 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps)
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%zu", i) < 0)
return -1; return -1;
} }
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%zu", i) < 0)
return -1; return -1;
} }
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%zu", i) < 0)
return -1; return -1;
} }
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%zu", i) < 0)
return -1; return -1;
} }
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%zu", i) < 0)
return -1; return -1;
} }
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%zu", i) < 0)
return -1; return -1;
} }
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%zu", i) < 0)
return -1; return -1;
} }
if (def->watchdog) { if (def->watchdog) {
@ -1060,7 +1060,7 @@ qemuDomainPrimeS390VirtioDevices(virDomainDefPtr def,
disks, networks, consoles, controllers, memballoon and rng in this disks, networks, consoles, controllers, memballoon and rng in this
order order
*/ */
int i; size_t 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 &&
@ -1281,7 +1281,8 @@ qemuAssignSpaprVIOAddress(virDomainDefPtr def, virDomainDeviceInfoPtr info,
int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def, int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def,
virQEMUCapsPtr qemuCaps) virQEMUCapsPtr qemuCaps)
{ {
int i, ret = -1; size_t i;
int ret = -1;
int model; int model;
/* Default values match QEMU. See spapr_(llan|vscsi|vty).c */ /* Default values match QEMU. See spapr_(llan|vscsi|vty).c */
@ -1411,7 +1412,8 @@ static int
qemuDomainPCIAddressSetGrow(qemuDomainPCIAddressSetPtr addrs, qemuDomainPCIAddressSetGrow(qemuDomainPCIAddressSetPtr addrs,
virDevicePCIAddressPtr addr) virDevicePCIAddressPtr addr)
{ {
int add, i; int add;
size_t i;
add = addr->bus - addrs->nbuses + 1; add = addr->bus - addrs->nbuses + 1;
i = addrs->nbuses; i = addrs->nbuses;
@ -1536,7 +1538,7 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def,
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) {
int max_idx = -1; int max_idx = -1;
int nbuses = 0; int nbuses = 0;
int i; size_t i;
int rv; int rv;
for (i = 0; i < def->ncontrollers; i++) { for (i = 0; i < def->ncontrollers; i++) {
@ -1630,7 +1632,7 @@ qemuDomainPCIAddressSetPtr qemuDomainPCIAddressSetCreate(virDomainDefPtr def,
bool dryRun) bool dryRun)
{ {
qemuDomainPCIAddressSetPtr addrs; qemuDomainPCIAddressSetPtr addrs;
int i; size_t i;
if (VIR_ALLOC(addrs) < 0) if (VIR_ALLOC(addrs) < 0)
goto error; goto error;
@ -2365,7 +2367,8 @@ qemuBuildRBDString(virConnectPtr conn,
virDomainDiskDefPtr disk, virDomainDiskDefPtr disk,
virBufferPtr opt) virBufferPtr opt)
{ {
int i, ret = 0; size_t i;
int ret = 0;
virSecretPtr sec = NULL; virSecretPtr sec = NULL;
char *secret = NULL; char *secret = NULL;
size_t secret_size; size_t secret_size;
@ -4079,7 +4082,7 @@ qemuBuildHostNetStr(virDomainNetDefPtr net,
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
enum virDomainNetType netType = virDomainNetGetActualType(net); enum virDomainNetType netType = virDomainNetGetActualType(net);
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
int i; size_t i;
if (net->script && netType != VIR_DOMAIN_NET_TYPE_ETHERNET) { if (net->script && netType != VIR_DOMAIN_NET_TYPE_ETHERNET) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@ -5473,7 +5476,7 @@ qemuBuildClockArgStr(virDomainClockDefPtr def)
} }
/* Look for an 'rtc' timer element, and add in appropriate clock= and driftfix= */ /* Look for an 'rtc' timer element, and add in appropriate clock= and driftfix= */
int i; size_t i;
for (i = 0; i < def->ntimers; i++) { for (i = 0; i < def->ntimers; i++) {
if (def->timers[i]->name == VIR_DOMAIN_TIMER_NAME_RTC) { if (def->timers[i]->name == VIR_DOMAIN_TIMER_NAME_RTC) {
switch (def->timers[i]->track) { switch (def->timers[i]->track) {
@ -5547,7 +5550,7 @@ qemuBuildCpuArgStr(const virQEMUDriverPtr driver,
char *compare_msg = NULL; char *compare_msg = NULL;
int ret = -1; int ret = -1;
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
int i; size_t i;
virCapsPtr caps = NULL; virCapsPtr caps = NULL;
*hasHwVirt = false; *hasHwVirt = false;
@ -5954,7 +5957,7 @@ qemuBuildSmpArgStr(const virDomainDefPtr def,
static int static int
qemuBuildNumaArgStr(const virDomainDefPtr def, virCommandPtr cmd) qemuBuildNumaArgStr(const virDomainDefPtr def, virCommandPtr cmd)
{ {
int i; size_t i;
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
char *cpumask = NULL; char *cpumask = NULL;
int ret = -1; int ret = -1;
@ -6160,7 +6163,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg,
int defaultMode = graphics->data.spice.defaultMode; int defaultMode = graphics->data.spice.defaultMode;
int port = graphics->data.spice.port; int port = graphics->data.spice.port;
int tlsPort = graphics->data.spice.tlsPort; int tlsPort = graphics->data.spice.tlsPort;
int i; size_t i;
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPICE)) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPICE)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
@ -6427,7 +6430,7 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd,
char **tapfdName = NULL; char **tapfdName = NULL;
char **vhostfdName = NULL; char **vhostfdName = NULL;
int actualType = virDomainNetGetActualType(net); int actualType = virDomainNetGetActualType(net);
int i; size_t i;
if (actualType == VIR_DOMAIN_NET_TYPE_HOSTDEV) { if (actualType == VIR_DOMAIN_NET_TYPE_HOSTDEV) {
/* NET_TYPE_HOSTDEV devices are really hostdev devices, so /* NET_TYPE_HOSTDEV devices are really hostdev devices, so
@ -6588,7 +6591,7 @@ qemuBuildCommandLine(virConnectPtr conn,
qemuBuildCommandLineCallbacksPtr callbacks) qemuBuildCommandLineCallbacksPtr callbacks)
{ {
virErrorPtr originalError = NULL; virErrorPtr originalError = NULL;
int i, j; size_t i, j;
const char *emulator; const char *emulator;
char uuid[VIR_UUID_STRING_BUFLEN]; char uuid[VIR_UUID_STRING_BUFLEN];
char *cpu; char *cpu;
@ -7502,12 +7505,14 @@ 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];
int vlan = i; int vlan;
/* VLANs are not used with -netdev, so don't record them */ /* VLANs are not used with -netdev, so don't record them */
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NETDEV) && if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NETDEV) &&
virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE))
vlan = -1; vlan = -1;
else
vlan = i;
if (qemuBuildInterfaceCommandLine(cmd, driver, conn, def, net, if (qemuBuildInterfaceCommandLine(cmd, driver, conn, def, net,
qemuCaps, vlan, bootNet, vmop) < 0) qemuCaps, vlan, bootNet, vmop) < 0)
@ -7567,7 +7572,7 @@ qemuBuildCommandLine(virConnectPtr conn,
smartcard->data.cert.file[j]); smartcard->data.cert.file[j]);
goto error; goto error;
} }
virBufferAsprintf(&opt, ",cert%d=%s", j + 1, virBufferAsprintf(&opt, ",cert%zu=%s", j + 1,
smartcard->data.cert.file[j]); smartcard->data.cert.file[j]);
} }
if (smartcard->data.cert.database) { if (smartcard->data.cert.database) {
@ -8053,18 +8058,17 @@ qemuBuildCommandLine(virConnectPtr conn,
if (sound->model == VIR_DOMAIN_SOUND_MODEL_ICH6) { if (sound->model == VIR_DOMAIN_SOUND_MODEL_ICH6) {
char *codecstr = NULL; char *codecstr = NULL;
int ii;
for (ii = 0; ii < sound->ncodecs; ii++) { for (j = 0; j < sound->ncodecs; j++) {
virCommandAddArg(cmd, "-device"); virCommandAddArg(cmd, "-device");
if (!(codecstr = qemuBuildSoundCodecStr(sound, sound->codecs[ii], qemuCaps))) { if (!(codecstr = qemuBuildSoundCodecStr(sound, sound->codecs[j], qemuCaps))) {
goto error; goto error;
} }
virCommandAddArg(cmd, codecstr); virCommandAddArg(cmd, codecstr);
VIR_FREE(codecstr); VIR_FREE(codecstr);
} }
if (ii == 0) { if (j == 0) {
virDomainSoundCodecDef codec = { virDomainSoundCodecDef codec = {
VIR_DOMAIN_SOUND_CODEC_TYPE_DUPLEX, VIR_DOMAIN_SOUND_CODEC_TYPE_DUPLEX,
0 0
@ -8493,7 +8497,7 @@ error:
/* free up any resources in the network driver /* free up any resources in the network driver
* but don't overwrite the original error */ * but don't overwrite the original error */
originalError = virSaveLastError(); originalError = virSaveLastError();
for (i = 0; i <= last_good_net; i++) for (i = 0; last_good_net != -1 && i <= last_good_net; i++)
virDomainConfNWFilterTeardown(def->nets[i]); virDomainConfNWFilterTeardown(def->nets[i]);
virSetError(originalError); virSetError(originalError);
virFreeError(originalError); virFreeError(originalError);
@ -8570,7 +8574,7 @@ static int qemuStringToArgvEnv(const char *args,
int argcount = 0; int argcount = 0;
int argalloc = 0; int argalloc = 0;
int envend; int envend;
int i; size_t i;
const char *curr = args; const char *curr = args;
const char *start; const char *start;
const char **progenv = NULL; const char **progenv = NULL;
@ -8671,7 +8675,7 @@ error:
static const char *qemuFindEnv(const char **progenv, static const char *qemuFindEnv(const char **progenv,
const char *name) const char *name)
{ {
int i; size_t i;
int len = strlen(name); int len = strlen(name);
for (i = 0; progenv && progenv[i]; i++) { for (i = 0; progenv && progenv[i]; i++) {
@ -8701,7 +8705,7 @@ qemuParseKeywords(const char *str,
char **values = NULL; char **values = NULL;
const char *start = str; const char *start = str;
const char *end; const char *end;
int i; size_t i;
*retkeywords = NULL; *retkeywords = NULL;
*retvalues = NULL; *retvalues = NULL;
@ -8804,7 +8808,7 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt,
char **keywords; char **keywords;
char **values; char **values;
int nkeywords; int nkeywords;
int i; size_t i;
int idx = -1; int idx = -1;
int busid = -1; int busid = -1;
int unitid = -1; int unitid = -1;
@ -9105,7 +9109,7 @@ qemuFindNICForVLAN(int nnics,
const char **nics, const char **nics,
int wantvlan) int wantvlan)
{ {
int i; size_t 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=");
@ -9153,7 +9157,7 @@ qemuParseCommandLineNet(virDomainXMLOptionPtr xmlopt,
int wantvlan = 0; int wantvlan = 0;
const char *tmp; const char *tmp;
bool genmac = true; bool genmac = true;
int i; size_t i;
tmp = strchr(val, ','); tmp = strchr(val, ',');
@ -9536,7 +9540,7 @@ qemuParseCommandLineCPU(virDomainDefPtr dom,
char **hv_tokens = NULL; char **hv_tokens = NULL;
char *model = NULL; char *model = NULL;
int ret = -1; int ret = -1;
int i; size_t i;
if (!(tokens = virStringSplit(val, ",", 0))) if (!(tokens = virStringSplit(val, ",", 0)))
goto cleanup; goto cleanup;
@ -9573,7 +9577,7 @@ qemuParseCommandLineCPU(virDomainDefPtr dom,
if (STREQ(feature, "kvmclock")) { if (STREQ(feature, "kvmclock")) {
bool present = (policy == VIR_CPU_FEATURE_REQUIRE); bool present = (policy == VIR_CPU_FEATURE_REQUIRE);
int j; size_t j;
for (j = 0; j < dom->clock.ntimers; j++) { for (j = 0; j < dom->clock.ntimers; j++) {
if (dom->clock.timers[j]->name == VIR_DOMAIN_TIMER_NAME_KVMCLOCK) if (dom->clock.timers[j]->name == VIR_DOMAIN_TIMER_NAME_KVMCLOCK)
@ -9718,7 +9722,7 @@ qemuParseCommandLineSmp(virDomainDefPtr dom,
unsigned int cores = 0; unsigned int cores = 0;
unsigned int threads = 0; unsigned int threads = 0;
unsigned int maxcpus = 0; unsigned int maxcpus = 0;
int i; size_t i;
int nkws; int nkws;
char **kws; char **kws;
char **vals; char **vals;
@ -9820,7 +9824,7 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps,
bool *monJSON) bool *monJSON)
{ {
virDomainDefPtr def; virDomainDefPtr def;
int i; size_t i;
bool nographics = false; bool nographics = false;
bool fullscreen = false; bool fullscreen = false;
char *path; char *path;
@ -10775,7 +10779,7 @@ virDomainDefPtr qemuParseCommandLineString(virCapsPtr qemuCaps,
const char **progenv = NULL; const char **progenv = NULL;
const char **progargv = NULL; const char **progargv = NULL;
virDomainDefPtr def = NULL; virDomainDefPtr def = NULL;
int i; size_t i;
if (qemuStringToArgvEnv(args, &progenv, &progargv) < 0) if (qemuStringToArgvEnv(args, &progenv, &progargv) < 0)
goto cleanup; goto cleanup;
@ -10807,7 +10811,7 @@ static int qemuParseProcFileStrings(int pid_value,
char *tmp; char *tmp;
size_t nstr = 0; size_t nstr = 0;
char **str = NULL; char **str = NULL;
int i; size_t i;
if (virAsprintf(&path, "/proc/%d/%s", pid_value, name) < 0) if (virAsprintf(&path, "/proc/%d/%s", pid_value, name) < 0)
goto cleanup; goto cleanup;
@ -10859,7 +10863,7 @@ virDomainDefPtr qemuParseCommandLinePid(virCapsPtr qemuCaps,
const char **progenv = NULL; const char **progenv = NULL;
char *exepath = NULL; char *exepath = NULL;
char *emulator; char *emulator;
int i; size_t i;
/* The parser requires /proc/pid, which only exists on platforms /* The parser requires /proc/pid, which only exists on platforms
* like Linux where pid_t fits in int. */ * like Linux where pid_t fits in int. */

2
src/qemu/qemu_conf.c
View File

@ -308,7 +308,7 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg,
virConfPtr conf = NULL; virConfPtr conf = NULL;
virConfValuePtr p; virConfValuePtr p;
int ret = -1; int ret = -1;
int i; size_t i;
/* Just check the file is readable before opening it, otherwise /* Just check the file is readable before opening it, otherwise
* libvirt emits an error. * libvirt emits an error.

34
src/qemu/qemu_domain.c
View File

@ -292,7 +292,7 @@ qemuDomainObjPrivateXMLFormat(virBufferPtr buf, void *data)
if (priv->nvcpupids) { if (priv->nvcpupids) {
int i; size_t 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]);
@ -301,7 +301,7 @@ qemuDomainObjPrivateXMLFormat(virBufferPtr buf, void *data)
} }
if (priv->qemuCaps) { if (priv->qemuCaps) {
int i; size_t 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)) {
@ -344,7 +344,8 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, void *data)
qemuDomainObjPrivatePtr priv = data; qemuDomainObjPrivatePtr priv = data;
char *monitorpath; char *monitorpath;
char *tmp; char *tmp;
int n, i; int n;
size_t i;
xmlNodePtr *nodes = NULL; xmlNodePtr *nodes = NULL;
virQEMUCapsPtr qemuCaps = NULL; virQEMUCapsPtr qemuCaps = NULL;
@ -497,7 +498,7 @@ static void
qemuDomainDefNamespaceFree(void *nsdata) qemuDomainDefNamespaceFree(void *nsdata)
{ {
qemuDomainCmdlineDefPtr cmd = nsdata; qemuDomainCmdlineDefPtr cmd = nsdata;
unsigned int i; size_t i;
if (!cmd) if (!cmd)
return; return;
@ -523,7 +524,8 @@ qemuDomainDefNamespaceParse(xmlDocPtr xml ATTRIBUTE_UNUSED,
qemuDomainCmdlineDefPtr cmd = NULL; qemuDomainCmdlineDefPtr cmd = NULL;
bool uses_qemu_ns = false; bool uses_qemu_ns = false;
xmlNodePtr *nodes = NULL; xmlNodePtr *nodes = NULL;
int n, i; int n;
size_t i;
if (xmlXPathRegisterNs(ctxt, BAD_CAST "qemu", BAD_CAST QEMU_NAMESPACE_HREF) < 0) { if (xmlXPathRegisterNs(ctxt, BAD_CAST "qemu", BAD_CAST QEMU_NAMESPACE_HREF) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
@ -620,7 +622,7 @@ qemuDomainDefNamespaceFormatXML(virBufferPtr buf,
void *nsdata) void *nsdata)
{ {
qemuDomainCmdlineDefPtr cmd = nsdata; qemuDomainCmdlineDefPtr cmd = nsdata;
unsigned int i; size_t i;
if (!cmd->num_args && !cmd->num_env) if (!cmd->num_args && !cmd->num_env)
return 0; return 0;
@ -1330,7 +1332,7 @@ qemuDomainDefFormatBuf(virQEMUDriverPtr driver,
} }
if ((flags & VIR_DOMAIN_XML_MIGRATABLE)) { if ((flags & VIR_DOMAIN_XML_MIGRATABLE)) {
int i; size_t i;
int toremove = 0; int toremove = 0;
virDomainControllerDefPtr usb = NULL, pci = NULL; virDomainControllerDefPtr usb = NULL, pci = NULL;
@ -1498,7 +1500,7 @@ void qemuDomainObjCheckTaint(virQEMUDriverPtr driver,
virDomainObjPtr obj, virDomainObjPtr obj,
int logFD) int logFD)
{ {
int i; size_t i;
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
if (cfg->privileged && if (cfg->privileged &&
@ -1759,7 +1761,7 @@ qemuDomainSnapshotForEachQcow2Raw(virQEMUDriverPtr driver,
int ndisks) int ndisks)
{ {
const char *qemuimgarg[] = { NULL, "snapshot", NULL, NULL, NULL, NULL }; const char *qemuimgarg[] = { NULL, "snapshot", NULL, NULL, NULL, NULL };
int i; size_t i;
bool skipped = false; bool skipped = false;
qemuimgarg[0] = qemuFindQemuImgBinary(driver); qemuimgarg[0] = qemuFindQemuImgBinary(driver);
@ -1993,7 +1995,7 @@ qemuDomainCheckDiskPresence(virQEMUDriverPtr driver,
bool cold_boot) bool cold_boot)
{ {
int ret = -1; int ret = -1;
int i; size_t i;
virDomainDiskDefPtr disk; virDomainDiskDefPtr disk;
char uuid[VIR_UUID_STRING_BUFLEN]; char uuid[VIR_UUID_STRING_BUFLEN];
virDomainEventPtr event = NULL; virDomainEventPtr event = NULL;
@ -2068,7 +2070,7 @@ qemuDomainCleanupAdd(virDomainObjPtr vm,
qemuDomainCleanupCallback cb) qemuDomainCleanupCallback cb)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
int i; size_t i;
VIR_DEBUG("vm=%s, cb=%p", vm->def->name, cb); VIR_DEBUG("vm=%s, cb=%p", vm->def->name, cb);
@ -2091,7 +2093,7 @@ qemuDomainCleanupRemove(virDomainObjPtr vm,
qemuDomainCleanupCallback cb) qemuDomainCleanupCallback cb)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
int i; size_t i;
VIR_DEBUG("vm=%s, cb=%p", vm->def->name, cb); VIR_DEBUG("vm=%s, cb=%p", vm->def->name, cb);
@ -2114,13 +2116,13 @@ qemuDomainCleanupRun(virQEMUDriverPtr driver,
virDomainObjPtr vm) virDomainObjPtr vm)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
int i; size_t i;
VIR_DEBUG("driver=%p, vm=%s", driver, vm->def->name); VIR_DEBUG("driver=%p, vm=%s", driver, vm->def->name);
/* run cleanup callbacks in reverse order */ /* run cleanup callbacks in reverse order */
for (i = priv->ncleanupCallbacks - 1; i >= 0; i--) { for (i = 0; i < priv->ncleanupCallbacks; i++) {
if (priv->cleanupCallbacks[i]) if (priv->cleanupCallbacks[priv->ncleanupCallbacks - (i + 1)])
priv->cleanupCallbacks[i](driver, vm); priv->cleanupCallbacks[i](driver, vm);
} }
@ -2166,7 +2168,7 @@ unsigned long long
qemuDomainMemoryLimit(virDomainDefPtr def) qemuDomainMemoryLimit(virDomainDefPtr def)
{ {
unsigned long long mem; unsigned long long mem;
int i; size_t i;
if (def->mem.hard_limit) { if (def->mem.hard_limit) {
mem = def->mem.hard_limit; mem = def->mem.hard_limit;

124
src/qemu/qemu_driver.c
View File

@ -512,7 +512,7 @@ static int
qemuDomainNetsRestart(virDomainObjPtr vm, qemuDomainNetsRestart(virDomainObjPtr vm,
void *data ATTRIBUTE_UNUSED) void *data ATTRIBUTE_UNUSED)
{ {
int i; size_t i;
virDomainDefPtr def = vm->def; virDomainDefPtr def = vm->def;
virObjectLock(vm); virObjectLock(vm);
@ -2334,7 +2334,7 @@ static int qemuDomainSendKey(virDomainPtr domain,
/* translate the keycode to RFB for qemu driver */ /* translate the keycode to RFB for qemu driver */
if (codeset != VIR_KEYCODE_SET_RFB) { if (codeset != VIR_KEYCODE_SET_RFB) {
int i; size_t i;
int keycode; int keycode;
for (i = 0; i < nkeycodes; i++) { for (i = 0; i < nkeycodes; i++) {
@ -3801,7 +3801,8 @@ static int qemuDomainHotplugVcpus(virQEMUDriverPtr driver,
unsigned int nvcpus) unsigned int nvcpus)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
int i, rc = 1; size_t i;
int rc = 1;
int ret = -1; int ret = -1;
int oldvcpus = vm->def->vcpus; int oldvcpus = vm->def->vcpus;
int vcpus = oldvcpus; int vcpus = oldvcpus;
@ -3879,7 +3880,7 @@ static int qemuDomainHotplugVcpus(virQEMUDriverPtr driver,
if (rv < 0) { if (rv < 0) {
virReportSystemError(-rv, virReportSystemError(-rv,
_("Unable to create vcpu cgroup for %s(vcpu:" _("Unable to create vcpu cgroup for %s(vcpu:"
" %d)"), " %zu)"),
vm->def->name, i); vm->def->name, i);
goto cleanup; goto cleanup;
} }
@ -3888,7 +3889,7 @@ static int qemuDomainHotplugVcpus(virQEMUDriverPtr driver,
rv = virCgroupAddTask(cgroup_vcpu, cpupids[i]); rv = virCgroupAddTask(cgroup_vcpu, cpupids[i]);
if (rv < 0) { if (rv < 0) {
virReportSystemError(-rv, virReportSystemError(-rv,
_("unable to add vcpu %d task %d to cgroup"), _("unable to add vcpu %zu task %d to cgroup"),
i, cpupids[i]); i, cpupids[i]);
virCgroupRemove(cgroup_vcpu); virCgroupRemove(cgroup_vcpu);
goto cleanup; goto cleanup;
@ -3920,7 +3921,7 @@ static int qemuDomainHotplugVcpus(virQEMUDriverPtr driver,
vm->def->cputune.nvcpupin, i) < 0) { vm->def->cputune.nvcpupin, i) < 0) {
virReportError(VIR_ERR_OPERATION_INVALID, virReportError(VIR_ERR_OPERATION_INVALID,
_("failed to set cpuset.cpus in cgroup" _("failed to set cpuset.cpus in cgroup"
" for vcpu %d"), i); " for vcpu %zu"), i);
ret = -1; ret = -1;
goto cleanup; goto cleanup;
} }
@ -3928,7 +3929,7 @@ static int qemuDomainHotplugVcpus(virQEMUDriverPtr driver,
if (virProcessSetAffinity(cpupids[i], if (virProcessSetAffinity(cpupids[i],
vcpupin->cpumask) < 0) { vcpupin->cpumask) < 0) {
virReportError(VIR_ERR_SYSTEM_ERROR, virReportError(VIR_ERR_SYSTEM_ERROR,
_("failed to set cpu affinity for vcpu %d"), _("failed to set cpu affinity for vcpu %zu"),
i); i);
ret = -1; ret = -1;
goto cleanup; goto cleanup;
@ -3949,7 +3950,7 @@ static int qemuDomainHotplugVcpus(virQEMUDriverPtr driver,
if (rv < 0) { if (rv < 0) {
virReportSystemError(-rv, virReportSystemError(-rv,
_("Unable to access vcpu cgroup for %s(vcpu:" _("Unable to access vcpu cgroup for %s(vcpu:"
" %d)"), " %zu)"),
vm->def->name, i); vm->def->name, i);
goto cleanup; goto cleanup;
} }
@ -3992,7 +3993,7 @@ qemuDomainPrepareAgentVCPUs(unsigned int nvcpus,
qemuAgentCPUInfoPtr cpuinfo, qemuAgentCPUInfoPtr cpuinfo,
int ncpuinfo) int ncpuinfo)
{ {
int i; size_t i;
int nonline = 0; int nonline = 0;
int nofflinable = 0; int nofflinable = 0;
@ -4704,7 +4705,8 @@ qemuDomainGetVcpus(virDomainPtr dom,
unsigned char *cpumaps, unsigned char *cpumaps,
int maplen) { int maplen) {
virDomainObjPtr vm; virDomainObjPtr vm;
int i, v, maxcpu, hostcpus; size_t i;
int v, maxcpu, hostcpus;
int ret = -1; int ret = -1;
qemuDomainObjPrivatePtr priv; qemuDomainObjPrivatePtr priv;
@ -4801,7 +4803,7 @@ qemuDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags)
virCapsPtr caps = NULL; virCapsPtr caps = NULL;
qemuAgentCPUInfoPtr cpuinfo = NULL; qemuAgentCPUInfoPtr cpuinfo = NULL;
int ncpuinfo = -1; int ncpuinfo = -1;
int i; size_t i;
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
VIR_DOMAIN_AFFECT_CONFIG | VIR_DOMAIN_AFFECT_CONFIG |
@ -4945,7 +4947,8 @@ static int qemuDomainGetSecurityLabelList(virDomainPtr dom,
{ {
virQEMUDriverPtr driver = dom->conn->privateData; virQEMUDriverPtr driver = dom->conn->privateData;
virDomainObjPtr vm; virDomainObjPtr vm;
int i, ret = -1; size_t i;
int ret = -1;
if (!(vm = qemuDomObjFromDomain(dom))) if (!(vm = qemuDomObjFromDomain(dom)))
return -1; return -1;
@ -5670,7 +5673,7 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn,
bool monitor_json = false; bool monitor_json = false;
virCommandPtr cmd = NULL; virCommandPtr cmd = NULL;
char *ret = NULL; char *ret = NULL;
int i; size_t i;
virQEMUDriverConfigPtr cfg; virQEMUDriverConfigPtr cfg;
virCapsPtr caps = NULL; virCapsPtr caps = NULL;
@ -5786,7 +5789,7 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn,
!graphics->data.vnc.socket && graphics->data.vnc.autoport) { !graphics->data.vnc.socket && graphics->data.vnc.autoport) {
graphics->data.vnc.port = 5900; graphics->data.vnc.port = 5900;
} else if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { } else if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) {
int j; size_t j;
bool needTLSPort = false; bool needTLSPort = false;
bool needPort = false; bool needPort = false;
int defaultMode = graphics->data.spice.defaultMode; int defaultMode = graphics->data.spice.defaultMode;
@ -7454,7 +7457,7 @@ qemuDomainParseDeviceWeightStr(char *deviceWeightStr,
char *temp; char *temp;
int ndevices = 0; int ndevices = 0;
int nsep = 0; int nsep = 0;
int i; size_t i;
virBlkioDeviceWeightPtr result = NULL; virBlkioDeviceWeightPtr result = NULL;
*dw = NULL; *dw = NULL;
@ -7535,7 +7538,7 @@ qemuDomainMergeDeviceWeights(virBlkioDeviceWeightPtr *dest_array,
virBlkioDeviceWeightPtr src_array, virBlkioDeviceWeightPtr src_array,
size_t src_size) size_t src_size)
{ {
int i, j; size_t i, j;
virBlkioDeviceWeightPtr dest, src; virBlkioDeviceWeightPtr dest, src;
for (i = 0; i < src_size; i++) { for (i = 0; i < src_size; i++) {
@ -7572,7 +7575,7 @@ qemuDomainSetBlkioParameters(virDomainPtr dom,
unsigned int flags) unsigned int flags)
{ {
virQEMUDriverPtr driver = dom->conn->privateData; virQEMUDriverPtr driver = dom->conn->privateData;
int i; size_t i;
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
virDomainDefPtr persistentDef = NULL; virDomainDefPtr persistentDef = NULL;
int ret = -1; int ret = -1;
@ -7637,7 +7640,7 @@ qemuDomainSetBlkioParameters(virDomainPtr dom,
} else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT)) { } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT)) {
size_t ndevices; size_t ndevices;
virBlkioDeviceWeightPtr devices = NULL; virBlkioDeviceWeightPtr devices = NULL;
int j; size_t j;
if (qemuDomainParseDeviceWeightStr(params[i].value.s, if (qemuDomainParseDeviceWeightStr(params[i].value.s,
&devices, &devices,
@ -7723,7 +7726,7 @@ qemuDomainGetBlkioParameters(virDomainPtr dom,
unsigned int flags) unsigned int flags)
{ {
virQEMUDriverPtr driver = dom->conn->privateData; virQEMUDriverPtr driver = dom->conn->privateData;
int i, j; size_t i, j;
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
virDomainDefPtr persistentDef = NULL; virDomainDefPtr persistentDef = NULL;
unsigned int val; unsigned int val;
@ -8037,7 +8040,7 @@ qemuDomainGetMemoryParameters(virDomainPtr dom,
unsigned int flags) unsigned int flags)
{ {
virQEMUDriverPtr driver = dom->conn->privateData; virQEMUDriverPtr driver = dom->conn->privateData;
int i; size_t i;
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
virDomainDefPtr persistentDef = NULL; virDomainDefPtr persistentDef = NULL;
int ret = -1; int ret = -1;
@ -8191,7 +8194,7 @@ qemuDomainSetNumaParameters(virDomainPtr dom,
unsigned int flags) unsigned int flags)
{ {
virQEMUDriverPtr driver = dom->conn->privateData; virQEMUDriverPtr driver = dom->conn->privateData;
int i; size_t i;
virDomainDefPtr persistentDef = NULL; virDomainDefPtr persistentDef = NULL;
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
int ret = -1; int ret = -1;
@ -8337,7 +8340,7 @@ qemuDomainGetNumaParameters(virDomainPtr dom,
unsigned int flags) unsigned int flags)
{ {
virQEMUDriverPtr driver = dom->conn->privateData; virQEMUDriverPtr driver = dom->conn->privateData;
int i; size_t i;
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
virDomainDefPtr persistentDef = NULL; virDomainDefPtr persistentDef = NULL;
char *nodeset = NULL; char *nodeset = NULL;
@ -8441,7 +8444,7 @@ static int
qemuSetVcpusBWLive(virDomainObjPtr vm, virCgroupPtr cgroup, qemuSetVcpusBWLive(virDomainObjPtr vm, virCgroupPtr cgroup,
unsigned long long period, long long quota) unsigned long long period, long long quota)
{ {
int i; size_t i;
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
virCgroupPtr cgroup_vcpu = NULL; virCgroupPtr cgroup_vcpu = NULL;
int rc; int rc;
@ -8459,7 +8462,7 @@ qemuSetVcpusBWLive(virDomainObjPtr vm, virCgroupPtr cgroup,
if (rc < 0) { if (rc < 0) {
virReportSystemError(-rc, virReportSystemError(-rc,
_("Unable to find vcpu cgroup for %s(vcpu:" _("Unable to find vcpu cgroup for %s(vcpu:"
" %d)"), " %zu)"),
vm->def->name, i); vm->def->name, i);
goto cleanup; goto cleanup;
} }
@ -8528,7 +8531,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom,
unsigned int flags) unsigned int flags)
{ {
virQEMUDriverPtr driver = dom->conn->privateData; virQEMUDriverPtr driver = dom->conn->privateData;
int i; size_t i;
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
virDomainDefPtr vmdef = NULL; virDomainDefPtr vmdef = NULL;
unsigned long long value_ul; unsigned long long value_ul;
@ -8967,7 +8970,7 @@ qemuDomainBlockResize(virDomainPtr dom,
virQEMUDriverPtr driver = dom->conn->privateData; virQEMUDriverPtr driver = dom->conn->privateData;
virDomainObjPtr vm; virDomainObjPtr vm;
qemuDomainObjPrivatePtr priv; qemuDomainObjPrivatePtr priv;
int ret = -1, i; int ret = -1, idx;
char *device = NULL; char *device = NULL;
virDomainDiskDefPtr disk = NULL; virDomainDiskDefPtr disk = NULL;
@ -9007,12 +9010,12 @@ qemuDomainBlockResize(virDomainPtr dom,
goto endjob; goto endjob;
} }
if ((i = virDomainDiskIndexByName(vm->def, path, false)) < 0) { if ((idx = virDomainDiskIndexByName(vm->def, path, false)) < 0) {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("invalid path: %s"), path); _("invalid path: %s"), path);
goto endjob; goto endjob;
} }
disk = vm->def->disks[i]; disk = vm->def->disks[idx];
if (virAsprintf(&device, "%s%s", QEMU_DRIVE_HOST_PREFIX, if (virAsprintf(&device, "%s%s", QEMU_DRIVE_HOST_PREFIX,
disk->info.alias) < 0) disk->info.alias) < 0)
@ -9048,7 +9051,8 @@ qemuDomainBlockStats(virDomainPtr dom,
struct _virDomainBlockStats *stats) struct _virDomainBlockStats *stats)
{ {
virQEMUDriverPtr driver = dom->conn->privateData; virQEMUDriverPtr driver = dom->conn->privateData;
int i, ret = -1; int idx;
int ret = -1;
virDomainObjPtr vm; virDomainObjPtr vm;
virDomainDiskDefPtr disk = NULL; virDomainDiskDefPtr disk = NULL;
qemuDomainObjPrivatePtr priv; qemuDomainObjPrivatePtr priv;
@ -9065,12 +9069,12 @@ qemuDomainBlockStats(virDomainPtr dom,
goto cleanup; goto cleanup;
} }
if ((i = virDomainDiskIndexByName(vm->def, path, false)) < 0) { if ((idx = virDomainDiskIndexByName(vm->def, path, false)) < 0) {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("invalid path: %s"), path); _("invalid path: %s"), path);
goto cleanup; goto cleanup;
} }
disk = vm->def->disks[i]; disk = vm->def->disks[idx];
if (!disk->info.alias) { if (!disk->info.alias) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
@ -9120,7 +9124,8 @@ qemuDomainBlockStatsFlags(virDomainPtr dom,
unsigned int flags) unsigned int flags)
{ {
virQEMUDriverPtr driver = dom->conn->privateData; virQEMUDriverPtr driver = dom->conn->privateData;
int i, tmp, ret = -1; int idx;
int tmp, ret = -1;
virDomainObjPtr vm; virDomainObjPtr vm;
virDomainDiskDefPtr disk = NULL; virDomainDiskDefPtr disk = NULL;
qemuDomainObjPrivatePtr priv; qemuDomainObjPrivatePtr priv;
@ -9149,12 +9154,12 @@ qemuDomainBlockStatsFlags(virDomainPtr dom,
} }
if (*nparams != 0) { if (*nparams != 0) {
if ((i = virDomainDiskIndexByName(vm->def, path, false)) < 0) { if ((idx = virDomainDiskIndexByName(vm->def, path, false)) < 0) {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("invalid path: %s"), path); _("invalid path: %s"), path);
goto endjob; goto endjob;
} }
disk = vm->def->disks[i]; disk = vm->def->disks[idx];
if (!disk->info.alias) { if (!disk->info.alias) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
@ -9286,7 +9291,7 @@ qemuDomainInterfaceStats(virDomainPtr dom,
struct _virDomainInterfaceStats *stats) struct _virDomainInterfaceStats *stats)
{ {
virDomainObjPtr vm; virDomainObjPtr vm;
int i; size_t i;
int ret = -1; int ret = -1;
if (!(vm = qemuDomObjFromDomain(dom))) if (!(vm = qemuDomObjFromDomain(dom)))
@ -9341,7 +9346,7 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom,
unsigned int flags) unsigned int flags)
{ {
virQEMUDriverPtr driver = dom->conn->privateData; virQEMUDriverPtr driver = dom->conn->privateData;
int i; size_t i;
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
virDomainDefPtr persistentDef = NULL; virDomainDefPtr persistentDef = NULL;
int ret = -1; int ret = -1;
@ -9510,7 +9515,7 @@ qemuDomainGetInterfaceParameters(virDomainPtr dom,
unsigned int flags) unsigned int flags)
{ {
virQEMUDriverPtr driver = dom->conn->privateData; virQEMUDriverPtr driver = dom->conn->privateData;
int i; size_t i;
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
virDomainDefPtr def = NULL; virDomainDefPtr def = NULL;
virDomainDefPtr persistentDef = NULL; virDomainDefPtr persistentDef = NULL;
@ -9838,7 +9843,7 @@ static int qemuDomainGetBlockInfo(virDomainPtr dom,
virStorageFileMetadata *meta = NULL; virStorageFileMetadata *meta = NULL;
virDomainDiskDefPtr disk = NULL; virDomainDiskDefPtr disk = NULL;
struct stat sb; struct stat sb;
int i; int idx;
int format; int format;
virQEMUDriverConfigPtr cfg = NULL; virQEMUDriverConfigPtr cfg = NULL;
@ -9859,12 +9864,12 @@ static int qemuDomainGetBlockInfo(virDomainPtr dom,
} }
/* Check the path belongs to this domain. */ /* Check the path belongs to this domain. */
if ((i = virDomainDiskIndexByName(vm->def, path, false)) < 0) { if ((idx = virDomainDiskIndexByName(vm->def, path, false)) < 0) {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("invalid path %s not assigned to domain"), path); _("invalid path %s not assigned to domain"), path);
goto cleanup; goto cleanup;
} }
disk = vm->def->disks[i]; disk = vm->def->disks[idx];
if (!disk->src) { if (!disk->src) {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("disk %s does not currently have a source assigned"), _("disk %s does not currently have a source assigned"),
@ -11633,7 +11638,7 @@ qemuDomainSnapshotCreateInactiveExternal(virQEMUDriverPtr driver,
virDomainSnapshotObjPtr snap, virDomainSnapshotObjPtr snap,
bool reuse) bool reuse)
{ {
int i; size_t i;
virDomainSnapshotDiskDefPtr snapdisk; virDomainSnapshotDiskDefPtr snapdisk;
virDomainDiskDefPtr defdisk; virDomainDiskDefPtr defdisk;
virCommandPtr cmd = NULL; virCommandPtr cmd = NULL;
@ -11829,7 +11834,7 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, virDomainSnapshotDefPtr def,
unsigned int *flags) unsigned int *flags)
{ {
int ret = -1; int ret = -1;
int i; size_t i;
bool active = virDomainObjIsActive(vm); bool active = virDomainObjIsActive(vm);
struct stat st; struct stat st;
bool reuse = (*flags & VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT) != 0; bool reuse = (*flags & VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT) != 0;
@ -12112,7 +12117,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
virJSONValuePtr actions = NULL; virJSONValuePtr actions = NULL;
int ret = -1; int ret = -1;
int i; size_t i;
bool persist = false; bool persist = false;
bool reuse = (flags & VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT) != 0; bool reuse = (flags & VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT) != 0;
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
@ -12171,7 +12176,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
if (ret < 0) { if (ret < 0) {
/* Transaction failed; undo the changes to vm. */ /* Transaction failed; undo the changes to vm. */
bool need_unlink = !(flags & VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT); bool need_unlink = !(flags & VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT);
while (--i >= 0) { while (i-- > 0) {
virDomainDiskDefPtr persistDisk = NULL; virDomainDiskDefPtr persistDisk = NULL;
if (snap->def->disks[i].snapshot == if (snap->def->disks[i].snapshot ==
@ -13776,7 +13781,7 @@ qemuDomainOpenConsole(virDomainPtr dom,
{ {
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
int ret = -1; int ret = -1;
int i; size_t i;
virDomainChrDefPtr chr = NULL; virDomainChrDefPtr chr = NULL;
qemuDomainObjPrivatePtr priv; qemuDomainObjPrivatePtr priv;
@ -13858,7 +13863,7 @@ qemuDomainOpenChannel(virDomainPtr dom,
{ {
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
int ret = -1; int ret = -1;
int i; size_t i;
virDomainChrDefPtr chr = NULL; virDomainChrDefPtr chr = NULL;
qemuDomainObjPrivatePtr priv; qemuDomainObjPrivatePtr priv;
@ -13926,19 +13931,19 @@ cleanup:
} }
static char * static char *
qemuDiskPathToAlias(virDomainObjPtr vm, const char *path, int *idx) qemuDiskPathToAlias(virDomainObjPtr vm, const char *path, int *idxret)
{ {
int i; int idx;
char *ret = NULL; char *ret = NULL;
virDomainDiskDefPtr disk; virDomainDiskDefPtr disk;
i = virDomainDiskIndexByName(vm->def, path, true); idx = virDomainDiskIndexByName(vm->def, path, true);
if (i < 0) if (idx < 0)
goto cleanup; goto cleanup;
disk = vm->def->disks[i]; disk = vm->def->disks[idx];
if (idx) if (idxret)
*idx = i; *idxret = idx;
if (disk->src) { if (disk->src) {
if (virAsprintf(&ret, "drive-%s", disk->info.alias) < 0) if (virAsprintf(&ret, "drive-%s", disk->info.alias) < 0)
@ -14762,7 +14767,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
virDomainBlockIoTuneInfo *oldinfo; virDomainBlockIoTuneInfo *oldinfo;
const char *device = NULL; const char *device = NULL;
int ret = -1; int ret = -1;
int i; size_t i;
int idx = -1; int idx = -1;
bool set_bytes = false; bool set_bytes = false;
bool set_iops = false; bool set_iops = false;
@ -14940,7 +14945,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom,
virDomainBlockIoTuneInfo reply; virDomainBlockIoTuneInfo reply;
const char *device = NULL; const char *device = NULL;
int ret = -1; int ret = -1;
int i; size_t i;
virCapsPtr caps = NULL; virCapsPtr caps = NULL;
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
@ -15073,7 +15078,7 @@ qemuDomainGetDiskErrors(virDomainPtr dom,
qemuDomainObjPrivatePtr priv; qemuDomainObjPrivatePtr priv;
virHashTablePtr table = NULL; virHashTablePtr table = NULL;
int ret = -1; int ret = -1;
int i; size_t i;
int n = 0; int n = 0;
virCheckFlags(0, -1); virCheckFlags(0, -1);
@ -15373,7 +15378,7 @@ getSumVcpuPercpuStats(virDomainObjPtr vm,
unsigned int num) unsigned int num)
{ {
int ret = -1; int ret = -1;
int i; size_t i;
char *buf = NULL; char *buf = NULL;
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
virCgroupPtr group_vcpu = NULL; virCgroupPtr group_vcpu = NULL;
@ -15381,7 +15386,7 @@ getSumVcpuPercpuStats(virDomainObjPtr vm,
for (i = 0; i < priv->nvcpupids; i++) { for (i = 0; i < priv->nvcpupids; i++) {
char *pos; char *pos;
unsigned long long tmp; unsigned long long tmp;
int j; size_t j;
if (virCgroupNewVcpu(priv->cgroup, i, false, &group_vcpu) < 0) { if (virCgroupNewVcpu(priv->cgroup, i, false, &group_vcpu) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@ -15421,7 +15426,8 @@ qemuDomainGetPercpuStats(virDomainObjPtr vm,
unsigned int ncpus) unsigned int ncpus)
{ {
int rv = -1; int rv = -1;
int i, id, max_id; size_t i;
int id, max_id;
char *pos; char *pos;
char *buf = NULL; char *buf = NULL;
unsigned long long *sum_cpu_time = NULL; unsigned long long *sum_cpu_time = NULL;

26
src/qemu/qemu_hostdev.c
View File

@ -38,7 +38,7 @@ static virPCIDeviceListPtr
qemuGetPciHostDeviceList(virDomainHostdevDefPtr *hostdevs, int nhostdevs) qemuGetPciHostDeviceList(virDomainHostdevDefPtr *hostdevs, int nhostdevs)
{ {
virPCIDeviceListPtr list; virPCIDeviceListPtr list;
int i; size_t i;
if (!(list = virPCIDeviceListNew())) if (!(list = virPCIDeviceListNew()))
return NULL; return NULL;
@ -100,7 +100,7 @@ qemuGetActivePciHostDeviceList(virQEMUDriverPtr driver,
int nhostdevs) int nhostdevs)
{ {
virPCIDeviceListPtr list; virPCIDeviceListPtr list;
int i; size_t i;
if (!(list = virPCIDeviceListNew())) if (!(list = virPCIDeviceListNew()))
return NULL; return NULL;
@ -133,7 +133,7 @@ int qemuUpdateActivePciHostdevs(virQEMUDriverPtr driver,
{ {
virDomainHostdevDefPtr hostdev = NULL; virDomainHostdevDefPtr hostdev = NULL;
virPCIDevicePtr dev = NULL; virPCIDevicePtr dev = NULL;
int i; size_t i;
int ret = -1; int ret = -1;
if (!def->nhostdevs) if (!def->nhostdevs)
@ -193,7 +193,7 @@ qemuUpdateActiveUsbHostdevs(virQEMUDriverPtr driver,
virDomainDefPtr def) virDomainDefPtr def)
{ {
virDomainHostdevDefPtr hostdev = NULL; virDomainHostdevDefPtr hostdev = NULL;
int i; size_t i;
int ret = -1; int ret = -1;
if (!def->nhostdevs) if (!def->nhostdevs)
@ -238,7 +238,7 @@ qemuUpdateActiveScsiHostdevs(virQEMUDriverPtr driver,
virDomainDefPtr def) virDomainDefPtr def)
{ {
virDomainHostdevDefPtr hostdev = NULL; virDomainHostdevDefPtr hostdev = NULL;
int i; size_t i;
int ret = -1; int ret = -1;
if (!def->nhostdevs) if (!def->nhostdevs)
@ -482,7 +482,7 @@ int qemuPrepareHostdevPCIDevices(virQEMUDriverPtr driver,
{ {
virPCIDeviceListPtr pcidevs; virPCIDeviceListPtr pcidevs;
int last_processed_hostdev_vf = -1; int last_processed_hostdev_vf = -1;
int i; size_t i;
int ret = -1; int ret = -1;
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
@ -675,7 +675,7 @@ qemuPrepareHostdevUSBDevices(virQEMUDriverPtr driver,
const char *name, const char *name,
virUSBDeviceListPtr list) virUSBDeviceListPtr list)
{ {
int i, j; size_t i, j;
unsigned int count; unsigned int count;
virUSBDevicePtr tmp; virUSBDevicePtr tmp;
@ -814,7 +814,8 @@ qemuPrepareHostUSBDevices(virQEMUDriverPtr driver,
virDomainDefPtr def, virDomainDefPtr def,
bool coldBoot) bool coldBoot)
{ {
int i, ret = -1; size_t i;
int ret = -1;
virUSBDeviceListPtr list; virUSBDeviceListPtr list;
virUSBDevicePtr tmp; virUSBDevicePtr tmp;
virDomainHostdevDefPtr *hostdevs = def->hostdevs; virDomainHostdevDefPtr *hostdevs = def->hostdevs;
@ -883,7 +884,8 @@ qemuPrepareHostdevSCSIDevices(virQEMUDriverPtr driver,
virDomainHostdevDefPtr *hostdevs, virDomainHostdevDefPtr *hostdevs,
int nhostdevs) int nhostdevs)
{ {
int i, j, count; size_t i, j;
int count;
virSCSIDeviceListPtr list; virSCSIDeviceListPtr list;
virSCSIDevicePtr tmp; virSCSIDevicePtr tmp;
@ -1056,7 +1058,7 @@ void qemuDomainReAttachHostdevDevices(virQEMUDriverPtr driver,
int nhostdevs) int nhostdevs)
{ {
virPCIDeviceListPtr pcidevs; virPCIDeviceListPtr pcidevs;
int i; size_t i;
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
virObjectLock(driver->activePciHostdevs); virObjectLock(driver->activePciHostdevs);
@ -1145,7 +1147,7 @@ qemuDomainReAttachHostUsbDevices(virQEMUDriverPtr driver,
virDomainHostdevDefPtr *hostdevs, virDomainHostdevDefPtr *hostdevs,
int nhostdevs) int nhostdevs)
{ {
int i; size_t i;
virObjectLock(driver->activeUsbHostdevs); virObjectLock(driver->activeUsbHostdevs);
for (i = 0; i < nhostdevs; i++) { for (i = 0; i < nhostdevs; i++) {
@ -1208,7 +1210,7 @@ qemuDomainReAttachHostScsiDevices(virQEMUDriverPtr driver,
virDomainHostdevDefPtr *hostdevs, virDomainHostdevDefPtr *hostdevs,
int nhostdevs) int nhostdevs)
{ {
int i; size_t i;
virObjectLock(driver->activeScsiHostdevs); virObjectLock(driver->activeScsiHostdevs);
for (i = 0; i < nhostdevs; i++) { for (i = 0; i < nhostdevs; i++) {

54
src/qemu/qemu_hotplug.c
View File

@ -182,7 +182,7 @@ qemuDomainCheckEjectableMedia(virQEMUDriverPtr driver,
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
virHashTablePtr table = NULL; virHashTablePtr table = NULL;
int ret = -1; int ret = -1;
int i; size_t i;
if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) { if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) {
table = qemuMonitorGetBlockInfo(priv->mon); table = qemuMonitorGetBlockInfo(priv->mon);
@ -221,7 +221,8 @@ int qemuDomainAttachVirtioDiskDevice(virConnectPtr conn,
virDomainObjPtr vm, virDomainObjPtr vm,
virDomainDiskDefPtr disk) virDomainDiskDefPtr disk)
{ {
int i, ret = -1; size_t i;
int ret = -1;
const char* type = virDomainDiskBusTypeToString(disk->bus); const char* type = virDomainDiskBusTypeToString(disk->bus);
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
char *devstr = NULL; char *devstr = NULL;
@ -421,7 +422,7 @@ qemuDomainFindOrCreateSCSIDiskController(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
int controller) int controller)
{ {
int i; size_t i;
virDomainControllerDefPtr cont; virDomainControllerDefPtr cont;
for (i = 0; i < vm->def->ncontrollers; i++) { for (i = 0; i < vm->def->ncontrollers; i++) {
@ -466,7 +467,7 @@ int qemuDomainAttachSCSIDisk(virConnectPtr conn,
virDomainObjPtr vm, virDomainObjPtr vm,
virDomainDiskDefPtr disk) virDomainDiskDefPtr disk)
{ {
int i; size_t i;
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
virDomainControllerDefPtr cont = NULL; virDomainControllerDefPtr cont = NULL;
char *drivestr = NULL; char *drivestr = NULL;
@ -590,7 +591,8 @@ int qemuDomainAttachUsbMassstorageDevice(virConnectPtr conn,
virDomainDiskDefPtr disk) virDomainDiskDefPtr disk)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
int i, ret = -1; size_t i;
int ret = -1;
char *drivestr = NULL; char *drivestr = NULL;
char *devstr = NULL; char *devstr = NULL;
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
@ -698,7 +700,7 @@ int qemuDomainAttachNetDevice(virConnectPtr conn,
bool iface_connected = false; bool iface_connected = false;
int actualType; int actualType;
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
int i; size_t i;
/* preallocate new slot for device */ /* preallocate new slot for device */
if (VIR_REALLOC_N(vm->def->nets, vm->def->nnets+1) < 0) if (VIR_REALLOC_N(vm->def->nets, vm->def->nnets+1) < 0)
@ -812,12 +814,12 @@ int qemuDomainAttachNetDevice(virConnectPtr conn,
goto cleanup; goto cleanup;
for (i = 0; i < tapfdSize; i++) { for (i = 0; i < tapfdSize; i++) {
if (virAsprintf(&tapfdName[i], "fd-%s%d", net->info.alias, i) < 0) if (virAsprintf(&tapfdName[i], "fd-%s%zu", net->info.alias, i) < 0)
goto cleanup; goto cleanup;
} }
for (i = 0; i < vhostfdSize; i++) { for (i = 0; i < vhostfdSize; i++) {
if (virAsprintf(&vhostfdName[i], "vhostfd-%s%d", net->info.alias, i) < 0) if (virAsprintf(&vhostfdName[i], "vhostfd-%s%zu", net->info.alias, i) < 0)
goto cleanup; goto cleanup;
} }
@ -1353,7 +1355,7 @@ cleanup:
static virDomainNetDefPtr *qemuDomainFindNet(virDomainObjPtr vm, static virDomainNetDefPtr *qemuDomainFindNet(virDomainObjPtr vm,
virDomainNetDefPtr dev) virDomainNetDefPtr dev)
{ {
int i; size_t i;
for (i = 0; i < vm->def->nnets; i++) { for (i = 0; i < vm->def->nnets; i++) {
if (virMacAddrCmp(&vm->def->nets[i]->mac, &dev->mac) == 0) if (virMacAddrCmp(&vm->def->nets[i]->mac, &dev->mac) == 0)
@ -1907,7 +1909,7 @@ cleanup:
static virDomainGraphicsDefPtr qemuDomainFindGraphics(virDomainObjPtr vm, static virDomainGraphicsDefPtr qemuDomainFindGraphics(virDomainObjPtr vm,
virDomainGraphicsDefPtr dev) virDomainGraphicsDefPtr dev)
{ {
int i; size_t 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)
@ -2089,7 +2091,7 @@ cleanup:
static inline int qemuFindDisk(virDomainDefPtr def, const char *dst) static inline int qemuFindDisk(virDomainDefPtr def, const char *dst)
{ {
int i; size_t 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)) {
@ -2132,20 +2134,21 @@ int qemuDomainDetachVirtioDiskDevice(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
virDomainDeviceDefPtr dev) virDomainDeviceDefPtr dev)
{ {
int i, ret = -1; int idx;
int ret = -1;
virDomainDiskDefPtr detach = NULL; virDomainDiskDefPtr detach = NULL;
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
char *drivestr = NULL; char *drivestr = NULL;
i = qemuFindDisk(vm->def, dev->data.disk->dst); idx = qemuFindDisk(vm->def, dev->data.disk->dst);
if (i < 0) { if (idx < 0) {
virReportError(VIR_ERR_OPERATION_FAILED, virReportError(VIR_ERR_OPERATION_FAILED,
_("disk %s not found"), dev->data.disk->dst); _("disk %s not found"), dev->data.disk->dst);
goto cleanup; goto cleanup;
} }
detach = vm->def->disks[i]; detach = vm->def->disks[idx];
if (qemuIsMultiFunctionDevice(vm->def, &detach->info)) { if (qemuIsMultiFunctionDevice(vm->def, &detach->info)) {
virReportError(VIR_ERR_OPERATION_FAILED, virReportError(VIR_ERR_OPERATION_FAILED,
@ -2211,7 +2214,7 @@ int qemuDomainDetachVirtioDiskDevice(virQEMUDriverPtr driver,
&detach->info.addr.pci) < 0) &detach->info.addr.pci) < 0)
VIR_WARN("Unable to release PCI address on %s", dev->data.disk->src); VIR_WARN("Unable to release PCI address on %s", dev->data.disk->src);
virDomainDiskRemove(vm->def, i); virDomainDiskRemove(vm->def, idx);
dev->data.disk->backingChain = detach->backingChain; dev->data.disk->backingChain = detach->backingChain;
detach->backingChain = NULL; detach->backingChain = NULL;
@ -2239,14 +2242,15 @@ int qemuDomainDetachDiskDevice(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
virDomainDeviceDefPtr dev) virDomainDeviceDefPtr dev)
{ {
int i, ret = -1; int idx;
int ret = -1;
virDomainDiskDefPtr detach = NULL; virDomainDiskDefPtr detach = NULL;
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
char *drivestr = NULL; char *drivestr = NULL;
i = qemuFindDisk(vm->def, dev->data.disk->dst); idx = qemuFindDisk(vm->def, dev->data.disk->dst);
if (i < 0) { if (idx < 0) {
virReportError(VIR_ERR_OPERATION_FAILED, virReportError(VIR_ERR_OPERATION_FAILED,
_("disk %s not found"), dev->data.disk->dst); _("disk %s not found"), dev->data.disk->dst);
goto cleanup; goto cleanup;
@ -2259,7 +2263,7 @@ int qemuDomainDetachDiskDevice(virQEMUDriverPtr driver,
goto cleanup; goto cleanup;
} }
detach = vm->def->disks[i]; detach = vm->def->disks[idx];
if (detach->mirror) { if (detach->mirror) {
virReportError(VIR_ERR_BLOCK_COPY_ACTIVE, virReportError(VIR_ERR_BLOCK_COPY_ACTIVE,
@ -2288,7 +2292,7 @@ int qemuDomainDetachDiskDevice(virQEMUDriverPtr driver,
virDomainAuditDisk(vm, detach->src, NULL, "detach", true); virDomainAuditDisk(vm, detach->src, NULL, "detach", true);
virDomainDiskRemove(vm->def, i); virDomainDiskRemove(vm->def, idx);
dev->data.disk->backingChain = detach->backingChain; dev->data.disk->backingChain = detach->backingChain;
detach->backingChain = NULL; detach->backingChain = NULL;
@ -2315,7 +2319,7 @@ cleanup:
static bool qemuDomainDiskControllerIsBusy(virDomainObjPtr vm, static bool qemuDomainDiskControllerIsBusy(virDomainObjPtr vm,
virDomainControllerDefPtr detach) virDomainControllerDefPtr detach)
{ {
int i; size_t i;
virDomainDiskDefPtr disk; virDomainDiskDefPtr disk;
for (i = 0; i < vm->def->ndisks; i++) { for (i = 0; i < vm->def->ndisks; i++) {
@ -2976,9 +2980,9 @@ int qemuDomainDetachLease(virQEMUDriverPtr driver,
virDomainLeaseDefPtr lease) virDomainLeaseDefPtr lease)
{ {
virDomainLeaseDefPtr det_lease; virDomainLeaseDefPtr det_lease;
int i; int idx;
if ((i = virDomainLeaseIndex(vm->def, lease)) < 0) { if ((idx = virDomainLeaseIndex(vm->def, lease)) < 0) {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("Lease %s in lockspace %s does not exist"), _("Lease %s in lockspace %s does not exist"),
lease->key, NULLSTR(lease->lockspace)); lease->key, NULLSTR(lease->lockspace));
@ -2988,7 +2992,7 @@ int qemuDomainDetachLease(virQEMUDriverPtr driver,
if (virDomainLockLeaseDetach(driver->lockManager, vm, lease) < 0) if (virDomainLockLeaseDetach(driver->lockManager, vm, lease) < 0)
return -1; return -1;
det_lease = virDomainLeaseRemoveAt(vm->def, i); det_lease = virDomainLeaseRemoveAt(vm->def, idx);
virDomainLeaseDefFree(det_lease); virDomainLeaseDefFree(det_lease);
return 0; return 0;
} }

27
src/qemu/qemu_migration.c
View File

@ -183,7 +183,7 @@ static void qemuMigrationCookieGraphicsFree(qemuMigrationCookieGraphicsPtr grap)
static void static void
qemuMigrationCookieNetworkFree(qemuMigrationCookieNetworkPtr network) qemuMigrationCookieNetworkFree(qemuMigrationCookieNetworkPtr network)
{ {
int i; size_t i;
if (!network) if (!network)
return; return;
@ -334,7 +334,7 @@ qemuMigrationCookieNetworkAlloc(virQEMUDriverPtr driver ATTRIBUTE_UNUSED,
virDomainDefPtr def) virDomainDefPtr def)
{ {
qemuMigrationCookieNetworkPtr mig; qemuMigrationCookieNetworkPtr mig;
int i; size_t i;
if (VIR_ALLOC(mig) < 0) if (VIR_ALLOC(mig) < 0)
goto error; goto error;
@ -557,7 +557,7 @@ static void
qemuMigrationCookieNetworkXMLFormat(virBufferPtr buf, qemuMigrationCookieNetworkXMLFormat(virBufferPtr buf,
qemuMigrationCookieNetworkPtr optr) qemuMigrationCookieNetworkPtr optr)
{ {
int i; size_t i;
bool empty = true; bool empty = true;
for (i = 0; i < optr->nnets; i++) { for (i = 0; i < optr->nnets; i++) {
@ -567,7 +567,7 @@ qemuMigrationCookieNetworkXMLFormat(virBufferPtr buf,
virBufferAddLit(buf, " <network>\n"); virBufferAddLit(buf, " <network>\n");
empty = false; empty = false;
} }
virBufferAsprintf(buf, " <interface index='%d' vporttype='%s'", virBufferAsprintf(buf, " <interface index='%zu' vporttype='%s'",
i, virNetDevVPortTypeToString(optr->net[i].vporttype)); i, virNetDevVPortTypeToString(optr->net[i].vporttype));
if (optr->net[i].portdata) { if (optr->net[i].portdata) {
virBufferAddLit(buf, ">\n"); virBufferAddLit(buf, ">\n");
@ -591,7 +591,7 @@ qemuMigrationCookieXMLFormat(virQEMUDriverPtr driver,
{ {
char uuidstr[VIR_UUID_STRING_BUFLEN]; char uuidstr[VIR_UUID_STRING_BUFLEN];
char hostuuidstr[VIR_UUID_STRING_BUFLEN]; char hostuuidstr[VIR_UUID_STRING_BUFLEN];
int i; size_t i;
virUUIDFormat(mig->uuid, uuidstr); virUUIDFormat(mig->uuid, uuidstr);
virUUIDFormat(mig->localHostuuid, hostuuidstr); virUUIDFormat(mig->localHostuuid, hostuuidstr);
@ -722,7 +722,7 @@ static qemuMigrationCookieNetworkPtr
qemuMigrationCookieNetworkXMLParse(xmlXPathContextPtr ctxt) qemuMigrationCookieNetworkXMLParse(xmlXPathContextPtr ctxt)
{ {
qemuMigrationCookieNetworkPtr optr; qemuMigrationCookieNetworkPtr optr;
int i; size_t i;
int n; int n;
xmlNodePtr *interfaces = NULL; xmlNodePtr *interfaces = NULL;
char *vporttype; char *vporttype;
@ -778,7 +778,8 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig,
char uuidstr[VIR_UUID_STRING_BUFLEN]; char uuidstr[VIR_UUID_STRING_BUFLEN];
char *tmp = NULL; char *tmp = NULL;
xmlNodePtr *nodes = NULL; xmlNodePtr *nodes = NULL;
int i, n; size_t i;
int n;
virCapsPtr caps = NULL; virCapsPtr caps = NULL;
if (!(caps = virQEMUDriverGetCapabilities(driver, false))) if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
@ -1404,7 +1405,7 @@ qemuMigrationIsAllowed(virQEMUDriverPtr driver, virDomainObjPtr vm,
int nsnapshots; int nsnapshots;
int pauseReason; int pauseReason;
bool forbid; bool forbid;
int i; size_t i;
if (vm) { if (vm) {
if (qemuProcessAutoDestroyActive(driver, vm)) { if (qemuProcessAutoDestroyActive(driver, vm)) {
@ -1470,7 +1471,7 @@ qemuMigrationIsAllowed(virQEMUDriverPtr driver, virDomainObjPtr vm,
static bool static bool
qemuMigrationIsSafe(virDomainDefPtr def) qemuMigrationIsSafe(virDomainDefPtr def)
{ {
int i; size_t 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];
@ -1802,7 +1803,7 @@ qemuDomainMigrateGraphicsRelocate(virQEMUDriverPtr driver,
} }
if (uri) { if (uri) {
int i; size_t i;
if ((type = virDomainGraphicsTypeFromString(uri->scheme)) < 0) { if ((type = virDomainGraphicsTypeFromString(uri->scheme)) < 0) {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
@ -1859,7 +1860,7 @@ qemuDomainMigrateOPDRelocate(virQEMUDriverPtr driver ATTRIBUTE_UNUSED,
{ {
virDomainNetDefPtr netptr; virDomainNetDefPtr netptr;
int ret = -1; int ret = -1;
int i; size_t i;
for (i = 0; i < cookie->network->nnets; i++) { for (i = 0; i < cookie->network->nnets; i++) {
netptr = vm->def->nets[i]; netptr = vm->def->nets[i];
@ -4240,7 +4241,7 @@ qemuMigrationPerform(virQEMUDriverPtr driver,
static int static int
qemuMigrationVPAssociatePortProfiles(virDomainDefPtr def) { qemuMigrationVPAssociatePortProfiles(virDomainDefPtr def) {
int i; size_t i;
int last_good_net = -1; int last_good_net = -1;
virDomainNetDefPtr net; virDomainNetDefPtr net;
@ -4274,7 +4275,7 @@ qemuMigrationVPAssociatePortProfiles(virDomainDefPtr def) {
return 0; return 0;
err_exit: err_exit:
for (i = 0; i < last_good_net; i++) { for (i = 0; last_good_net != -1 && i < last_good_net; i++) {
net = def->nets[i]; net = def->nets[i];
if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT) { if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT) {
ignore_value(virNetDevVPortProfileDisassociate(net->ifname, ignore_value(virNetDevVPortProfileDisassociate(net->ifname,

13
src/qemu/qemu_monitor.c
View File

@ -133,7 +133,7 @@ VIR_ENUM_IMPL(qemuMonitorBlockIOStatus,
char *qemuMonitorEscapeArg(const char *in) char *qemuMonitorEscapeArg(const char *in)
{ {
int len = 0; int len = 0;
int i, j; size_t i, j;
char *out; char *out;
/* To pass through the QEMU monitor, we need to use escape /* To pass through the QEMU monitor, we need to use escape
@ -184,7 +184,7 @@ char *qemuMonitorEscapeArg(const char *in)
char *qemuMonitorUnescapeArg(const char *in) char *qemuMonitorUnescapeArg(const char *in)
{ {
int i, j; size_t i, j;
char *out; char *out;
int len = strlen(in); int len = strlen(in);
char next; char next;
@ -224,7 +224,7 @@ char *qemuMonitorUnescapeArg(const char *in)
# include <c-ctype.h> # include <c-ctype.h>
static char * qemuMonitorEscapeNonPrintable(const char *text) static char * qemuMonitorEscapeNonPrintable(const char *text)
{ {
int i; size_t 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]) ||
@ -257,7 +257,8 @@ qemuMonitorOpenUnix(const char *monitor, pid_t cpid)
struct sockaddr_un addr; struct sockaddr_un addr;
int monfd; int monfd;
int timeout = 3; /* In seconds */ int timeout = 3; /* In seconds */
int ret, i = 0; int ret;
size_t i = 0;
if ((monfd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { if ((monfd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
virReportSystemError(errno, virReportSystemError(errno,
@ -2474,7 +2475,7 @@ int qemuMonitorAddHostNetwork(qemuMonitorPtr mon,
int *vhostfd, char **vhostfdName, int vhostfdSize) int *vhostfd, char **vhostfdName, int vhostfdSize)
{ {
int ret = -1; int ret = -1;
int i = 0, j = 0; size_t i = 0, j = 0;
VIR_DEBUG("mon=%p netstr=%s tapfd=%p tapfdName=%p tapfdSize=%d " VIR_DEBUG("mon=%p netstr=%s tapfd=%p tapfdName=%p tapfdSize=%d "
"vhostfd=%p vhostfdName=%p vhostfdSize=%d", "vhostfd=%p vhostfdName=%p vhostfdSize=%d",
@ -2547,7 +2548,7 @@ int qemuMonitorAddNetdev(qemuMonitorPtr mon,
int *vhostfd, char **vhostfdName, int vhostfdSize) int *vhostfd, char **vhostfdName, int vhostfdSize)
{ {
int ret = -1; int ret = -1;
int i = 0, j = 0; size_t i = 0, j = 0;
VIR_DEBUG("mon=%p netdevstr=%s tapfd=%p tapfdName=%p tapfdSize=%d" VIR_DEBUG("mon=%p netdevstr=%s tapfd=%p tapfdName=%p tapfdSize=%d"
"vhostfd=%p vhostfdName=%p vhostfdSize=%d", "vhostfd=%p vhostfdName=%p vhostfdSize=%d",

31
src/qemu/qemu_monitor_json.c
View File

@ -510,7 +510,7 @@ error:
static void static void
qemuFreeKeywords(int nkeywords, char **keywords, char **values) qemuFreeKeywords(int nkeywords, char **keywords, char **values)
{ {
int i; size_t 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]);
@ -526,7 +526,7 @@ qemuMonitorJSONKeywordStringToJSON(const char *str, const char *firstkeyword)
char **keywords = NULL; char **keywords = NULL;
char **values = NULL; char **values = NULL;
int nkeywords = 0; int nkeywords = 0;
int i; size_t i;
if (!(ret = virJSONValueNewObject())) if (!(ret = virJSONValueNewObject()))
goto error; goto error;
@ -998,7 +998,8 @@ qemuMonitorJSONStartCPUs(qemuMonitorPtr mon,
int ret; int ret;
virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("cont", NULL); virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("cont", NULL);
virJSONValuePtr reply = NULL; virJSONValuePtr reply = NULL;
int i = 0, timeout = 3; size_t i = 0;
int timeout = 3;
if (!cmd) if (!cmd)
return -1; return -1;
@ -1174,7 +1175,7 @@ qemuMonitorJSONExtractCPUInfo(virJSONValuePtr reply,
{ {
virJSONValuePtr data; virJSONValuePtr data;
int ret = -1; int ret = -1;
int i; size_t i;
int *threads = NULL; int *threads = NULL;
int ncpus; int ncpus;
@ -1491,7 +1492,7 @@ int qemuMonitorJSONGetBlockInfo(qemuMonitorPtr mon,
virHashTablePtr table) virHashTablePtr table)
{ {
int ret; int ret;
int i; size_t i;
virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("query-block", virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("query-block",
NULL); NULL);
@ -1595,7 +1596,7 @@ int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon,
long long *errs) long long *errs)
{ {
int ret; int ret;
int i; size_t i;
bool found = false; bool found = false;
virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("query-blockstats", virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("query-blockstats",
NULL); NULL);
@ -1745,7 +1746,8 @@ cleanup:
int qemuMonitorJSONGetBlockStatsParamsNumber(qemuMonitorPtr mon, int qemuMonitorJSONGetBlockStatsParamsNumber(qemuMonitorPtr mon,
int *nparams) int *nparams)
{ {
int ret, i, num = 0; int ret, num = 0;
size_t i;
virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("query-blockstats", virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("query-blockstats",
NULL); NULL);
virJSONValuePtr reply = NULL; virJSONValuePtr reply = NULL;
@ -1819,7 +1821,7 @@ int qemuMonitorJSONGetBlockExtent(qemuMonitorPtr mon,
unsigned long long *extent) unsigned long long *extent)
{ {
int ret = -1; int ret = -1;
int i; size_t i;
bool found = false; bool found = false;
virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("query-blockstats", virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("query-blockstats",
NULL); NULL);
@ -2929,7 +2931,7 @@ static int qemuMonitorJSONExtractPtyPaths(virJSONValuePtr reply,
{ {
virJSONValuePtr data; virJSONValuePtr data;
int ret = -1; int ret = -1;
int i; size_t i;
if (!(data = virJSONValueObjectGet(reply, "return"))) { if (!(data = virJSONValueObjectGet(reply, "return"))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@ -3390,7 +3392,7 @@ int qemuMonitorJSONSendKey(qemuMonitorPtr mon,
virJSONValuePtr reply = NULL; virJSONValuePtr reply = NULL;
virJSONValuePtr keys = NULL; virJSONValuePtr keys = NULL;
virJSONValuePtr key = NULL; virJSONValuePtr key = NULL;
unsigned int i; size_t i;
/* create the key data array */ /* create the key data array */
if (!(keys = virJSONValueNewArray())) if (!(keys = virJSONValueNewArray()))
@ -3399,7 +3401,7 @@ int qemuMonitorJSONSendKey(qemuMonitorPtr mon,
for (i = 0; i < nkeycodes; i++) { for (i = 0; i < nkeycodes; i++) {
if (keycodes[i] > 0xffff) { if (keycodes[i] > 0xffff) {
virReportError(VIR_ERR_OPERATION_FAILED, virReportError(VIR_ERR_OPERATION_FAILED,
_("keycode %d is invalid: 0x%X"), i, keycodes[i]); _("keycode %zu is invalid: 0x%X"), i, keycodes[i]);
goto cleanup; goto cleanup;
} }
@ -3531,7 +3533,8 @@ static int qemuMonitorJSONGetBlockJobInfo(virJSONValuePtr reply,
virDomainBlockJobInfoPtr info) virDomainBlockJobInfoPtr info)
{ {
virJSONValuePtr data; virJSONValuePtr data;
int nr_results, i; int nr_results;
size_t i;
if (!info) if (!info)
return -1; return -1;
@ -3707,7 +3710,7 @@ qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr result,
{ {
virJSONValuePtr io_throttle; virJSONValuePtr io_throttle;
int ret = -1; int ret = -1;
int i; size_t i;
bool found = false; bool found = false;
io_throttle = virJSONValueObjectGet(result, "return"); io_throttle = virJSONValueObjectGet(result, "return");
@ -4630,7 +4633,7 @@ qemuMonitorJSONGetMigrationCapability(qemuMonitorPtr mon,
virJSONValuePtr cmd; virJSONValuePtr cmd;
virJSONValuePtr reply = NULL; virJSONValuePtr reply = NULL;
virJSONValuePtr caps; virJSONValuePtr caps;
int i; size_t i;
if (!(cmd = qemuMonitorJSONMakeCommand("query-migrate-capabilities", if (!(cmd = qemuMonitorJSONMakeCommand("query-migrate-capabilities",
NULL))) NULL)))

6
src/qemu/qemu_monitor_text.c
View File

@ -157,7 +157,7 @@ int qemuMonitorTextIOProcess(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
VIR_DEBUG("Seen a password prompt [%s]", data + used); VIR_DEBUG("Seen a password prompt [%s]", data + used);
#endif #endif
if (msg->passwordHandler) { if (msg->passwordHandler) {
int i; size_t i;
/* Try and handle the prompt. The handler is required /* Try and handle the prompt. The handler is required
* to report a normal libvirt error */ * to report a normal libvirt error */
if (msg->passwordHandler(mon, msg, if (msg->passwordHandler(mon, msg,
@ -2865,7 +2865,7 @@ int qemuMonitorTextSendKey(qemuMonitorPtr mon,
unsigned int *keycodes, unsigned int *keycodes,
unsigned int nkeycodes) unsigned int nkeycodes)
{ {
int i; size_t i;
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
char *cmd, *reply = NULL; char *cmd, *reply = NULL;
int ret = -1; int ret = -1;
@ -2877,7 +2877,7 @@ int qemuMonitorTextSendKey(qemuMonitorPtr mon,
for (i = 0; i < nkeycodes; i++) { for (i = 0; i < nkeycodes; i++) {
if (keycodes[i] > 0xffff) { if (keycodes[i] > 0xffff) {
virReportError(VIR_ERR_OPERATION_FAILED, virReportError(VIR_ERR_OPERATION_FAILED,
_("keycode %d is invalid: 0x%X"), _("keycode %zu is invalid: 0x%X"),
i, keycodes[i]); i, keycodes[i]);
virBufferFreeAndReset(&buf); virBufferFreeAndReset(&buf);
return -1; return -1;

48
src/qemu/qemu_process.c
View File

@ -195,7 +195,7 @@ static virDomainChrSourceDefPtr
qemuFindAgentConfig(virDomainDefPtr def) qemuFindAgentConfig(virDomainDefPtr def)
{ {
virDomainChrSourceDefPtr config = NULL; virDomainChrSourceDefPtr config = NULL;
int i; size_t 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];
@ -363,10 +363,10 @@ static virDomainDiskDefPtr
qemuProcessFindDomainDiskByPath(virDomainObjPtr vm, qemuProcessFindDomainDiskByPath(virDomainObjPtr vm,
const char *path) const char *path)
{ {
int i = virDomainDiskIndexByName(vm->def, path, true); int idx = virDomainDiskIndexByName(vm->def, path, true);
if (i >= 0) if (idx >= 0)
return vm->def->disks[i]; return vm->def->disks[idx];
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("no disk found with path %s"), _("no disk found with path %s"),
@ -378,7 +378,7 @@ static virDomainDiskDefPtr
qemuProcessFindDomainDiskByAlias(virDomainObjPtr vm, qemuProcessFindDomainDiskByAlias(virDomainObjPtr vm,
const char *alias) const char *alias)
{ {
int i; size_t i;
if (STRPREFIX(alias, QEMU_DRIVE_HOST_PREFIX)) if (STRPREFIX(alias, QEMU_DRIVE_HOST_PREFIX))
alias += strlen(QEMU_DRIVE_HOST_PREFIX); alias += strlen(QEMU_DRIVE_HOST_PREFIX);
@ -1015,7 +1015,7 @@ qemuProcessHandleGraphics(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
virDomainEventGraphicsAddressPtr localAddr = NULL; virDomainEventGraphicsAddressPtr localAddr = NULL;
virDomainEventGraphicsAddressPtr remoteAddr = NULL; virDomainEventGraphicsAddressPtr remoteAddr = NULL;
virDomainEventGraphicsSubjectPtr subject = NULL; virDomainEventGraphicsSubjectPtr subject = NULL;
int i; size_t i;
if (VIR_ALLOC(localAddr) < 0) if (VIR_ALLOC(localAddr) < 0)
goto error; goto error;
@ -1556,7 +1556,7 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices,
virHashTablePtr paths, virHashTablePtr paths,
bool chardevfmt) bool chardevfmt)
{ {
int i; size_t i;
const char *prefix = chardevfmt ? "char" : ""; const char *prefix = chardevfmt ? "char" : "";
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
@ -1601,7 +1601,7 @@ qemuProcessFindCharDevicePTYsMonitor(virDomainObjPtr vm,
virHashTablePtr paths) virHashTablePtr paths)
{ {
bool chardevfmt = virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV); bool chardevfmt = virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV);
int i = 0; size_t i = 0;
if (qemuProcessLookupPTYs(vm->def->serials, vm->def->nserials, if (qemuProcessLookupPTYs(vm->def->serials, vm->def->nserials,
paths, chardevfmt) < 0) paths, chardevfmt) < 0)
@ -1643,7 +1643,8 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm,
int fd ATTRIBUTE_UNUSED) int fd ATTRIBUTE_UNUSED)
{ {
size_t offset = 0; size_t offset = 0;
int ret, i; int ret;
size_t i;
/* The order in which QEMU prints out the PTY paths is /* The order in which QEMU prints out the PTY paths is
the order in which it procsses its serial and parallel the order in which it procsses its serial and parallel
@ -1837,7 +1838,8 @@ virBitmapPtr
qemuPrepareCpumap(virQEMUDriverPtr driver, qemuPrepareCpumap(virQEMUDriverPtr driver,
virBitmapPtr nodemask) virBitmapPtr nodemask)
{ {
int i, hostcpus, maxcpu = QEMUD_CPUMASK_LEN; size_t i;
int hostcpus, maxcpu = QEMUD_CPUMASK_LEN;
virBitmapPtr cpumap = NULL; virBitmapPtr cpumap = NULL;
virCapsPtr caps = NULL; virCapsPtr caps = NULL;
@ -1860,7 +1862,7 @@ qemuPrepareCpumap(virQEMUDriverPtr driver,
} }
for (i = 0; i < caps->host.nnumaCell; i++) { for (i = 0; i < caps->host.nnumaCell; i++) {
int j; size_t j;
int cur_ncpus = caps->host.numaCell[i]->ncpus; int cur_ncpus = caps->host.numaCell[i]->ncpus;
bool result; bool result;
if (virBitmapGetBit(nodemask, i, &result) < 0) { if (virBitmapGetBit(nodemask, i, &result) < 0) {
@ -1935,7 +1937,7 @@ qemuProcessSetLinkStates(virDomainObjPtr vm)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
virDomainDefPtr def = vm->def; virDomainDefPtr def = vm->def;
int i; size_t i;
int ret = 0; int ret = 0;
for (i = 0; i < def->nnets; i++) { for (i = 0; i < def->nnets; i++) {
@ -2023,7 +2025,7 @@ qemuProcessInitPasswords(virConnectPtr conn,
int ret = 0; int ret = 0;
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
int i; size_t 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];
@ -2114,7 +2116,7 @@ qemuProcessAssignNextPCIAddress(virDomainDeviceInfo *info,
int naddrs) int naddrs)
{ {
bool found = false; bool found = false;
int i; size_t i;
VIR_DEBUG("Look for %x:%x out of %d", vendor, product, naddrs); VIR_DEBUG("Look for %x:%x out of %d", vendor, product, naddrs);
@ -2122,7 +2124,7 @@ qemuProcessAssignNextPCIAddress(virDomainDeviceInfo *info,
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) {
VIR_DEBUG("Match %d", i); VIR_DEBUG("Match %zu", i);
found = true; found = true;
break; break;
} }
@ -2328,7 +2330,7 @@ qemuProcessDetectPCIAddresses(virDomainObjPtr vm,
int naddrs) int naddrs)
{ {
unsigned int vendor = 0, product = 0; unsigned int vendor = 0, product = 0;
int i; size_t i;
/* XXX should all these vendor/product IDs be kept in the /* XXX should all these vendor/product IDs be kept in the
* actual device data structure instead ? * actual device data structure instead ?
@ -2639,10 +2641,10 @@ int qemuProcessStopCPUs(virQEMUDriverPtr driver, virDomainObjPtr vm,
static int static int
qemuProcessNotifyNets(virDomainDefPtr def) qemuProcessNotifyNets(virDomainDefPtr def)
{ {
int ii; size_t i;
for (ii = 0; ii < def->nnets; ii++) { for (i = 0; i < def->nnets; i++) {
virDomainNetDefPtr net = def->nets[ii]; virDomainNetDefPtr net = def->nets[i];
if (networkNotifyActualDevice(net) < 0) if (networkNotifyActualDevice(net) < 0)
return -1; return -1;
} }
@ -2653,7 +2655,7 @@ static int
qemuProcessFiltersInstantiate(virConnectPtr conn, qemuProcessFiltersInstantiate(virConnectPtr conn,
virDomainDefPtr def) virDomainDefPtr def)
{ {
int i; size_t i;
if (!conn) if (!conn)
return 1; return 1;
@ -3258,7 +3260,7 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driver,
{ {
unsigned short port = 0; unsigned short port = 0;
unsigned short tlsPort; unsigned short tlsPort;
int i; size_t i;
int defaultMode = graphics->data.spice.defaultMode; int defaultMode = graphics->data.spice.defaultMode;
bool needTLSPort = false; bool needTLSPort = false;
@ -3386,7 +3388,7 @@ int qemuProcessStart(virConnectPtr conn,
virCommandPtr cmd = NULL; virCommandPtr cmd = NULL;
struct qemuProcessHookData hookData; struct qemuProcessHookData hookData;
unsigned long cur_balloon; unsigned long cur_balloon;
int i; size_t i;
char *nodeset = NULL; char *nodeset = NULL;
virBitmapPtr nodemask = NULL; virBitmapPtr nodemask = NULL;
unsigned int stop_flags; unsigned int stop_flags;
@ -3993,7 +3995,7 @@ void qemuProcessStop(virQEMUDriverPtr driver,
virErrorPtr orig_err; virErrorPtr orig_err;
virDomainDefPtr def; virDomainDefPtr def;
virNetDevVPortProfilePtr vport = NULL; virNetDevVPortProfilePtr vport = NULL;
int i; size_t i;
int logfile = -1; int logfile = -1;
char *timestamp; char *timestamp;
char ebuf[1024]; char ebuf[1024];