From: "Daniel P. Berrange" <berrange@redhat.com> 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> --- daemon/libvirtd-config.c | 5 +++-- daemon/remote.c | 55 +++++++++++++++++++++++++----------------------- 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c index 017d470..e7bbc2e 100644 --- a/daemon/libvirtd-config.c +++ b/daemon/libvirtd-config.c @@ -67,7 +67,8 @@ remoteConfigGetStringList(virConfPtr conf, const char *key, char ***list_arg, break; case VIR_CONF_LIST: { - int i, len = 0; + int len = 0; + size_t i; virConfValuePtr pp; for (pp = p->list; pp; pp = pp->next) len++; @@ -87,7 +88,7 @@ remoteConfigGetStringList(virConfPtr conf, const char *key, char ***list_arg, return -1; } if (VIR_STRDUP(list[i], pp->str) < 0) { - int j; + size_t j; for (j = 0; j < i; j++) VIR_FREE(list[j]); VIR_FREE(list); diff --git a/daemon/remote.c b/daemon/remote.c index cb362da..6590d1a 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -304,7 +304,7 @@ static int remoteRelayDomainEventGraphics(virConnectPtr conn ATTRIBUTE_UNUSED, { virNetServerClientPtr client = opaque; remote_domain_event_graphics_msg data; - int i; + size_t i; if (!client) return -1; @@ -638,11 +638,11 @@ void remoteClientFreeFunc(void *data) /* Deregister event delivery callback */ if (priv->conn) { - int i; + size_t i; for (i = 0; i < VIR_DOMAIN_EVENT_ID_LAST; i++) { if (priv->domainEventCallbackID[i] != -1) { - VIR_DEBUG("Deregistering to relay remote events %d", i); + VIR_DEBUG("Deregistering to relay remote events %zu", i); virConnectDomainEventDeregisterAny(priv->conn, priv->domainEventCallbackID[i]); } @@ -668,7 +668,7 @@ void *remoteClientInitHook(virNetServerClientPtr client, void *opaque ATTRIBUTE_UNUSED) { struct daemonClientPrivate *priv; - int i; + size_t i; if (VIR_ALLOC(priv) < 0) { virReportOOMError(); @@ -801,8 +801,8 @@ remoteSerializeTypedParameters(virTypedParameterPtr params, u_int *ret_params_len, unsigned int flags) { - int i; - int j; + size_t i; + size_t j; int rv = -1; remote_typed_param *val; @@ -880,7 +880,7 @@ remoteDeserializeTypedParameters(remote_typed_param *args_params_val, int limit, int *nparams) { - int i = 0; + size_t i = 0; int rv = -1; virTypedParameterPtr params = NULL; @@ -1018,7 +1018,7 @@ remoteDispatchConnectListAllDomains(virNetServerPtr server ATTRIBUTE_UNUSED, { virDomainPtr *doms = NULL; int ndomains = 0; - int i; + size_t i; int rv = -1; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); @@ -1128,7 +1128,8 @@ remoteDispatchDomainMemoryStats(virNetServerPtr server ATTRIBUTE_UNUSED, { virDomainPtr dom = NULL; struct _virDomainMemoryStat *stats; - int nr_stats, i; + int nr_stats; + size_t i; int rv = -1; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); @@ -1417,7 +1418,8 @@ remoteDispatchDomainGetSecurityLabelList(virNetServerPtr server ATTRIBUTE_UNUSED { virDomainPtr dom = NULL; virSecurityLabelPtr seclabels = NULL; - int i, len, rv = -1; + int len, rv = -1; + size_t i; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); @@ -1685,7 +1687,8 @@ remoteDispatchDomainGetVcpus(virNetServerPtr server ATTRIBUTE_UNUSED, virDomainPtr dom = NULL; virVcpuInfoPtr info = NULL; unsigned char *cpumaps = NULL; - int info_len, i; + int info_len; + size_t i; int rv = -1; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); @@ -2072,7 +2075,7 @@ remoteDispatchNodeGetCPUStats(virNetServerPtr server ATTRIBUTE_UNUSED, remote_node_get_cpu_stats_ret *ret) { virNodeCPUStatsPtr params = NULL; - int i; + size_t i; int cpuNum = args->cpuNum; int nparams = 0; unsigned int flags; @@ -2150,7 +2153,7 @@ remoteDispatchNodeGetMemoryStats(virNetServerPtr server ATTRIBUTE_UNUSED, remote_node_get_memory_stats_ret *ret) { virNodeMemoryStatsPtr params = NULL; - int i; + size_t i; int cellNum = args->cellNum; int nparams = 0; unsigned int flags; @@ -3887,7 +3890,7 @@ success: rv = 0; ret->nparams = percpu_len; if (args->nparams && !(args->flags & VIR_TYPED_PARAM_STRING_OKAY)) { - int i; + size_t i; for (i = 0; i < percpu_len; i++) { if (params[i].type == VIR_TYPED_PARAM_STRING) @@ -3959,7 +3962,7 @@ cleanup: if (dom) virDomainFree(dom); if (errors) { - int i; + size_t i; for (i = 0; i < len; i++) VIR_FREE(errors[i].disk); } @@ -3977,7 +3980,7 @@ remoteDispatchDomainListAllSnapshots(virNetServerPtr server ATTRIBUTE_UNUSED, { virDomainSnapshotPtr *snaps = NULL; int nsnaps = 0; - int i; + size_t i; int rv = -1; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); virDomainPtr dom = NULL; @@ -4037,7 +4040,7 @@ remoteDispatchDomainSnapshotListAllChildren(virNetServerPtr server ATTRIBUTE_UNU { virDomainSnapshotPtr *snaps = NULL; int nsnaps = 0; - int i; + size_t i; int rv = -1; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); virDomainPtr dom = NULL; @@ -4103,7 +4106,7 @@ remoteDispatchConnectListAllStoragePools(virNetServerPtr server ATTRIBUTE_UNUSED { virStoragePoolPtr *pools = NULL; int npools = 0; - int i; + size_t i; int rv = -1; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); @@ -4158,7 +4161,7 @@ remoteDispatchStoragePoolListAllVolumes(virNetServerPtr server ATTRIBUTE_UNUSED, virStorageVolPtr *vols = NULL; virStoragePoolPtr pool = NULL; int nvols = 0; - int i; + size_t i; int rv = -1; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); @@ -4217,7 +4220,7 @@ remoteDispatchConnectListAllNetworks(virNetServerPtr server ATTRIBUTE_UNUSED, { virNetworkPtr *nets = NULL; int nnets = 0; - int i; + size_t i; int rv = -1; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); @@ -4271,7 +4274,7 @@ remoteDispatchConnectListAllInterfaces(virNetServerPtr server ATTRIBUTE_UNUSED, { virInterfacePtr *ifaces = NULL; int nifaces = 0; - int i; + size_t i; int rv = -1; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); @@ -4325,7 +4328,7 @@ remoteDispatchConnectListAllNodeDevices(virNetServerPtr server ATTRIBUTE_UNUSED, { virNodeDevicePtr *devices = NULL; int ndevices = 0; - int i; + size_t i; int rv = -1; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); @@ -4379,7 +4382,7 @@ remoteDispatchConnectListAllNWFilters(virNetServerPtr server ATTRIBUTE_UNUSED, { virNWFilterPtr *filters = NULL; int nfilters = 0; - int i; + size_t i; int rv = -1; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); @@ -4433,7 +4436,7 @@ remoteDispatchConnectListAllSecrets(virNetServerPtr server ATTRIBUTE_UNUSED, { virSecretPtr *secrets = NULL; int nsecrets = 0; - int i; + size_t i; int rv = -1; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); @@ -5146,7 +5149,7 @@ remoteSerializeDomainDiskErrors(virDomainDiskErrorPtr errors, u_int *ret_errors_len) { remote_domain_disk_error *val = NULL; - int i = 0; + size_t i = 0; if (VIR_ALLOC_N(val, nerrors) < 0) { virReportOOMError(); @@ -5166,7 +5169,7 @@ remoteSerializeDomainDiskErrors(virDomainDiskErrorPtr errors, error: if (val) { - int j; + size_t j; for (j = 0; j < i; j++) VIR_FREE(val[j].disk); VIR_FREE(val); -- 1.8.1.4

From: "Daniel P. Berrange" <berrange@redhat.com> 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> --- src/xen/block_stats.c | 4 ++-- src/xen/xen_driver.c | 4 ++-- src/xen/xen_hypervisor.c | 14 ++++++++------ src/xen/xen_inotify.c | 4 ++-- src/xen/xend_internal.c | 12 +++++++----- src/xen/xm_internal.c | 5 +++-- src/xen/xs_internal.c | 27 +++++++++++++++++---------- src/xenapi/xenapi_driver.c | 30 ++++++++++++++++++------------ src/xenapi/xenapi_utils.c | 14 +++++++------- src/xenxs/xen_sxpr.c | 10 +++++----- src/xenxs/xen_xm.c | 6 +++--- 11 files changed, 74 insertions(+), 56 deletions(-) diff --git a/src/xen/block_stats.c b/src/xen/block_stats.c index ebb91ea..74f93d1 100644 --- a/src/xen/block_stats.c +++ b/src/xen/block_stats.c @@ -78,7 +78,7 @@ read_stat(const char *path) { char str[64]; int64_t r; - int i; + size_t i; FILE *fp; fp = fopen(path, "r"); @@ -109,7 +109,7 @@ read_bd_stat(int device, int domid, const char *str) "/sys/devices/xen-backend/tap-%d-%d/statistics/%s" }; - int i; + size_t i; char *path; int64_t r; diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index f69feb5..f35c272 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -2786,7 +2786,7 @@ xenRegister(void) void xenUnifiedDomainInfoListFree(xenUnifiedDomainInfoListPtr list) { - int i; + size_t i; if (list == NULL) return; @@ -2861,7 +2861,7 @@ xenUnifiedRemoveDomainInfo(xenUnifiedDomainInfoListPtr list, int id, char *name, unsigned char *uuid) { - int i; + size_t i; for (i = 0; i < list->count; i++) { if (list->doms[i]->id == id && STREQ(list->doms[i]->name, name) && diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index 9d9c3ee..6e1b38f 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -1267,7 +1267,7 @@ xenHypervisorSetSchedulerParameters(virConnectPtr conn, virTypedParameterPtr params, int nparams) { - int i; + size_t i; unsigned int val; xenUnifiedPrivatePtr priv = conn->privateData; char buf[256]; @@ -2043,7 +2043,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch, int nr_guest_archs) { virCapsPtr caps; - int i; + size_t i; int hv_major = hv_versions.hv >> 16; int hv_minor = hv_versions.hv & 0xFFFF; @@ -2223,7 +2223,7 @@ static virCapsPtr xenHypervisorMakeCapabilitiesSunOS(virConnectPtr conn) { struct guest_arch guest_arches[32]; - int i = 0; + size_t i = 0; virCapsPtr caps = NULL; int pae, longmode; const char *hvm; @@ -2293,7 +2293,7 @@ xenHypervisorMakeCapabilitiesInternal(virConnectPtr conn, char line[1024], *str, *token; regmatch_t subs[4]; char *saveptr = NULL; - int i; + size_t i; char hvm_type[4] = ""; /* "vmx" or "svm" (or "" if not in CPU). */ int host_pae = 0; @@ -2846,7 +2846,8 @@ xenHypervisorNodeGetCellsFreeMemory(virConnectPtr conn, int maxCells) { xen_op_v2_sys op_sys; - int i, j, ret; + size_t i, j; + int ret; xenUnifiedPrivatePtr priv = conn->privateData; if (priv->nbNodeCells < 0) { @@ -2976,7 +2977,8 @@ xenHypervisorGetVcpus(virConnectPtr conn, int ret; xenUnifiedPrivatePtr priv = conn->privateData; virVcpuInfoPtr ipt; - int nbinfo, i; + int nbinfo; + size_t i; if (sizeof(cpumap_t) & 7) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c index 8266576..5d0b6d2 100644 --- a/src/xen/xen_inotify.c +++ b/src/xen/xen_inotify.c @@ -72,7 +72,7 @@ xenInotifyXendDomainsDirLookup(virConnectPtr conn, char **name, unsigned char *uuid) { - int i; + size_t i; virDomainDefPtr def; const char *uuid_str; unsigned char rawuuid[VIR_UUID_BUFLEN]; @@ -159,7 +159,7 @@ xenInotifyXendDomainsDirRemoveEntry(virConnectPtr conn, const char *fname) xenUnifiedPrivatePtr priv = conn->privateData; const char *uuidstr = fname + strlen(XEND_DOMAINS_DIR) + 1; unsigned char uuid[VIR_UUID_BUFLEN]; - int i; + size_t i; if (virUUIDParse(uuidstr, uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 3c05dff..89f6f4d 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -748,7 +748,7 @@ xenDaemonListDomainsOld(virConnectPtr xend) struct sexpr *root = NULL; char **ret = NULL; int count = 0; - int i; + size_t i; struct sexpr *_for_i, *node; root = sexpr_get(xend, "/xend/domain"); @@ -1855,7 +1855,8 @@ xenDaemonDomainPinVcpu(virConnectPtr conn, int maplen) { char buf[VIR_UUID_BUFLEN], mapstr[sizeof(cpumap_t) * 64]; - int i, j, ret; + size_t i, j; + int ret; xenUnifiedPrivatePtr priv = conn->privateData; virDomainDefPtr def = NULL; @@ -1874,7 +1875,7 @@ xenDaemonDomainPinVcpu(virConnectPtr conn, /* from bit map, build character string of mapped CPU numbers */ for (i = 0; i < maplen; i++) for (j = 0; j < 8; j++) if (cpumap[i] & (1 << j)) { - snprintf(buf, sizeof(buf), "%d,", (8 * i) + j); + snprintf(buf, sizeof(buf), "%zu,", (8 * i) + j); strcat(mapstr, buf); } if (priv->xendConfigVersion < XEND_CONFIG_VERSION_3_0_4) @@ -2911,7 +2912,8 @@ xenDaemonListDefinedDomains(virConnectPtr conn, int maxnames) { struct sexpr *root = NULL; - int i, ret = -1; + size_t i; + int ret = -1; struct sexpr *_for_i, *node; if (maxnames == 0) @@ -3133,7 +3135,7 @@ xenDaemonSetSchedulerParameters(virConnectPtr conn, xenUnifiedPrivatePtr priv = conn->privateData; struct sexpr *root; char *sched_type = NULL; - int i; + size_t i; int sched_nparam = 0; int ret = -1; diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index 7c05911..b4fd916 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -1150,7 +1150,8 @@ xenXMListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) { xenUnifiedPrivatePtr priv = conn->privateData; struct xenXMListIteratorContext ctx; - int i, ret = -1; + size_t i; + int ret = -1; xenUnifiedLock(priv); @@ -1321,7 +1322,7 @@ xenXMDomainDetachDeviceFlags(virConnectPtr conn, virDomainDeviceDefPtr dev = NULL; virDomainDefPtr def; int ret = -1; - int i; + size_t i; xenUnifiedPrivatePtr priv = conn->privateData; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c index cc55fde..e79585d 100644 --- a/src/xen/xs_internal.c +++ b/src/xen/xs_internal.c @@ -227,7 +227,8 @@ xenStoreNumOfDomains(virConnectPtr conn) { unsigned int num; char **idlist = NULL, *endptr; - int i, ret = -1, realnum = 0; + size_t i; + int ret = -1, realnum = 0; long id; xenUnifiedPrivatePtr priv = conn->privateData; @@ -268,7 +269,8 @@ xenStoreDoListDomains(virConnectPtr conn, int maxids) { char **idlist = NULL, *endptr; - unsigned int num, i; + unsigned int num; + size_t i; int ret = -1; long id; @@ -408,7 +410,8 @@ char * xenStoreDomainGetNetworkID(virConnectPtr conn, int id, const char *mac) { char dir[80], path[128], **list = NULL, *val = NULL; - unsigned int len, i, num; + unsigned int len, num; + size_t i; char *ret = NULL; xenUnifiedPrivatePtr priv = conn->privateData; @@ -457,7 +460,8 @@ char * xenStoreDomainGetDiskID(virConnectPtr conn, int id, const char *dev) { char dir[80], path[128], **list = NULL, *val = NULL; - unsigned int devlen, len, i, num; + unsigned int devlen, len, num; + size_t i; char *ret = NULL; xenUnifiedPrivatePtr priv = conn->privateData; @@ -529,7 +533,8 @@ char * xenStoreDomainGetPCIID(virConnectPtr conn, int id, const char *bdf) { char dir[80], path[128], **list = NULL, *val = NULL; - unsigned int len, i, num; + unsigned int len, num; + size_t i; char *ret = NULL; xenUnifiedPrivatePtr priv = conn->privateData; @@ -614,7 +619,7 @@ xenStoreDomainGetUUID(virConnectPtr conn, int id, unsigned char *uuid) static void xenStoreWatchListFree(xenStoreWatchListPtr list) { - int i; + size_t i; for (i=0; i<list->count; i++) { VIR_FREE(list->watches[i]->path); VIR_FREE(list->watches[i]->token); @@ -695,7 +700,7 @@ xenStoreAddWatch(virConnectPtr conn, int xenStoreRemoveWatch(virConnectPtr conn, const char *path, const char *token) { - int i; + size_t i; xenStoreWatchListPtr list; xenUnifiedPrivatePtr priv = conn->privateData; @@ -744,7 +749,7 @@ xenStoreFindWatch(xenStoreWatchListPtr list, const char *path, const char *token) { - int i; + size_t i; for (i = 0; i < list->count; i++) if (STREQ(path, list->watches[i]->path) && STREQ(token, list->watches[i]->token)) @@ -805,7 +810,8 @@ xenStoreDomainIntroduced(virConnectPtr conn, const char *token ATTRIBUTE_UNUSED, void *opaque) { - int i, j, found, missing = 0, retries = 20; + size_t i, j; + int found, missing = 0, retries = 20; int new_domain_cnt; int *new_domids; int nread; @@ -887,7 +893,8 @@ xenStoreDomainReleased(virConnectPtr conn, const char *token ATTRIBUTE_UNUSED, void *opaque) { - int i, j, found, removed, retries = 20; + size_t i, j; + int found, removed, retries = 20; int new_domain_cnt; int *new_domids; int nread; diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index cc8da49..7913ade 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -301,7 +301,8 @@ xenapiConnectGetVersion(virConnectPtr conn, unsigned long *hvVer) xen_host host; xen_session *session = ((struct _xenapiPrivate *)(conn->privateData))->session; xen_string_string_map *result = NULL; - int i, ret = -1; + size_t i; + int ret = -1; char *version = NULL; if (!(xen_session_get_this_host(session, &host, session))) { xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR, NULL); @@ -465,7 +466,7 @@ xenapiConnectListDomains(virConnectPtr conn, int *ids, int maxids) xen_host host; xen_vm_set *result = NULL; int64_t t0; - int i; + size_t i; xen_session *session = ((struct _xenapiPrivate *)(conn->privateData))->session; if (xen_session_get_this_host(session, &host, session)) { xen_host_get_resident_vms(session, &result, host); @@ -579,7 +580,7 @@ xenapiDomainCreateXML(virConnectPtr conn, static virDomainPtr xenapiDomainLookupByID(virConnectPtr conn, int id) { - int i; + size_t i; int64_t domID; char *uuid; xen_host host; @@ -1390,7 +1391,7 @@ xenapiDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) } xen_vm_get_hvm_boot_params(session, &result, vm); if (result != NULL) { - int i; + size_t i; for (i = 0; i < result->size; i++) { if (STREQ(result->contents[i].key, "order")) { int cnt = 0; @@ -1475,7 +1476,7 @@ xenapiDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) } xen_vm_get_platform(session, &result, vm); if (result != NULL) { - int i; + size_t i; for (i = 0; i < result->size; i++) { if (STREQ(result->contents[i].val, "true")) { if (STREQ(result->contents[i].key, "acpi")) @@ -1494,7 +1495,7 @@ xenapiDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) } xen_vm_get_vifs(session, &vif_set, vm); if (vif_set) { - int i; + size_t i; xen_vif vif; xen_vif_record *vif_rec = NULL; xen_network network; @@ -1553,13 +1554,15 @@ static int xenapiConnectListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) { - int i,j=0,doms; + size_t i, j; + int doms; xen_vm_set *result; xen_vm_record *record; xen_session *session = ((struct _xenapiPrivate *)(conn->privateData))->session; xen_vm_get_all(session, &result); + memset(names, 0, sizeof(names[0])*maxnames); if (result != NULL) { - for (i = 0; i < result->size && j < maxnames; i++) { + for (i = 0, j = 0; i < result->size && j < maxnames; i++) { xen_vm_get_record(session, &record, result->contents[i]); if (record != NULL) { if (record->is_a_template == 0) { @@ -1567,7 +1570,8 @@ xenapiConnectListDefinedDomains(virConnectPtr conn, char **const names, if (VIR_STRDUP(usenames, record->name_label) < 0) { xen_vm_record_free(record); xen_vm_set_free(result); - while (--j >= 0) VIR_FREE(names[j]); + for (i = 0; i < maxnames; i++) + VIR_FREE(names[j]); return -1; } names[j++] = usenames; @@ -1577,8 +1581,9 @@ xenapiConnectListDefinedDomains(virConnectPtr conn, char **const names, xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR, _("Couldn't get VM record")); xen_vm_set_free(result); - while (--j >= 0) VIR_FREE(names[j]); - return -1; + for (i = 0; i < maxnames; i++) + VIR_FREE(names[j]); + return -1; } } doms = j; @@ -1772,7 +1777,8 @@ xenapiDomainUndefine(virDomainPtr dom) static int xenapiDomainGetAutostart(virDomainPtr dom, int *autostart) { - int i,flag=0; + size_t i; + int flag = 0; xen_vm_set *vms; xen_vm vm; xen_string_string_map *result; diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c index 46e1aea..137f29d 100644 --- a/src/xenapi/xenapi_utils.c +++ b/src/xenapi/xenapi_utils.c @@ -41,7 +41,7 @@ void xenSessionFree(xen_session *session) { - int i; + size_t i; if (session->error_description != NULL) { for (i = 0; i < session->error_description_count; i++) VIR_FREE(session->error_description[i]); @@ -95,7 +95,7 @@ int xenapiUtil_ParseQuery(virConnectPtr conn, virURIPtr uri, int *noVerify) { int result = 0; - int i; + size_t i; for (i = 0; i < uri->paramsCount; i++) { virURIParamPtr queryParam = &uri->params[i]; @@ -161,7 +161,7 @@ createXenAPIBootOrderString(int nboot, int *bootDevs) { virBuffer ret = VIR_BUFFER_INITIALIZER; char *val = NULL; - int i; + size_t i; for (i = 0; i < nboot; i++) { if (bootDevs[i] == VIR_DOMAIN_BOOT_FLOPPY) val = (char *)"a"; @@ -253,7 +253,7 @@ getStorageVolumeType(char *type) char * returnErrorFromSession(xen_session *session) { - int i; + size_t i; virBuffer buf = VIR_BUFFER_INITIALIZER; for (i = 0; i < session->error_description_count; i++) { if (!i) @@ -273,11 +273,11 @@ mapDomainPinVcpu(unsigned char *cpumap, int maplen) virBuffer buf = VIR_BUFFER_INITIALIZER; size_t len; char *ret = NULL; - int i, j; + size_t i, j; for (i = 0; i < maplen; i++) { for (j = 0; j < 8; j++) { if (cpumap[i] & (1 << j)) { - virBufferAsprintf(&buf, "%d,", (8*i)+j); + virBufferAsprintf(&buf, "%zu,", (8*i)+j); } } } @@ -452,7 +452,7 @@ createVMRecordFromXml(virConnectPtr conn, virDomainDefPtr def, char uuidStr[VIR_UUID_STRING_BUFLEN]; xen_string_string_map *strings = NULL; int device_number = 0; - int i; + size_t i; *record = xen_vm_record_alloc(); if (VIR_STRDUP((*record)->name_label, def->name) < 0) diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c index 394b814..a275012 100644 --- a/src/xenxs/xen_sxpr.c +++ b/src/xenxs/xen_sxpr.c @@ -634,7 +634,7 @@ xenParseSxprSound(virDomainDefPtr def, const char *str) { if (STREQ(str, "all")) { - int i; + size_t i; /* * Special compatibility code for Xen with a bogus @@ -1356,7 +1356,7 @@ xenParseSxpr(const struct sexpr *root, /* Floppy disk config */ if (hvm) { const char *const fds[] = { "fda", "fdb" }; - int i; + size_t i; for (i = 0; i < ARRAY_CARDINALITY(fds); i++) { tmp = sexpr_fmt_node(root, "domain/image/hvm/%s", fds[i]); if ((tmp != NULL) && (tmp[0] != 0)) { @@ -2069,7 +2069,7 @@ xenFormatSxprAllPCI(virDomainDefPtr def, virBufferPtr buf) { int hasPCI = 0; - int i; + size_t i; for (i = 0; i < def->nhostdevs; i++) if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && @@ -2126,7 +2126,7 @@ xenFormatSxprSound(virDomainDefPtr def, virBufferPtr buf) { const char *str; - int i; + size_t i; for (i = 0; i < def->nsounds; i++) { if (!(str = virDomainSoundModelTypeToString(def->sounds[i]->model))) { @@ -2382,7 +2382,7 @@ xenFormatSxpr(virConnectPtr conn, if (def->serials) { if ((def->nserials > 1) || (def->serials[0]->target.port != 0)) { int maxport = -1; - int j = 0; + size_t j = 0; virBufferAddLit(&buf, "(serial ("); for (i = 0; i < def->nserials; i++) diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c index 9905f9d..036e450 100644 --- a/src/xenxs/xen_xm.c +++ b/src/xenxs/xen_xm.c @@ -258,7 +258,7 @@ xenParseXM(virConfPtr conf, int xendConfigVersion, virDomainNetDefPtr net = NULL; virDomainGraphicsDefPtr graphics = NULL; virDomainHostdevDefPtr hostdev = NULL; - int i; + size_t i; const char *defaultMachine; int vmlocaltime = 0; unsigned long count; @@ -1435,7 +1435,7 @@ xenFormatXMPCI(virConfPtr conf, virConfValuePtr pciVal = NULL; int hasPCI = 0; - int i; + size_t i; for (i = 0; i < def->nhostdevs; i++) if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && @@ -1958,7 +1958,7 @@ virConfPtr xenFormatXM(virConnectPtr conn, if (ret < 0) goto no_memory; } else { - int j = 0; + size_t j = 0; int maxport = -1; virConfValuePtr serialVal = NULL; -- 1.8.1.4

From: "Daniel P. Berrange" <berrange@redhat.com> 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> --- src/esx/esx_driver.c | 10 +++++----- src/esx/esx_interface_driver.c | 2 +- src/esx/esx_network_driver.c | 4 ++-- src/esx/esx_storage_backend_iscsi.c | 4 ++-- src/esx/esx_storage_backend_vmfs.c | 4 ++-- src/esx/esx_storage_driver.c | 10 +++++----- src/esx/esx_util.c | 2 +- src/esx/esx_vi.c | 18 +++++++++--------- src/vmware/vmware_conf.c | 4 ++-- src/vmx/vmx.c | 24 +++++++++++++----------- 10 files changed, 42 insertions(+), 40 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index a5df810..8030cc0 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -2891,7 +2891,7 @@ esxConnectListDefinedDomains(virConnectPtr conn, char **const names, int maxname esxVI_ObjectContent *virtualMachine = NULL; esxVI_VirtualMachinePowerState powerState; int count = 0; - int i; + size_t i; if (maxnames == 0) { return 0; @@ -3046,7 +3046,7 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml) esxPrivate *priv = conn->privateData; virDomainDefPtr def = NULL; char *vmx = NULL; - int i; + size_t i; virDomainDiskDefPtr disk = NULL; esxVI_ObjectContent *virtualMachine = NULL; int virtualHW_version; @@ -3583,7 +3583,7 @@ esxDomainGetSchedulerParametersFlags(virDomainPtr domain, esxVI_DynamicProperty *dynamicProperty = NULL; esxVI_SharesInfo *sharesInfo = NULL; unsigned int mask = 0; - int i = 0; + size_t i = 0; virCheckFlags(0, -1); @@ -3707,7 +3707,7 @@ esxDomainSetSchedulerParametersFlags(virDomainPtr domain, esxVI_ManagedObjectReference *task = NULL; esxVI_TaskInfoState taskInfoState; char *taskInfoErrorMessage = NULL; - int i; + size_t i; virCheckFlags(0, -1); if (virTypedParamsValidate(params, nparams, @@ -4871,7 +4871,7 @@ esxDomainSetMemoryParameters(virDomainPtr domain, virTypedParameterPtr params, esxVI_ManagedObjectReference *task = NULL; esxVI_TaskInfoState taskInfoState; char *taskInfoErrorMessage = NULL; - int i; + size_t i; virCheckFlags(0, -1); if (virTypedParamsValidate(params, nparams, diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index 7875ccf..2cee3b7 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -102,7 +102,7 @@ esxConnectListInterfaces(virConnectPtr conn, char **const names, int maxnames) esxVI_PhysicalNic *physicalNicList = NULL; esxVI_PhysicalNic *physicalNic = NULL; int count = 0; - int i; + size_t i; if (maxnames == 0) { return 0; diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 9aacffc..35a4bac 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -109,7 +109,7 @@ esxConnectListNetworks(virConnectPtr conn, char **const names, int maxnames) esxVI_HostVirtualSwitch *hostVirtualSwitchList = NULL; esxVI_HostVirtualSwitch *hostVirtualSwitch = NULL; int count = 0; - int i; + size_t i; if (maxnames == 0) { return 0; @@ -330,7 +330,7 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml) esxVI_PhysicalNic *physicalNicList = NULL; esxVI_PhysicalNic *physicalNic = NULL; esxVI_HostPortGroupSpec *hostPortGroupSpec = NULL; - int i; + size_t i; unsigned char md5[MD5_DIGEST_SIZE]; /* MD5_DIGEST_SIZE = VIR_UUID_BUFLEN = 16 */ diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_backend_iscsi.c index 6e1095e..c740475 100644 --- a/src/esx/esx_storage_backend_iscsi.c +++ b/src/esx/esx_storage_backend_iscsi.c @@ -103,7 +103,7 @@ esxConnectListStoragePools(virConnectPtr conn, char **const names, esxPrivate *priv = conn->storagePrivateData; esxVI_HostInternetScsiHba *hostInternetScsiHba = NULL; esxVI_HostInternetScsiHbaStaticTarget *target; - int i; + size_t i; if (maxnames == 0) { return 0; @@ -394,7 +394,7 @@ esxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names, esxVI_HostScsiTopologyLun *hostScsiTopologyLun; esxVI_ScsiLun *scsiLunList = NULL; esxVI_ScsiLun *scsiLun = NULL; - int i; + size_t i; if (esxVI_LookupHostScsiTopologyLunListByTargetName (priv->primary, pool->name, &hostScsiTopologyLunList) < 0) { diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c index 2966109..6321fe3 100644 --- a/src/esx/esx_storage_backend_vmfs.c +++ b/src/esx/esx_storage_backend_vmfs.c @@ -146,7 +146,7 @@ esxConnectListStoragePools(virConnectPtr conn, char **const names, esxVI_ObjectContent *datastoreList = NULL; esxVI_ObjectContent *datastore = NULL; int count = 0; - int i; + size_t i; if (maxnames == 0) { return 0; @@ -573,7 +573,7 @@ esxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names, char *directoryAndFileName = NULL; size_t length; int count = 0; - int i; + size_t i; if (names == NULL || maxnames < 0) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("Invalid argument")); diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index 3c60f00..e692167 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -87,7 +87,7 @@ esxConnectNumOfStoragePools(virConnectPtr conn) { int count = 0; esxPrivate *priv = conn->storagePrivateData; - int i; + size_t i; int tmp; if (esxVI_EnsureSession(priv->primary) < 0) { @@ -115,7 +115,7 @@ esxConnectListStoragePools(virConnectPtr conn, char **const names, int maxnames) bool success = false; esxPrivate *priv = conn->storagePrivateData; int count = 0; - int i; + size_t i; int tmp; if (maxnames == 0) { @@ -176,7 +176,7 @@ static virStoragePoolPtr esxStoragePoolLookupByName(virConnectPtr conn, const char *name) { esxPrivate *priv = conn->storagePrivateData; - int i; + size_t i; virStoragePoolPtr pool; virCheckNonNullArgReturn(name, NULL); @@ -205,7 +205,7 @@ static virStoragePoolPtr esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) { esxPrivate *priv = conn->storagePrivateData; - int i; + size_t i; virStoragePoolPtr pool; char uuid_string[VIR_UUID_STRING_BUFLEN] = ""; @@ -411,7 +411,7 @@ esxStorageVolLookupByKey(virConnectPtr conn, const char *key) { virStorageVolPtr volume; esxPrivate *priv = conn->storagePrivateData; - int i; + size_t i; if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index a4b931d..65359ae 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -44,7 +44,7 @@ int esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, virURIPtr uri) { int result = -1; - int i; + size_t i; int noVerify; int autoAnswer; char *tmp; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 8dc2592..c5b1894 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -490,7 +490,7 @@ static void esxVI_SharedCURL_Lock(CURL *handle ATTRIBUTE_UNUSED, curl_lock_data data, curl_lock_access access_ ATTRIBUTE_UNUSED, void *userptr) { - int i; + size_t i; esxVI_SharedCURL *shared = userptr; switch (data) { @@ -518,7 +518,7 @@ static void esxVI_SharedCURL_Unlock(CURL *handle ATTRIBUTE_UNUSED, curl_lock_data data, void *userptr) { - int i; + size_t i; esxVI_SharedCURL *shared = userptr; switch (data) { @@ -548,7 +548,7 @@ ESX_VI__TEMPLATE__ALLOC(SharedCURL) /* esxVI_SharedCURL_Free */ ESX_VI__TEMPLATE__FREE(SharedCURL, { - int i; + size_t i; if (item->count > 0) { /* Better leak than crash */ @@ -568,7 +568,7 @@ ESX_VI__TEMPLATE__FREE(SharedCURL, int esxVI_SharedCURL_Add(esxVI_SharedCURL *shared, esxVI_CURL *curl) { - int i; + size_t i; if (curl->handle == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1438,7 +1438,7 @@ int esxVI_Enumeration_CastFromAnyType(const esxVI_Enumeration *enumeration, esxVI_AnyType *anyType, int *value) { - int i; + size_t i; if (anyType == NULL || value == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); @@ -1473,7 +1473,7 @@ int esxVI_Enumeration_Serialize(const esxVI_Enumeration *enumeration, int value, const char *element, virBufferPtr output) { - int i; + size_t i; const char *name = NULL; if (element == NULL || output == NULL) { @@ -1511,7 +1511,7 @@ int esxVI_Enumeration_Deserialize(const esxVI_Enumeration *enumeration, xmlNodePtr node, int *value) { - int i; + size_t i; int result = -1; char *name = NULL; @@ -2579,7 +2579,7 @@ esxVI_GetSnapshotTreeNames(esxVI_VirtualMachineSnapshotTree *snapshotTreeList, { int count = 0; int result; - int i; + size_t i; esxVI_VirtualMachineSnapshotTree *snapshotTree; for (snapshotTree = snapshotTreeList; @@ -4544,7 +4544,7 @@ esxVI_ParseHostCpuIdInfo(esxVI_ParsedHostCpuIdInfo *parsedHostCpuIdInfo, char *output[4] = { parsedHostCpuIdInfo->eax, parsedHostCpuIdInfo->ebx, parsedHostCpuIdInfo->ecx, parsedHostCpuIdInfo->edx }; const char *name[4] = { "eax", "ebx", "ecx", "edx" }; - int r, i, o; + size_t r, i, o; memset(parsedHostCpuIdInfo, 0, sizeof(*parsedHostCpuIdInfo)); diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 9d3d37e..200745e 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -261,7 +261,7 @@ cleanup: int vmwareDomainConfigDisplay(vmwareDomainPtr pDomain, virDomainDefPtr def) { - int i = 0; + size_t i; if (def->ngraphics == 0) { pDomain->gui = true; @@ -336,7 +336,7 @@ vmwareVmxPath(virDomainDefPtr vmdef, char **vmxPath) char *directoryName = NULL; char *fileName = NULL; int ret = -1; - int i = 0; + size_t i; /* * Build VMX URL. Use the source of the first file-based harddisk diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 5464d13..681c8d5 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1058,7 +1058,8 @@ virVMXHandleLegacySCSIDiskDriverName(virDomainDefPtr def, virDomainDiskDefPtr disk) { char *tmp; - int model, i; + int model; + size_t i; virDomainControllerDefPtr controller = NULL; if (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI || disk->driverName == NULL) { @@ -1114,7 +1115,7 @@ virVMXGatherSCSIControllers(virVMXContext *ctx, virDomainDefPtr def, int virtualDev[4], bool present[4]) { int result = -1; - int i, k; + size_t i, k; virDomainDiskDefPtr disk; virDomainControllerDefPtr controller; bool controllerHasDisksAttached; @@ -3019,7 +3020,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virDomainDe int virtualHW_version) { char *vmx = NULL; - int i; + size_t i; int sched_cpu_affinity_length; unsigned char zero[VIR_UUID_BUFLEN]; virBuffer buffer = VIR_BUFFER_INITIALIZER; @@ -3158,12 +3159,13 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virDomainDe /* def:cpumask -> vmx:sched.cpu.affinity */ if (def->cpumask && virBitmapSize(def->cpumask) > 0) { + int bit; virBufferAddLit(&buffer, "sched.cpu.affinity = \""); sched_cpu_affinity_length = 0; - i = -1; - while ((i = virBitmapNextSetBit(def->cpumask, i)) >= 0) { + bit = -1; + while ((bit = virBitmapNextSetBit(def->cpumask, bit)) >= 0) { ++sched_cpu_affinity_length; } @@ -3175,9 +3177,9 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virDomainDe goto cleanup; } - i = -1; - while ((i = virBitmapNextSetBit(def->cpumask, i)) >= 0) { - virBufferAsprintf(&buffer, "%d", i); + bit = -1; + while ((bit = virBitmapNextSetBit(def->cpumask, bit)) >= 0) { + virBufferAsprintf(&buffer, "%d", bit); if (sched_cpu_affinity_length > 1) { virBufferAddChar(&buffer, ','); @@ -3237,10 +3239,10 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virDomainDe for (i = 0; i < 4; ++i) { if (scsi_present[i]) { - virBufferAsprintf(&buffer, "scsi%d.present = \"true\"\n", i); + virBufferAsprintf(&buffer, "scsi%zu.present = \"true\"\n", i); if (scsi_virtualDev[i] != -1) { - virBufferAsprintf(&buffer, "scsi%d.virtualDev = \"%s\"\n", i, + virBufferAsprintf(&buffer, "scsi%zu.virtualDev = \"%s\"\n", i, virVMXControllerModelSCSITypeToString (scsi_virtualDev[i])); } @@ -3282,7 +3284,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virDomainDe for (i = 0; i < 2; ++i) { /* floppy[0..1].present defaults to true, disable it explicitly */ if (! floppy_present[i]) { - virBufferAsprintf(&buffer, "floppy%d.present = \"false\"\n", i); + virBufferAsprintf(&buffer, "floppy%zu.present = \"false\"\n", i); } } -- 1.8.1.4

From: "Daniel P. Berrange" <berrange@redhat.com> 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> --- src/uml/uml_conf.c | 6 +++--- src/uml/uml_driver.c | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index 38dcfbb..6a22cc0 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -395,7 +395,7 @@ virCommandPtr umlBuildCommandLine(virConnectPtr conn, struct uml_driver *driver, virDomainObjPtr vm) { - int i, j; + size_t i, j; virCommandPtr cmd; cmd = virCommandNew(vm->def->os.kernel); @@ -439,7 +439,7 @@ virCommandPtr umlBuildCommandLine(virConnectPtr conn, if (chr) ret = umlBuildCommandLineChr(chr, "con", cmd); if (!ret) - if (virAsprintf(&ret, "con%d=none", i) < 0) + if (virAsprintf(&ret, "con%zu=none", i) < 0) goto no_memory; virCommandAddArg(cmd, ret); VIR_FREE(ret); @@ -454,7 +454,7 @@ virCommandPtr umlBuildCommandLine(virConnectPtr conn, if (chr) ret = umlBuildCommandLineChr(chr, "ssl", cmd); if (!ret) - if (virAsprintf(&ret, "ssl%d=none", i) < 0) + if (virAsprintf(&ret, "ssl%zu=none", i) < 0) goto no_memory; virCommandAddArg(cmd, ret); diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index df98eb8..a68fd93 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -275,7 +275,7 @@ static int umlIdentifyChrPTY(struct uml_driver *driver, virDomainObjPtr dom) { - int i; + size_t i; for (i = 0; i < dom->def->nconsoles; i++) if (dom->def->consoles[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY) @@ -1003,7 +1003,7 @@ error: static void umlCleanupTapDevices(virDomainObjPtr vm) { - int i; + size_t i; for (i = 0; i < vm->def->nnets; i++) { virDomainNetDefPtr def = vm->def->nets[i]; @@ -2127,7 +2127,7 @@ static int umlDomainAttachUmlDisk(struct uml_driver *driver, virDomainObjPtr vm, virDomainDiskDefPtr disk) { - int i; + size_t i; char *cmd = NULL; char *reply = NULL; @@ -2255,7 +2255,8 @@ static int umlDomainDetachUmlDisk(struct uml_driver *driver, virDomainObjPtr vm, virDomainDeviceDefPtr dev) { - int i, ret = -1; + size_t i; + int ret = -1; virDomainDiskDefPtr detach = NULL; char *cmd; char *reply; -- 1.8.1.4

From: "Daniel P. Berrange" <berrange@redhat.com> 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> --- src/test/test_driver.c | 50 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 80a84d5..8e8e3f2 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -167,7 +167,7 @@ testBuildCapabilities(virConnectPtr conn) { virCapsPtr caps; virCapsGuestPtr guest; const char *const guest_types[] = { "hvm", "xen" }; - int i; + size_t i; if ((caps = virCapabilitiesNew(VIR_ARCH_I686, 0, 0)) == NULL) goto no_memory; @@ -331,7 +331,8 @@ static int testNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info); static char * testDomainGenerateIfname(virDomainDefPtr domdef) { int maxif = 1024; - int ifctr, i; + int ifctr; + size_t i; for (ifctr = 0; ifctr < maxif; ++ifctr) { char *ifname; @@ -363,7 +364,7 @@ testDomainGenerateIfname(virDomainDefPtr domdef) { static int testDomainGenerateIfnames(virDomainDefPtr domdef) { - int i = 0; + size_t i = 0; for (i = 0; i < domdef->nnets; i++) { char *ifname; @@ -391,7 +392,7 @@ testDomainUpdateVCPU(virConnectPtr conn ATTRIBUTE_UNUSED, testDomainObjPrivatePtr privdata = dom->privateData; virVcpuInfoPtr info = &privdata->vcpu_infos[vcpu]; unsigned char *cpumap = VIR_GET_CPUMAP(privdata->cpumaps, maplen, vcpu); - int j; + size_t j; bool cpu; memset(info, 0, sizeof(virVcpuInfo)); @@ -440,7 +441,8 @@ testDomainUpdateVCPUs(virConnectPtr conn, { testConnPtr privconn = conn->privateData; testDomainObjPrivatePtr privdata = dom->privateData; - int i, ret = -1; + size_t i; + int ret = -1; int cpumaplen, maxcpu; maxcpu = VIR_NODEINFO_MAXCPUS(privconn->nodeInfo); @@ -705,7 +707,8 @@ static int testOpenVolumesForPool(xmlDocPtr xml, virStoragePoolObjPtr pool, int poolidx) { char *vol_xpath; - int i, ret, func_ret = -1; + size_t i; + int ret, func_ret = -1; xmlNodePtr *vols = NULL; virStorageVolDefPtr def = NULL; @@ -778,7 +781,8 @@ error: static int testOpenFromFile(virConnectPtr conn, const char *file) { - int i, ret; + size_t i; + int ret; long l; char *str; xmlDocPtr xml = NULL; @@ -2303,7 +2307,8 @@ static int testDomainGetVcpus(virDomainPtr domain, testConnPtr privconn = domain->conn->privateData; testDomainObjPrivatePtr privdomdata; virDomainObjPtr privdom; - int i, v, maxcpu, hostcpus; + size_t i; + int v, maxcpu, hostcpus; int ret = -1; struct timeval tv; unsigned long long statbase; @@ -2391,7 +2396,8 @@ static int testDomainPinVcpu(virDomainPtr domain, testDomainObjPrivatePtr privdomdata; virDomainObjPtr privdom; unsigned char *privcpumap; - int i, maxcpu, hostcpus, privmaplen; + size_t i; + int maxcpu, hostcpus, privmaplen; int ret = -1; testDriverLock(privconn); @@ -2548,7 +2554,7 @@ static int testNodeGetCellsFreeMemory(virConnectPtr conn, unsigned long long *freemems, int startCell, int maxCells) { testConnPtr privconn = conn->privateData; - int i, j; + size_t i, j; int ret = -1; testDriverLock(privconn); @@ -2879,7 +2885,8 @@ static int testDomainInterfaceStats(virDomainPtr domain, virDomainObjPtr privdom; struct timeval tv; unsigned long long statbase; - int i, found = 0, ret = -1; + size_t i; + int found = 0, ret = -1; testDriverLock(privconn); privdom = virDomainObjListFindByName(privconn->domains, @@ -3467,7 +3474,8 @@ static int testInterfaceClose(virConnectPtr conn) static int testConnectNumOfInterfaces(virConnectPtr conn) { testConnPtr privconn = conn->privateData; - int i, count = 0; + size_t i; + int count = 0; testDriverLock(privconn); for (i = 0; (i < privconn->ifaces.count); i++) { @@ -3512,7 +3520,8 @@ error: static int testConnectNumOfDefinedInterfaces(virConnectPtr conn) { testConnPtr privconn = conn->privateData; - int i, count = 0; + size_t i; + int count = 0; testDriverLock(privconn); for (i = 0; i < privconn->ifaces.count; i++) { @@ -4612,7 +4621,8 @@ testStoragePoolListVolumes(virStoragePoolPtr pool, int maxnames) { testConnPtr privconn = pool->conn->privateData; virStoragePoolObjPtr privpool; - int i = 0, n = 0; + size_t i = 0; + int n = 0; memset(names, 0, maxnames * sizeof(*names)); @@ -4657,7 +4667,7 @@ testStoragePoolListAllVolumes(virStoragePoolPtr obj, unsigned int flags) { testConnPtr privconn = obj->conn->privateData; virStoragePoolObjPtr pool; - int i; + size_t i; virStorageVolPtr *tmp_vols = NULL; virStorageVolPtr vol = NULL; int nvols = 0; @@ -4768,7 +4778,7 @@ static virStorageVolPtr testStorageVolLookupByKey(virConnectPtr conn, const char *key) { testConnPtr privconn = conn->privateData; - unsigned int i; + size_t i; virStorageVolPtr ret = NULL; testDriverLock(privconn); @@ -4803,7 +4813,7 @@ static virStorageVolPtr testStorageVolLookupByPath(virConnectPtr conn, const char *path) { testConnPtr privconn = conn->privateData; - unsigned int i; + size_t i; virStorageVolPtr ret = NULL; testDriverLock(privconn); @@ -5014,7 +5024,7 @@ testStorageVolDelete(virStorageVolPtr vol, testConnPtr privconn = vol->conn->privateData; virStoragePoolObjPtr privpool; virStorageVolDefPtr privvol; - int i; + size_t i; int ret = -1; virCheckFlags(0, -1); @@ -5246,7 +5256,7 @@ testNodeNumOfDevices(virConnectPtr conn, { testConnPtr driver = conn->privateData; int ndevs = 0; - unsigned int i; + size_t i; virCheckFlags(0, -1); @@ -5269,7 +5279,7 @@ testNodeListDevices(virConnectPtr conn, { testConnPtr driver = conn->privateData; int ndevs = 0; - unsigned int i; + size_t i; virCheckFlags(0, -1); -- 1.8.1.4

From: "Daniel P. Berrange" <berrange@redhat.com> 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> --- src/security/security_dac.c | 4 ++-- src/security/security_driver.c | 2 +- src/security/security_selinux.c | 4 ++-- src/security/virt-aa-helper.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 0d6defc..a347d8f 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -838,7 +838,7 @@ virSecurityDACRestoreSecurityAllLabel(virSecurityManagerPtr mgr, int migrated) { virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); - int i; + size_t i; int rc = 0; if (!priv->dynamicOwnership) @@ -908,7 +908,7 @@ virSecurityDACSetSecurityAllLabel(virSecurityManagerPtr mgr, const char *stdin_path ATTRIBUTE_UNUSED) { virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); - int i; + size_t i; uid_t user; gid_t group; diff --git a/src/security/security_driver.c b/src/security/security_driver.c index 7920b93..d8a8283 100644 --- a/src/security/security_driver.c +++ b/src/security/security_driver.c @@ -53,7 +53,7 @@ virSecurityDriverPtr virSecurityDriverLookup(const char *name, const char *virtDriver) { virSecurityDriverPtr drv = NULL; - int i; + size_t i; VIR_DEBUG("name=%s", NULLSTR(name)); diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 7802dda..b44154c 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1845,7 +1845,7 @@ virSecuritySELinuxRestoreSecurityAllLabel(virSecurityManagerPtr mgr, { virSecurityLabelDefPtr secdef; virSecuritySELinuxDataPtr data = virSecurityManagerGetPrivateData(mgr); - int i; + size_t i; int rc = 0; VIR_DEBUG("Restoring security label on %s", def->name); @@ -2246,7 +2246,7 @@ virSecuritySELinuxSetSecurityAllLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, const char *stdin_path) { - int i; + size_t i; virSecuritySELinuxDataPtr data = virSecurityManagerGetPrivateData(mgr); virSecurityLabelDefPtr secdef; diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 02359fc..834ee04 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -498,7 +498,7 @@ valid_name(const char *name) static int array_starts_with(const char *str, const char * const *arr, const long size) { - int i; + size_t i; for (i = 0; i < size; i++) { if (strlen(str) < strlen(arr[i])) continue; @@ -890,7 +890,7 @@ get_files(vahControl * ctl) { virBuffer buf = VIR_BUFFER_INITIALIZER; int rc = -1; - int i; + size_t i; char *uuid; char uuidstr[VIR_UUID_STRING_BUFLEN]; -- 1.8.1.4

From: "Daniel P. Berrange" <berrange@redhat.com> 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> --- src/secret/secret_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 71b3fe7..be32a66 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -557,7 +557,7 @@ static int secretConnectNumOfSecrets(virConnectPtr conn) { virSecretDriverStatePtr driver = conn->secretPrivateData; - int i; + size_t i; virSecretEntryPtr secret; if (virConnectNumOfSecretsEnsureACL(conn) < 0) @@ -580,7 +580,7 @@ static int secretConnectListSecrets(virConnectPtr conn, char **uuids, int maxuuids) { virSecretDriverStatePtr driver = conn->secretPrivateData; - int i; + size_t i; virSecretEntryPtr secret; memset(uuids, 0, maxuuids * sizeof(*uuids)); @@ -651,7 +651,7 @@ secretConnectListAllSecrets(virConnectPtr conn, int ret_nsecrets = 0; virSecretPtr secret = NULL; virSecretEntryPtr entry = NULL; - int i = 0; + size_t i = 0; int ret = -1; virCheckFlags(VIR_CONNECT_LIST_SECRETS_FILTERS_ALL, -1); -- 1.8.1.4

From: "Daniel P. Berrange" <berrange@redhat.com> 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> --- src/rpc/gendispatch.pl | 7 ++++--- src/rpc/virnetclient.c | 2 +- src/rpc/virnetclientprogram.c | 2 +- src/rpc/virnetserver.c | 10 +++++----- src/rpc/virnetserverservice.c | 10 +++++----- src/rpc/virnetsocket.c | 2 +- src/rpc/virnetsshsession.c | 10 +++++----- src/rpc/virnettlscontext.c | 7 ++++--- 8 files changed, 26 insertions(+), 24 deletions(-) diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index fdf5a79..ab70c62 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -1475,7 +1475,7 @@ elsif ($mode eq "client") { } if ($single_ret_as_list) { - print " int i;\n"; + print " size_t i;\n"; } if ($call->{streamflag} ne "none") { @@ -1594,8 +1594,9 @@ elsif ($mode eq "client") { print " for (i = 0; i < ret.$single_ret_list_name.${single_ret_list_name}_len; ++i) {\n"; print " if (VIR_STRDUP(${single_ret_list_name}[i],\n"; print " ret.$single_ret_list_name.${single_ret_list_name}_val[i]) < 0) {\n"; - print " for (--i; i >= 0; --i)\n"; - print " VIR_FREE(${single_ret_list_name}[i]);\n"; + print " size_t j;\n"; + print " for (j = 0; j < i; j++)\n"; + print " VIR_FREE(${single_ret_list_name}[j]);\n"; print "\n"; print " goto cleanup;\n"; print " }\n"; diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index fed2c87..b6dfb41 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -592,7 +592,7 @@ bool virNetClientHasPassFD(virNetClientPtr client) void virNetClientDispose(void *obj) { virNetClientPtr client = obj; - int i; + size_t i; PROBE(RPC_CLIENT_DISPOSE, "client=%p", client); diff --git a/src/rpc/virnetclientprogram.c b/src/rpc/virnetclientprogram.c index 1016f55..75ff522 100644 --- a/src/rpc/virnetclientprogram.c +++ b/src/rpc/virnetclientprogram.c @@ -195,7 +195,7 @@ cleanup: static virNetClientProgramEventPtr virNetClientProgramGetEvent(virNetClientProgramPtr prog, int procedure) { - int i; + size_t i; for (i = 0; i < prog->nevents; i++) { if (prog->events[i].proc == procedure) diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 9f56b03..7642999 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -856,7 +856,7 @@ virNetServerSignalEvent(int watch, void *opaque) { virNetServerPtr srv = opaque; siginfo_t siginfo; - int i; + size_t i; virObjectLock(srv); @@ -1046,7 +1046,7 @@ static void virNetServerAutoShutdownTimer(int timerid ATTRIBUTE_UNUSED, void virNetServerUpdateServices(virNetServerPtr srv, bool enabled) { - int i; + size_t i; virObjectLock(srv); for (i = 0; i < srv->nservices; i++) @@ -1060,7 +1060,7 @@ void virNetServerRun(virNetServerPtr srv) { int timerid = -1; bool timerActive = false; - int i; + size_t i; virObjectLock(srv); @@ -1156,7 +1156,7 @@ void virNetServerQuit(virNetServerPtr srv) void virNetServerDispose(void *obj) { virNetServerPtr srv = obj; - int i; + size_t i; VIR_FORCE_CLOSE(srv->autoShutdownInhibitFd); @@ -1195,7 +1195,7 @@ void virNetServerDispose(void *obj) void virNetServerClose(virNetServerPtr srv) { - int i; + size_t i; if (!srv) return; diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c index baf0ebe..c8c00d1 100644 --- a/src/rpc/virnetserverservice.c +++ b/src/rpc/virnetserverservice.c @@ -158,7 +158,7 @@ virNetServerServicePtr virNetServerServiceNewUNIX(const char *path, size_t nrequests_client_max) { virNetServerServicePtr svc; - int i; + size_t i; if (virNetServerServiceInitialize() < 0) return NULL; @@ -220,7 +220,7 @@ virNetServerServicePtr virNetServerServiceNewFD(int fd, size_t nrequests_client_max) { virNetServerServicePtr svc; - int i; + size_t i; if (virNetServerServiceInitialize() < 0) return NULL; @@ -435,7 +435,7 @@ void virNetServerServiceSetDispatcher(virNetServerServicePtr svc, void virNetServerServiceDispose(void *obj) { virNetServerServicePtr svc = obj; - int i; + size_t i; for (i = 0; i < svc->nsocks; i++) virObjectUnref(svc->socks[i]); @@ -449,7 +449,7 @@ void virNetServerServiceDispose(void *obj) void virNetServerServiceToggle(virNetServerServicePtr svc, bool enabled) { - int i; + size_t i; for (i = 0; i < svc->nsocks; i++) virNetSocketUpdateIOCallback(svc->socks[i], @@ -460,7 +460,7 @@ void virNetServerServiceToggle(virNetServerServicePtr svc, void virNetServerServiceClose(virNetServerServicePtr svc) { - int i; + size_t i; if (!svc) return; diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 27709d8..debe31f 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -223,7 +223,7 @@ int virNetSocketNewListenTCP(const char *nodename, struct addrinfo *ai = NULL; struct addrinfo hints; int fd = -1; - int i; + size_t i; int addrInUse = false; *retsocks = NULL; diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index b6aedc8..0153b04 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -114,7 +114,7 @@ struct _virNetSSHSession { static void virNetSSHSessionAuthMethodsFree(virNetSSHSessionPtr sess) { - int i; + size_t i; for (i = 0; i < sess->nauths; i++) { VIR_FREE(sess->auths[i]->username); @@ -205,7 +205,7 @@ virNetSSHKbIntCb(const char *name ATTRIBUTE_UNUSED, { virNetSSHSessionPtr priv = *opaque; virConnectCredentialPtr askcred = NULL; - int i; + size_t i; int credtype_echo = -1; int credtype_noecho = -1; char *tmp; @@ -294,7 +294,7 @@ virNetSSHCheckHostKey(virNetSSHSessionPtr sess) virBuffer buff = VIR_BUFFER_INITIALIZER; virConnectCredential askKey; struct libssh2_knownhost *knownHostEntry = NULL; - int i; + size_t i; char *hostnameStr = NULL; if (sess->hostKeyVerify == VIR_NET_SSH_HOSTKEY_VERIFY_IGNORE) @@ -585,7 +585,7 @@ virNetSSHAuthenticatePrivkey(virNetSSHSessionPtr sess, virNetSSHAuthMethodPtr priv) { virConnectCredential retr_passphrase; - int i; + size_t i; char *errmsg; int ret; @@ -783,7 +783,7 @@ virNetSSHAuthenticate(virNetSSHSessionPtr sess) bool auth_failed = false; char *auth_list; char *errmsg; - int i; + size_t i; int ret; if (!sess->nauths) { diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 9b43a80..02a4c29 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -287,7 +287,7 @@ static int virNetTLSContextCheckCertKeyPurpose(gnutls_x509_crt_t cert, bool isServer) { int status; - int i; + size_t i; unsigned int purposeCritical; unsigned int critical; char *buffer = NULL; @@ -300,7 +300,7 @@ static int virNetTLSContextCheckCertKeyPurpose(gnutls_x509_crt_t cert, status = gnutls_x509_crt_get_key_purpose_oid(cert, i, buffer, &size, NULL); if (status == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) { - VIR_DEBUG("No key purpose data available at slot %d", i); + VIR_DEBUG("No key purpose data available at slot %zu", i); /* If there is no data at all, then we must allow client/server to pass */ if (i == 0) @@ -954,7 +954,8 @@ static int virNetTLSContextValidCertificate(virNetTLSContextPtr ctxt, int ret; unsigned int status; const gnutls_datum_t *certs; - unsigned int nCerts, i; + unsigned int nCerts; + size_t i; char dname[256]; char *dnameptr = dname; size_t dnamesize = sizeof(dname); -- 1.8.1.4

From: "Daniel P. Berrange" <berrange@redhat.com> 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> --- src/remote/remote_driver.c | 64 ++++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 7f3e833..6a22393 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -186,7 +186,7 @@ remoteFindDaemonPath(void) SBINDIR "/libvirtd_dbg", NULL }; - int i; + size_t i; const char *customDaemon = getenv("LIBVIRTD_PATH"); if (customDaemon) @@ -517,7 +517,7 @@ doRemoteOpen(virConnectPtr conn, * feasibly it might contain variables needed by the real driver, * although that won't be the case for now). */ - int i; + size_t i; if (conn->uri) { for (i = 0; i < conn->uri->paramsCount; i++) { @@ -1192,7 +1192,7 @@ remoteNodeGetCPUStats(virConnectPtr conn, int rv = -1; remote_node_get_cpu_stats_args args; remote_node_get_cpu_stats_ret ret; - int i = -1; + size_t i; struct private_data *priv = conn->privateData; remoteDriverLock(priv); @@ -1258,7 +1258,7 @@ remoteNodeGetMemoryStats(virConnectPtr conn, int rv = -1; remote_node_get_memory_stats_args args; remote_node_get_memory_stats_ret ret; - int i = -1; + size_t i; struct private_data *priv = conn->privateData; remoteDriverLock(priv); @@ -1321,7 +1321,7 @@ remoteNodeGetCellsFreeMemory(virConnectPtr conn, int rv = -1; remote_node_get_cells_free_memory_args args; remote_node_get_cells_free_memory_ret ret; - int i; + size_t i; struct private_data *priv = conn->privateData; remoteDriverLock(priv); @@ -1358,7 +1358,7 @@ static int remoteConnectListDomains(virConnectPtr conn, int *ids, int maxids) { int rv = -1; - int i; + size_t i; remote_connect_list_domains_args args; remote_connect_list_domains_ret ret; struct private_data *priv = conn->privateData; @@ -1405,7 +1405,7 @@ remoteConnectListAllDomains(virConnectPtr conn, unsigned int flags) { int rv = -1; - int i; + size_t i; virDomainPtr *doms = NULL; remote_connect_list_all_domains_args args; remote_connect_list_all_domains_ret ret; @@ -1467,7 +1467,7 @@ static void remoteFreeTypedParameters(remote_typed_param *args_params_val, u_int args_params_len) { - u_int i; + size_t i; if (args_params_val == NULL) return; @@ -1488,7 +1488,7 @@ remoteSerializeTypedParameters(virTypedParameterPtr params, remote_typed_param **args_params_val, u_int *args_params_len) { - int i; + size_t i; int rv = -1; remote_typed_param *val; @@ -1551,7 +1551,7 @@ remoteDeserializeTypedParameters(remote_typed_param *ret_params_val, virTypedParameterPtr *params, int *nparams) { - int i = 0; + size_t i = 0; int rv = -1; bool userAllocated = *params != NULL; @@ -1642,8 +1642,8 @@ remoteDeserializeDomainDiskErrors(remote_domain_disk_error *ret_errors_val, virDomainDiskErrorPtr errors, int maxerrors) { - int i = 0; - int j; + size_t i = 0; + size_t j; if (ret_errors_len > limit || ret_errors_len > maxerrors) { virReportError(VIR_ERR_RPC, "%s", @@ -1881,7 +1881,7 @@ remoteDomainGetVcpuPinInfo(virDomainPtr domain, unsigned int flags) { int rv = -1; - int i; + size_t i; remote_domain_get_vcpu_pin_info_args args; remote_domain_get_vcpu_pin_info_ret ret; struct private_data *priv = domain->conn->privateData; @@ -1992,7 +1992,7 @@ remoteDomainGetEmulatorPinInfo(virDomainPtr domain, unsigned int flags) { int rv = -1; - int i; + size_t i; remote_domain_get_emulator_pin_info_args args; remote_domain_get_emulator_pin_info_ret ret; struct private_data *priv = domain->conn->privateData; @@ -2051,7 +2051,7 @@ remoteDomainGetVcpus(virDomainPtr domain, int maplen) { int rv = -1; - int i; + size_t i; remote_domain_get_vcpus_args args; remote_domain_get_vcpus_ret ret; struct private_data *priv = domain->conn->privateData; @@ -2164,7 +2164,8 @@ remoteDomainGetSecurityLabelList(virDomainPtr domain, virSecurityLabelPtr* secla remote_domain_get_security_label_list_args args; remote_domain_get_security_label_list_ret ret; struct private_data *priv = domain->conn->privateData; - int i, rv = -1; + size_t i; + int rv = -1; remoteDriverLock(priv); @@ -2498,7 +2499,7 @@ remoteDomainMemoryStats(virDomainPtr domain, remote_domain_memory_stats_args args; remote_domain_memory_stats_ret ret; struct private_data *priv = domain->conn->privateData; - unsigned int i; + size_t i; remoteDriverLock(priv); @@ -2826,7 +2827,7 @@ remoteConnectListAllNetworks(virConnectPtr conn, unsigned int flags) { int rv = -1; - int i; + size_t i; virNetworkPtr *tmp_nets = NULL; remote_connect_list_all_networks_args args; remote_connect_list_all_networks_ret ret; @@ -2889,7 +2890,7 @@ remoteConnectListAllInterfaces(virConnectPtr conn, unsigned int flags) { int rv = -1; - int i; + size_t i; virInterfacePtr *tmp_ifaces = NULL; remote_connect_list_all_interfaces_args args; remote_connect_list_all_interfaces_ret ret; @@ -2952,7 +2953,7 @@ remoteConnectListAllNodeDevices(virConnectPtr conn, unsigned int flags) { int rv = -1; - int i; + size_t i; virNodeDevicePtr *tmp_devices = NULL; remote_connect_list_all_node_devices_args args; remote_connect_list_all_node_devices_ret ret; @@ -3015,7 +3016,7 @@ remoteConnectListAllNWFilters(virConnectPtr conn, unsigned int flags) { int rv = -1; - int i; + size_t i; virNWFilterPtr *tmp_filters = NULL; remote_connect_list_all_nwfilters_args args; remote_connect_list_all_nwfilters_ret ret; @@ -3078,7 +3079,7 @@ remoteConnectListAllSecrets(virConnectPtr conn, unsigned int flags) { int rv = -1; - int i; + size_t i; virSecretPtr *tmp_secrets = NULL; remote_connect_list_all_secrets_args args; remote_connect_list_all_secrets_ret ret; @@ -3279,7 +3280,7 @@ remoteConnectListAllStoragePools(virConnectPtr conn, unsigned int flags) { int rv = -1; - int i; + size_t i; virStoragePoolPtr *tmp_pools = NULL; remote_connect_list_all_storage_pools_args args; remote_connect_list_all_storage_pools_ret ret; @@ -3342,7 +3343,7 @@ remoteStoragePoolListAllVolumes(virStoragePoolPtr pool, unsigned int flags) { int rv = -1; - int i; + size_t i; virStorageVolPtr *tmp_vols = NULL; remote_storage_pool_list_all_volumes_args args; remote_storage_pool_list_all_volumes_ret ret; @@ -3566,7 +3567,8 @@ remoteAuthenticate(virConnectPtr conn, struct private_data *priv, return 0; if (authtype) { - int want, i; + int want; + size_t i; if (STRCASEEQ(authtype, "sasl") || STRCASEEQLEN(authtype, "sasl.", 5)) { want = REMOTE_AUTH_SASL; @@ -3715,7 +3717,8 @@ static int remoteAuthCredSASL2Vir(int vircred) static sasl_callback_t *remoteAuthMakeCallbacks(int *credtype, int ncredtype) { sasl_callback_t *cbs; - int i, n; + size_t i; + int n; if (VIR_ALLOC_N(cbs, ncredtype+1) < 0) { return NULL; } @@ -4205,7 +4208,8 @@ remoteAuthPolkit(virConnectPtr conn, struct private_data *priv, virConnectAuthPtr auth) { remote_auth_polkit_ret ret; - int i, allowcb = 0; + size_t i; + int allowcb = 0; virConnectCredential cred = { VIR_CRED_EXTERNAL, conn->flags & VIR_CONNECT_RO ? "org.libvirt.unix.monitor" : "org.libvirt.unix.manage", @@ -4500,7 +4504,7 @@ remoteDomainBuildEventGraphics(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, virDomainEventGraphicsAddressPtr localAddr = NULL; virDomainEventGraphicsAddressPtr remoteAddr = NULL; virDomainEventGraphicsSubjectPtr subject = NULL; - int i; + size_t i; dom = get_nonnull_domain(conn, msg->dom); if (!dom) @@ -5753,7 +5757,7 @@ remoteDomainListAllSnapshots(virDomainPtr dom, unsigned int flags) { int rv = -1; - int i; + size_t i; virDomainSnapshotPtr *snaps = NULL; remote_domain_list_all_snapshots_args args; remote_domain_list_all_snapshots_ret ret; @@ -5816,7 +5820,7 @@ remoteDomainSnapshotListAllChildren(virDomainSnapshotPtr parent, unsigned int flags) { int rv = -1; - int i; + size_t i; virDomainSnapshotPtr *snaps = NULL; remote_domain_snapshot_list_all_children_args args; remote_domain_snapshot_list_all_children_ret ret; -- 1.8.1.4

From: "Daniel P. Berrange" <berrange@redhat.com> 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> --- src/qemu/qemu_agent.c | 9 ++-- src/qemu/qemu_capabilities.c | 7 +-- src/qemu/qemu_cgroup.c | 12 ++--- src/qemu/qemu_command.c | 104 +++++++++++++++++++------------------ src/qemu/qemu_conf.c | 2 +- src/qemu/qemu_domain.c | 34 ++++++------ src/qemu/qemu_driver.c | 120 +++++++++++++++++++++++-------------------- src/qemu/qemu_hostdev.c | 26 +++++----- src/qemu/qemu_hotplug.c | 54 ++++++++++--------- src/qemu/qemu_migration.c | 25 ++++----- src/qemu/qemu_monitor.c | 13 ++--- src/qemu/qemu_monitor_json.c | 31 ++++++----- src/qemu/qemu_monitor_text.c | 6 +-- src/qemu/qemu_process.c | 48 ++++++++--------- 14 files changed, 259 insertions(+), 232 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 9914521..a878c02 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -137,7 +137,7 @@ VIR_ONCE_GLOBAL_INIT(qemuAgent) static char * qemuAgentEscapeNonPrintable(const char *text) { - int i; + size_t i; virBuffer buf = VIR_BUFFER_INITIALIZER; for (i = 0; text[i] != '\0'; i++) { if (text[i] == '\\') @@ -169,7 +169,8 @@ qemuAgentOpenUnix(const char *monitor, pid_t cpid, bool *inProgress) struct sockaddr_un addr; int monfd; int timeout = 3; /* In seconds */ - int ret, i = 0; + int ret; + size_t i = 0; *inProgress = false; @@ -359,7 +360,7 @@ static int qemuAgentIOProcessData(qemuAgentPtr mon, qemuAgentMessagePtr msg) { int used = 0; - int i = 0; + size_t i = 0; #if DEBUG_IO # if DEBUG_RAW_IO char *str1 = qemuAgentEscapeNonPrintable(data); @@ -1469,7 +1470,7 @@ qemuAgentGetVCPUs(qemuAgentPtr mon, qemuAgentCPUInfoPtr *info) { int ret = -1; - int i; + size_t i; virJSONValuePtr cmd; virJSONValuePtr reply = NULL; virJSONValuePtr data = NULL; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 969b001..169f477 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -670,7 +670,7 @@ virQEMUCapsInitGuest(virCapsPtr caps, virArch guestarch) { virCapsGuestPtr guest; - int i; + size_t i; bool haskvm = false; bool haskqemu = false; char *kvmbin = NULL; @@ -878,7 +878,7 @@ error: virCapsPtr virQEMUCapsInit(virQEMUCapsCachePtr cache) { virCapsPtr caps; - int i; + size_t i; virArch hostarch = virArchFromHost(); if ((caps = virCapabilitiesNew(hostarch, @@ -2183,7 +2183,8 @@ static int virQEMUCapsProbeQMPTPM(virQEMUCapsPtr qemuCaps, qemuMonitorPtr mon) { - int nentries, i; + int nentries; + size_t i; char **entries = NULL; if ((nentries = qemuMonitorGetTPMModels(mon, &entries)) < 0) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 22bf78e..b92a1f5 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -413,7 +413,7 @@ qemuSetupBlkioCgroup(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; int rc = -1; - int i; + size_t i; if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_BLKIO)) { @@ -516,7 +516,7 @@ qemuSetupDevicesCgroup(virQEMUDriverPtr driver, const char *const *deviceACL = NULL; int rc = -1; int ret = -1; - int i; + size_t i; if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES)) return 0; @@ -884,7 +884,7 @@ int qemuSetupCgroupVcpuPin(virCgroupPtr cgroup, int nvcpupin, int vcpuid) { - int i; + size_t i; for (i = 0; i < nvcpupin; i++) { if (vcpuid == vcpupin[i]->vcpuid) { @@ -928,7 +928,7 @@ int qemuSetupCgroupForVcpu(virDomainObjPtr vm) qemuDomainObjPrivatePtr priv = vm->privateData; virDomainDefPtr def = vm->def; int rc; - unsigned int i, j; + size_t i, j; unsigned long long period = vm->def->cputune.period; long long quota = vm->def->cputune.quota; @@ -959,7 +959,7 @@ int qemuSetupCgroupForVcpu(virDomainObjPtr vm) if (rc < 0) { virReportSystemError(-rc, _("Unable to create vcpu cgroup for %s(vcpu:" - " %d)"), + " %zu)"), vm->def->name, i); goto cleanup; } @@ -968,7 +968,7 @@ int qemuSetupCgroupForVcpu(virDomainObjPtr vm) rc = virCgroupAddTask(cgroup_vcpu, priv->vcpupids[i]); if (rc < 0) { virReportSystemError(-rc, - _("unable to add vcpu %d task %d to cgroup"), + _("unable to add vcpu %zu task %d to cgroup"), i, priv->vcpupids[i]); goto cleanup; } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 46db28a..a5549df 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -402,7 +402,7 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, cleanup: if (ret < 0) { - int i; + size_t i; for (i = 0; i < *tapfdSize; i++) VIR_FORCE_CLOSE(tapfd[i]); if (template_ifname) @@ -437,7 +437,7 @@ qemuOpenVhostNet(virDomainDefPtr def, int *vhostfd, int *vhostfdSize) { - int i; + size_t i; /* If the config says explicitly to not use vhost, return now */ if (net->driver.virtio.name == VIR_DOMAIN_NET_BACKEND_TYPE_QEMU) { @@ -487,7 +487,7 @@ qemuOpenVhostNet(virDomainDefPtr def, "but is unavailable")); 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); *vhostfdSize = i; break; @@ -507,10 +507,10 @@ int qemuNetworkPrepareDevices(virDomainDefPtr def) { int ret = -1; - int ii; + size_t i; - for (ii = 0; ii < def->nnets; ii++) { - virDomainNetDefPtr net = def->nets[ii]; + for (i = 0; i < def->nnets; i++) { + virDomainNetDefPtr net = def->nets[i]; int actualType; /* If appropriate, grab a physical device from the configured @@ -787,7 +787,7 @@ int qemuAssignDeviceNetAlias(virDomainDefPtr def, virDomainNetDefPtr net, int idx) { if (idx == -1) { - int i; + size_t i; idx = 0; for (i = 0; i < def->nnets; i++) { int thisidx; @@ -819,7 +819,7 @@ int qemuAssignDeviceHostdevAlias(virDomainDefPtr def, virDomainHostdevDefPtr hostdev, int idx) { if (idx == -1) { - int i; + size_t i; idx = 0; for (i = 0; i < def->nhostdevs; i++) { int thisidx; @@ -855,7 +855,7 @@ int qemuAssignDeviceRedirdevAlias(virDomainDefPtr def, virDomainRedirdevDefPtr redirdev, int idx) { if (idx == -1) { - int i; + size_t i; idx = 0; for (i = 0; i < def->nredirdevs; i++) { int thisidx; @@ -896,7 +896,7 @@ qemuAssignDeviceControllerAlias(virDomainControllerDefPtr controller) int qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) { - int i; + size_t i; for (i = 0; i < def->ndisks; i++) { if (qemuAssignDeviceDiskAlias(def, def->disks[i], qemuCaps) < 0) @@ -919,11 +919,11 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) return 0; 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) goto no_memory; } 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) goto no_memory; } for (i = 0; i < def->nhostdevs; i++) { @@ -935,7 +935,7 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) return -1; } 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) goto no_memory; } for (i = 0; i < def->ncontrollers; i++) { @@ -943,31 +943,31 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) return -1; } 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) goto no_memory; } 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) goto no_memory; } 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) goto no_memory; } 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) goto no_memory; } 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) goto no_memory; } 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) goto no_memory; } 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) goto no_memory; } if (def->watchdog) { @@ -1097,7 +1097,7 @@ qemuDomainPrimeS390VirtioDevices(virDomainDefPtr def, disks, networks, consoles, controllers, memballoon and rng in this order */ - int i; + size_t i; for (i = 0; i < def->ndisks; i++) { if (def->disks[i]->bus == VIR_DOMAIN_DISK_BUS_VIRTIO && @@ -1320,7 +1320,8 @@ qemuAssignSpaprVIOAddress(virDomainDefPtr def, virDomainDeviceInfoPtr info, int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) { - int i, ret = -1; + size_t i; + int ret = -1; int model; /* Default values match QEMU. See spapr_(llan|vscsi|vty).c */ @@ -1450,7 +1451,8 @@ static int qemuDomainPCIAddressSetGrow(qemuDomainPCIAddressSetPtr addrs, virDevicePCIAddressPtr addr) { - int add, i; + int add; + size_t i; add = addr->bus - addrs->nbuses + 1; i = addrs->nbuses; @@ -1580,7 +1582,7 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { int max_idx = -1; int nbuses = 0; - int i; + size_t i; int rv; for (i = 0; i < def->ncontrollers; i++) { @@ -1674,7 +1676,7 @@ qemuDomainPCIAddressSetPtr qemuDomainPCIAddressSetCreate(virDomainDefPtr def, bool dryRun) { qemuDomainPCIAddressSetPtr addrs; - int i; + size_t i; if (VIR_ALLOC(addrs) < 0) goto no_memory; @@ -2411,7 +2413,8 @@ qemuBuildRBDString(virConnectPtr conn, virDomainDiskDefPtr disk, virBufferPtr opt) { - int i, ret = 0; + size_t i; + int ret = 0; virSecretPtr sec = NULL; char *secret = NULL; size_t secret_size; @@ -4139,7 +4142,7 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, virBuffer buf = VIR_BUFFER_INITIALIZER; enum virDomainNetType netType = virDomainNetGetActualType(net); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); - int i; + size_t i; if (net->script && netType != VIR_DOMAIN_NET_TYPE_ETHERNET) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -5539,7 +5542,7 @@ qemuBuildClockArgStr(virDomainClockDefPtr def) } /* 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++) { if (def->timers[i]->name == VIR_DOMAIN_TIMER_NAME_RTC) { switch (def->timers[i]->track) { @@ -5613,7 +5616,7 @@ qemuBuildCpuArgStr(const virQEMUDriverPtr driver, char *compare_msg = NULL; int ret = -1; virBuffer buf = VIR_BUFFER_INITIALIZER; - int i; + size_t i; virCapsPtr caps = NULL; *hasHwVirt = false; @@ -6022,7 +6025,7 @@ qemuBuildSmpArgStr(const virDomainDefPtr def, static int qemuBuildNumaArgStr(const virDomainDefPtr def, virCommandPtr cmd) { - int i; + size_t i; virBuffer buf = VIR_BUFFER_INITIALIZER; char *cpumask = NULL; int ret = -1; @@ -6230,7 +6233,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg, int defaultMode = graphics->data.spice.defaultMode; int port = graphics->data.spice.port; int tlsPort = graphics->data.spice.tlsPort; - int i; + size_t i; if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPICE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -6497,7 +6500,7 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, char **tapfdName = NULL; char **vhostfdName = NULL; int actualType = virDomainNetGetActualType(net); - int i; + size_t i; if (actualType == VIR_DOMAIN_NET_TYPE_HOSTDEV) { /* NET_TYPE_HOSTDEV devices are really hostdev devices, so @@ -6668,7 +6671,7 @@ qemuBuildCommandLine(virConnectPtr conn, qemuBuildCommandLineCallbacksPtr callbacks) { virErrorPtr originalError = NULL; - int i, j; + size_t i, j; const char *emulator; char uuid[VIR_UUID_STRING_BUFLEN]; char *cpu; @@ -7649,7 +7652,7 @@ qemuBuildCommandLine(virConnectPtr conn, smartcard->data.cert.file[j]); goto error; } - virBufferAsprintf(&opt, ",cert%d=%s", j + 1, + virBufferAsprintf(&opt, ",cert%zu=%s", j + 1, smartcard->data.cert.file[j]); } if (smartcard->data.cert.database) { @@ -8135,18 +8138,17 @@ qemuBuildCommandLine(virConnectPtr conn, if (sound->model == VIR_DOMAIN_SOUND_MODEL_ICH6) { char *codecstr = NULL; - int ii; - for (ii = 0; ii < sound->ncodecs; ii++) { + for (j = 0; j < sound->ncodecs; j++) { virCommandAddArg(cmd, "-device"); - if (!(codecstr = qemuBuildSoundCodecStr(sound, sound->codecs[ii], qemuCaps))) { + if (!(codecstr = qemuBuildSoundCodecStr(sound, sound->codecs[j], qemuCaps))) { goto error; } virCommandAddArg(cmd, codecstr); VIR_FREE(codecstr); } - if (ii == 0) { + if (j == 0) { virDomainSoundCodecDef codec = { VIR_DOMAIN_SOUND_CODEC_TYPE_DUPLEX, 0 @@ -8655,7 +8657,7 @@ static int qemuStringToArgvEnv(const char *args, int argcount = 0; int argalloc = 0; int envend; - int i; + size_t i; const char *curr = args; const char *start; const char **progenv = NULL; @@ -8758,7 +8760,7 @@ error: static const char *qemuFindEnv(const char **progenv, const char *name) { - int i; + size_t i; int len = strlen(name); for (i = 0; progenv && progenv[i]; i++) { @@ -8788,7 +8790,7 @@ qemuParseKeywords(const char *str, char **values = NULL; const char *start = str; const char *end; - int i; + size_t i; *retkeywords = NULL; *retvalues = NULL; @@ -8893,7 +8895,7 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, char **keywords; char **values; int nkeywords; - int i; + size_t i; int idx = -1; int busid = -1; int unitid = -1; @@ -9198,7 +9200,7 @@ qemuFindNICForVLAN(int nnics, const char **nics, int wantvlan) { - int i; + size_t i; for (i = 0; i < nnics; i++) { int gotvlan; const char *tmp = strstr(nics[i], "vlan="); @@ -9246,7 +9248,7 @@ qemuParseCommandLineNet(virDomainXMLOptionPtr xmlopt, int wantvlan = 0; const char *tmp; bool genmac = true; - int i; + size_t i; tmp = strchr(val, ','); @@ -9635,7 +9637,7 @@ qemuParseCommandLineCPU(virDomainDefPtr dom, char **hv_tokens = NULL; char *model = NULL; int ret = -1; - int i; + size_t i; if (!(tokens = virStringSplit(val, ",", 0))) goto cleanup; @@ -9672,7 +9674,7 @@ qemuParseCommandLineCPU(virDomainDefPtr dom, if (STREQ(feature, "kvmclock")) { bool present = (policy == VIR_CPU_FEATURE_REQUIRE); - int j; + size_t j; for (j = 0; j < dom->clock.ntimers; j++) { if (dom->clock.timers[j]->name == VIR_DOMAIN_TIMER_NAME_KVMCLOCK) @@ -9821,7 +9823,7 @@ qemuParseCommandLineSmp(virDomainDefPtr dom, unsigned int cores = 0; unsigned int threads = 0; unsigned int maxcpus = 0; - int i; + size_t i; int nkws; char **kws; char **vals; @@ -9923,7 +9925,7 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps, bool *monJSON) { virDomainDefPtr def; - int i; + size_t i; bool nographics = false; bool fullscreen = false; char *path; @@ -10884,7 +10886,7 @@ virDomainDefPtr qemuParseCommandLineString(virCapsPtr qemuCaps, const char **progenv = NULL; const char **progargv = NULL; virDomainDefPtr def = NULL; - int i; + size_t i; if (qemuStringToArgvEnv(args, &progenv, &progargv) < 0) goto cleanup; @@ -10916,7 +10918,7 @@ static int qemuParseProcFileStrings(int pid_value, char *tmp; size_t nstr = 0; char **str = NULL; - int i; + size_t i; if (virAsprintf(&path, "/proc/%d/%s", pid_value, name) < 0) { virReportOOMError(); @@ -10974,7 +10976,7 @@ virDomainDefPtr qemuParseCommandLinePid(virCapsPtr qemuCaps, const char **progenv = NULL; char *exepath = NULL; char *emulator; - int i; + size_t i; /* The parser requires /proc/pid, which only exists on platforms * like Linux where pid_t fits in int. */ diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 094f9f7..1429d8d 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -310,7 +310,7 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, virConfPtr conf = NULL; virConfValuePtr p; int ret = -1; - int i; + size_t i; /* Just check the file is readable before opening it, otherwise * libvirt emits an error. diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 28b8ee4..e8b366f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -289,7 +289,7 @@ qemuDomainObjPrivateXMLFormat(virBufferPtr buf, void *data) if (priv->nvcpupids) { - int i; + size_t i; virBufferAddLit(buf, " <vcpus>\n"); for (i = 0; i < priv->nvcpupids; i++) { virBufferAsprintf(buf, " <vcpu pid='%d'/>\n", priv->vcpupids[i]); @@ -298,7 +298,7 @@ qemuDomainObjPrivateXMLFormat(virBufferPtr buf, void *data) } if (priv->qemuCaps) { - int i; + size_t i; virBufferAddLit(buf, " <qemuCaps>\n"); for (i = 0; i < QEMU_CAPS_LAST; i++) { if (virQEMUCapsGet(priv->qemuCaps, i)) { @@ -341,7 +341,8 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, void *data) qemuDomainObjPrivatePtr priv = data; char *monitorpath; char *tmp; - int n, i; + int n; + size_t i; xmlNodePtr *nodes = NULL; virQEMUCapsPtr qemuCaps = NULL; @@ -498,7 +499,7 @@ static void qemuDomainDefNamespaceFree(void *nsdata) { qemuDomainCmdlineDefPtr cmd = nsdata; - unsigned int i; + size_t i; if (!cmd) return; @@ -524,7 +525,8 @@ qemuDomainDefNamespaceParse(xmlDocPtr xml ATTRIBUTE_UNUSED, qemuDomainCmdlineDefPtr cmd = NULL; bool uses_qemu_ns = false; xmlNodePtr *nodes = NULL; - int n, i; + int n; + size_t i; if (xmlXPathRegisterNs(ctxt, BAD_CAST "qemu", BAD_CAST QEMU_NAMESPACE_HREF) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -626,7 +628,7 @@ qemuDomainDefNamespaceFormatXML(virBufferPtr buf, void *nsdata) { qemuDomainCmdlineDefPtr cmd = nsdata; - unsigned int i; + size_t i; if (!cmd->num_args && !cmd->num_env) return 0; @@ -1338,7 +1340,7 @@ qemuDomainDefFormatBuf(virQEMUDriverPtr driver, } if ((flags & VIR_DOMAIN_XML_MIGRATABLE)) { - int i; + size_t i; int toremove = 0; virDomainControllerDefPtr usb = NULL, pci = NULL; @@ -1507,7 +1509,7 @@ void qemuDomainObjCheckTaint(virQEMUDriverPtr driver, virDomainObjPtr obj, int logFD) { - int i; + size_t i; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); if (cfg->privileged && @@ -1776,7 +1778,7 @@ qemuDomainSnapshotForEachQcow2Raw(virQEMUDriverPtr driver, int ndisks) { const char *qemuimgarg[] = { NULL, "snapshot", NULL, NULL, NULL, NULL }; - int i; + size_t i; bool skipped = false; qemuimgarg[0] = qemuFindQemuImgBinary(driver); @@ -2012,7 +2014,7 @@ qemuDomainCheckDiskPresence(virQEMUDriverPtr driver, bool cold_boot) { int ret = -1; - int i; + size_t i; virDomainDiskDefPtr disk; char uuid[VIR_UUID_STRING_BUFLEN]; virDomainEventPtr event = NULL; @@ -2087,7 +2089,7 @@ qemuDomainCleanupAdd(virDomainObjPtr vm, qemuDomainCleanupCallback cb) { qemuDomainObjPrivatePtr priv = vm->privateData; - int i; + size_t i; VIR_DEBUG("vm=%s, cb=%p", vm->def->name, cb); @@ -2112,7 +2114,7 @@ qemuDomainCleanupRemove(virDomainObjPtr vm, qemuDomainCleanupCallback cb) { qemuDomainObjPrivatePtr priv = vm->privateData; - int i; + size_t i; VIR_DEBUG("vm=%s, cb=%p", vm->def->name, cb); @@ -2135,13 +2137,13 @@ qemuDomainCleanupRun(virQEMUDriverPtr driver, virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; - int i; + size_t i; VIR_DEBUG("driver=%p, vm=%s", driver, vm->def->name); /* run cleanup callbacks in reverse order */ - for (i = priv->ncleanupCallbacks - 1; i >= 0; i--) { - if (priv->cleanupCallbacks[i]) + for (i = 0; i < priv->ncleanupCallbacks; i++) { + if (priv->cleanupCallbacks[priv->ncleanupCallbacks - (i + 1)]) priv->cleanupCallbacks[i](driver, vm); } @@ -2187,7 +2189,7 @@ unsigned long long qemuDomainMemoryLimit(virDomainDefPtr def) { unsigned long long mem; - int i; + size_t i; if (def->mem.hard_limit) { mem = def->mem.hard_limit; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1b9ba41..44f880d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -512,7 +512,7 @@ static int qemuDomainNetsRestart(virDomainObjPtr vm, void *data ATTRIBUTE_UNUSED) { - int i; + size_t i; virDomainDefPtr def = vm->def; virObjectLock(vm); @@ -2338,7 +2338,7 @@ static int qemuDomainSendKey(virDomainPtr domain, /* translate the keycode to RFB for qemu driver */ if (codeset != VIR_KEYCODE_SET_RFB) { - int i; + size_t i; int keycode; for (i = 0; i < nkeycodes; i++) { @@ -3814,7 +3814,8 @@ static int qemuDomainHotplugVcpus(virQEMUDriverPtr driver, unsigned int nvcpus) { qemuDomainObjPrivatePtr priv = vm->privateData; - int i, rc = 1; + size_t i; + int rc = 1; int ret = -1; int oldvcpus = vm->def->vcpus; int vcpus = oldvcpus; @@ -3892,7 +3893,7 @@ static int qemuDomainHotplugVcpus(virQEMUDriverPtr driver, if (rv < 0) { virReportSystemError(-rv, _("Unable to create vcpu cgroup for %s(vcpu:" - " %d)"), + " %zu)"), vm->def->name, i); goto cleanup; } @@ -3901,7 +3902,7 @@ static int qemuDomainHotplugVcpus(virQEMUDriverPtr driver, rv = virCgroupAddTask(cgroup_vcpu, cpupids[i]); if (rv < 0) { virReportSystemError(-rv, - _("unable to add vcpu %d task %d to cgroup"), + _("unable to add vcpu %zu task %d to cgroup"), i, cpupids[i]); virCgroupRemove(cgroup_vcpu); goto cleanup; @@ -3937,7 +3938,7 @@ static int qemuDomainHotplugVcpus(virQEMUDriverPtr driver, vm->def->cputune.nvcpupin, i) < 0) { virReportError(VIR_ERR_OPERATION_INVALID, _("failed to set cpuset.cpus in cgroup" - " for vcpu %d"), i); + " for vcpu %zu"), i); ret = -1; goto cleanup; } @@ -3945,7 +3946,7 @@ static int qemuDomainHotplugVcpus(virQEMUDriverPtr driver, if (virProcessSetAffinity(cpupids[i], vcpupin->cpumask) < 0) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("failed to set cpu affinity for vcpu %d"), + _("failed to set cpu affinity for vcpu %zu"), i); ret = -1; goto cleanup; @@ -3966,7 +3967,7 @@ static int qemuDomainHotplugVcpus(virQEMUDriverPtr driver, if (rv < 0) { virReportSystemError(-rv, _("Unable to access vcpu cgroup for %s(vcpu:" - " %d)"), + " %zu)"), vm->def->name, i); goto cleanup; } @@ -4009,7 +4010,7 @@ qemuDomainPrepareAgentVCPUs(unsigned int nvcpus, qemuAgentCPUInfoPtr cpuinfo, int ncpuinfo) { - int i; + size_t i; int nonline = 0; int nofflinable = 0; @@ -4727,7 +4728,8 @@ qemuDomainGetVcpus(virDomainPtr dom, unsigned char *cpumaps, int maplen) { virDomainObjPtr vm; - int i, v, maxcpu, hostcpus; + size_t i; + int v, maxcpu, hostcpus; int ret = -1; qemuDomainObjPrivatePtr priv; @@ -4824,7 +4826,7 @@ qemuDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) virCapsPtr caps = NULL; qemuAgentCPUInfoPtr cpuinfo = NULL; int ncpuinfo = -1; - int i; + size_t i; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG | @@ -4968,7 +4970,8 @@ static int qemuDomainGetSecurityLabelList(virDomainPtr dom, { virQEMUDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm; - int i, ret = -1; + size_t i; + int ret = -1; if (!(vm = qemuDomObjFromDomain(dom))) return -1; @@ -5698,7 +5701,7 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, bool monitor_json = false; virCommandPtr cmd = NULL; char *ret = NULL; - int i; + size_t i; virQEMUDriverConfigPtr cfg; virCapsPtr caps = NULL; @@ -5814,7 +5817,7 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, !graphics->data.vnc.socket && graphics->data.vnc.autoport) { graphics->data.vnc.port = 5900; } else if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { - int j; + size_t j; bool needTLSPort = false; bool needPort = false; int defaultMode = graphics->data.spice.defaultMode; @@ -7488,7 +7491,7 @@ qemuDomainParseDeviceWeightStr(char *deviceWeightStr, char *temp; int ndevices = 0; int nsep = 0; - int i; + size_t i; virBlkioDeviceWeightPtr result = NULL; *dw = NULL; @@ -7571,7 +7574,7 @@ qemuDomainMergeDeviceWeights(virBlkioDeviceWeightPtr *dest_array, virBlkioDeviceWeightPtr src_array, size_t src_size) { - int i, j; + size_t i, j; virBlkioDeviceWeightPtr dest, src; for (i = 0; i < src_size; i++) { @@ -7610,7 +7613,7 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, unsigned int flags) { virQEMUDriverPtr driver = dom->conn->privateData; - int i; + size_t i; virDomainObjPtr vm = NULL; virDomainDefPtr persistentDef = NULL; int ret = -1; @@ -7675,7 +7678,7 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT)) { size_t ndevices; virBlkioDeviceWeightPtr devices = NULL; - int j; + size_t j; if (qemuDomainParseDeviceWeightStr(params[i].value.s, &devices, @@ -7761,7 +7764,7 @@ qemuDomainGetBlkioParameters(virDomainPtr dom, unsigned int flags) { virQEMUDriverPtr driver = dom->conn->privateData; - int i, j; + size_t i, j; virDomainObjPtr vm = NULL; virDomainDefPtr persistentDef = NULL; unsigned int val; @@ -8075,7 +8078,7 @@ qemuDomainGetMemoryParameters(virDomainPtr dom, unsigned int flags) { virQEMUDriverPtr driver = dom->conn->privateData; - int i; + size_t i; virDomainObjPtr vm = NULL; virDomainDefPtr persistentDef = NULL; int ret = -1; @@ -8229,7 +8232,7 @@ qemuDomainSetNumaParameters(virDomainPtr dom, unsigned int flags) { virQEMUDriverPtr driver = dom->conn->privateData; - int i; + size_t i; virDomainDefPtr persistentDef = NULL; virDomainObjPtr vm = NULL; int ret = -1; @@ -8375,7 +8378,7 @@ qemuDomainGetNumaParameters(virDomainPtr dom, unsigned int flags) { virQEMUDriverPtr driver = dom->conn->privateData; - int i; + size_t i; virDomainObjPtr vm = NULL; virDomainDefPtr persistentDef = NULL; char *nodeset = NULL; @@ -8479,7 +8482,7 @@ static int qemuSetVcpusBWLive(virDomainObjPtr vm, virCgroupPtr cgroup, unsigned long long period, long long quota) { - int i; + size_t i; qemuDomainObjPrivatePtr priv = vm->privateData; virCgroupPtr cgroup_vcpu = NULL; int rc; @@ -8497,7 +8500,7 @@ qemuSetVcpusBWLive(virDomainObjPtr vm, virCgroupPtr cgroup, if (rc < 0) { virReportSystemError(-rc, _("Unable to find vcpu cgroup for %s(vcpu:" - " %d)"), + " %zu)"), vm->def->name, i); goto cleanup; } @@ -8566,7 +8569,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, unsigned int flags) { virQEMUDriverPtr driver = dom->conn->privateData; - int i; + size_t i; virDomainObjPtr vm = NULL; virDomainDefPtr vmdef = NULL; unsigned long long value_ul; @@ -9088,7 +9091,8 @@ qemuDomainBlockStats(virDomainPtr dom, struct _virDomainBlockStats *stats) { virQEMUDriverPtr driver = dom->conn->privateData; - int i, ret = -1; + int idx; + int ret = -1; virDomainObjPtr vm; virDomainDiskDefPtr disk = NULL; qemuDomainObjPrivatePtr priv; @@ -9105,12 +9109,12 @@ qemuDomainBlockStats(virDomainPtr dom, goto cleanup; } - if ((i = virDomainDiskIndexByName(vm->def, path, false)) < 0) { + if ((idx = virDomainDiskIndexByName(vm->def, path, false)) < 0) { virReportError(VIR_ERR_INVALID_ARG, _("invalid path: %s"), path); goto cleanup; } - disk = vm->def->disks[i]; + disk = vm->def->disks[idx]; if (!disk->info.alias) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -9160,7 +9164,8 @@ qemuDomainBlockStatsFlags(virDomainPtr dom, unsigned int flags) { virQEMUDriverPtr driver = dom->conn->privateData; - int i, tmp, ret = -1; + int idx; + int tmp, ret = -1; virDomainObjPtr vm; virDomainDiskDefPtr disk = NULL; qemuDomainObjPrivatePtr priv; @@ -9189,12 +9194,12 @@ qemuDomainBlockStatsFlags(virDomainPtr dom, } if (*nparams != 0) { - if ((i = virDomainDiskIndexByName(vm->def, path, false)) < 0) { + if ((idx = virDomainDiskIndexByName(vm->def, path, false)) < 0) { virReportError(VIR_ERR_INVALID_ARG, _("invalid path: %s"), path); goto endjob; } - disk = vm->def->disks[i]; + disk = vm->def->disks[idx]; if (!disk->info.alias) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -9326,7 +9331,7 @@ qemuDomainInterfaceStats(virDomainPtr dom, struct _virDomainInterfaceStats *stats) { virDomainObjPtr vm; - int i; + size_t i; int ret = -1; if (!(vm = qemuDomObjFromDomain(dom))) @@ -9381,7 +9386,7 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, unsigned int flags) { virQEMUDriverPtr driver = dom->conn->privateData; - int i; + size_t i; virDomainObjPtr vm = NULL; virDomainDefPtr persistentDef = NULL; int ret = -1; @@ -9558,7 +9563,7 @@ qemuDomainGetInterfaceParameters(virDomainPtr dom, unsigned int flags) { virQEMUDriverPtr driver = dom->conn->privateData; - int i; + size_t i; virDomainObjPtr vm = NULL; virDomainDefPtr def = NULL; virDomainDefPtr persistentDef = NULL; @@ -9888,7 +9893,7 @@ static int qemuDomainGetBlockInfo(virDomainPtr dom, virStorageFileMetadata *meta = NULL; virDomainDiskDefPtr disk = NULL; struct stat sb; - int i; + int idx; int format; virQEMUDriverConfigPtr cfg = NULL; @@ -9909,12 +9914,12 @@ static int qemuDomainGetBlockInfo(virDomainPtr dom, } /* 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, _("invalid path %s not assigned to domain"), path); goto cleanup; } - disk = vm->def->disks[i]; + disk = vm->def->disks[idx]; if (!disk->src) { virReportError(VIR_ERR_INVALID_ARG, _("disk %s does not currently have a source assigned"), @@ -11685,7 +11690,7 @@ qemuDomainSnapshotCreateInactiveExternal(virQEMUDriverPtr driver, virDomainSnapshotObjPtr snap, bool reuse) { - int i; + size_t i; virDomainSnapshotDiskDefPtr snapdisk; virDomainDiskDefPtr defdisk; virCommandPtr cmd = NULL; @@ -11883,7 +11888,7 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, virDomainSnapshotDefPtr def, unsigned int *flags) { int ret = -1; - int i; + size_t i; bool active = virDomainObjIsActive(vm); struct stat st; bool reuse = (*flags & VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT) != 0; @@ -12168,7 +12173,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv = vm->privateData; virJSONValuePtr actions = NULL; int ret = -1; - int i; + size_t i; bool persist = false; bool reuse = (flags & VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT) != 0; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); @@ -12227,9 +12232,10 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver, ret = qemuMonitorTransaction(priv->mon, actions); virJSONValueFree(actions); if (ret < 0) { + int idx = i; /* Transaction failed; undo the changes to vm. */ bool need_unlink = !(flags & VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT); - while (--i >= 0) { + while (--idx >= 0) { virDomainDiskDefPtr persistDisk = NULL; if (snap->def->disks[i].snapshot == @@ -12247,6 +12253,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver, snap->def->dom->disks[i], vm->def->disks[i], persistDisk, + need_unlink); } } @@ -13836,7 +13843,7 @@ qemuDomainOpenConsole(virDomainPtr dom, { virDomainObjPtr vm = NULL; int ret = -1; - int i; + size_t i; virDomainChrDefPtr chr = NULL; qemuDomainObjPrivatePtr priv; @@ -13918,7 +13925,7 @@ qemuDomainOpenChannel(virDomainPtr dom, { virDomainObjPtr vm = NULL; int ret = -1; - int i; + size_t i; virDomainChrDefPtr chr = NULL; qemuDomainObjPrivatePtr priv; @@ -13986,19 +13993,19 @@ cleanup: } 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; virDomainDiskDefPtr disk; - i = virDomainDiskIndexByName(vm->def, path, true); - if (i < 0) + idx = virDomainDiskIndexByName(vm->def, path, true); + if (idx < 0) goto cleanup; - disk = vm->def->disks[i]; - if (idx) - *idx = i; + disk = vm->def->disks[idx]; + if (idxret) + *idxret = idx; if (disk->src) { if (virAsprintf(&ret, "drive-%s", disk->info.alias) < 0) { @@ -14824,7 +14831,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, virDomainBlockIoTuneInfo *oldinfo; const char *device = NULL; int ret = -1; - int i; + size_t i; int idx = -1; bool set_bytes = false; bool set_iops = false; @@ -15002,7 +15009,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, virDomainBlockIoTuneInfo reply; const char *device = NULL; int ret = -1; - int i; + size_t i; virCapsPtr caps = NULL; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | @@ -15135,7 +15142,7 @@ qemuDomainGetDiskErrors(virDomainPtr dom, qemuDomainObjPrivatePtr priv; virHashTablePtr table = NULL; int ret = -1; - int i; + size_t i; int n = 0; virCheckFlags(0, -1); @@ -15435,7 +15442,7 @@ getSumVcpuPercpuStats(virDomainObjPtr vm, unsigned int num) { int ret = -1; - int i; + size_t i; char *buf = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; virCgroupPtr group_vcpu = NULL; @@ -15443,7 +15450,7 @@ getSumVcpuPercpuStats(virDomainObjPtr vm, for (i = 0; i < priv->nvcpupids; i++) { char *pos; unsigned long long tmp; - int j; + size_t j; if (virCgroupNewVcpu(priv->cgroup, i, false, &group_vcpu) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -15483,7 +15490,8 @@ qemuDomainGetPercpuStats(virDomainObjPtr vm, unsigned int ncpus) { int rv = -1; - int i, id, max_id; + size_t i; + int id, max_id; char *pos; char *buf = NULL; unsigned long long *sum_cpu_time = NULL; diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 404939e..9bdace1 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -38,7 +38,7 @@ static virPCIDeviceListPtr qemuGetPciHostDeviceList(virDomainHostdevDefPtr *hostdevs, int nhostdevs) { virPCIDeviceListPtr list; - int i; + size_t i; if (!(list = virPCIDeviceListNew())) return NULL; @@ -100,7 +100,7 @@ qemuGetActivePciHostDeviceList(virQEMUDriverPtr driver, int nhostdevs) { virPCIDeviceListPtr list; - int i; + size_t i; if (!(list = virPCIDeviceListNew())) return NULL; @@ -133,7 +133,7 @@ int qemuUpdateActivePciHostdevs(virQEMUDriverPtr driver, { virDomainHostdevDefPtr hostdev = NULL; virPCIDevicePtr dev = NULL; - int i; + size_t i; int ret = -1; if (!def->nhostdevs) @@ -193,7 +193,7 @@ qemuUpdateActiveUsbHostdevs(virQEMUDriverPtr driver, virDomainDefPtr def) { virDomainHostdevDefPtr hostdev = NULL; - int i; + size_t i; int ret = -1; if (!def->nhostdevs) @@ -238,7 +238,7 @@ qemuUpdateActiveScsiHostdevs(virQEMUDriverPtr driver, virDomainDefPtr def) { virDomainHostdevDefPtr hostdev = NULL; - int i; + size_t i; int ret = -1; if (!def->nhostdevs) @@ -482,7 +482,7 @@ int qemuPrepareHostdevPCIDevices(virQEMUDriverPtr driver, { virPCIDeviceListPtr pcidevs; int last_processed_hostdev_vf = -1; - int i; + size_t i; int ret = -1; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); @@ -675,7 +675,7 @@ qemuPrepareHostdevUSBDevices(virQEMUDriverPtr driver, const char *name, virUSBDeviceListPtr list) { - int i, j; + size_t i, j; unsigned int count; virUSBDevicePtr tmp; @@ -814,7 +814,8 @@ qemuPrepareHostUSBDevices(virQEMUDriverPtr driver, virDomainDefPtr def, bool coldBoot) { - int i, ret = -1; + size_t i; + int ret = -1; virUSBDeviceListPtr list; virUSBDevicePtr tmp; virDomainHostdevDefPtr *hostdevs = def->hostdevs; @@ -883,7 +884,8 @@ qemuPrepareHostdevSCSIDevices(virQEMUDriverPtr driver, virDomainHostdevDefPtr *hostdevs, int nhostdevs) { - int i, j, count; + size_t i, j; + int count; virSCSIDeviceListPtr list; virSCSIDevicePtr tmp; @@ -1056,7 +1058,7 @@ void qemuDomainReAttachHostdevDevices(virQEMUDriverPtr driver, int nhostdevs) { virPCIDeviceListPtr pcidevs; - int i; + size_t i; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virObjectLock(driver->activePciHostdevs); @@ -1145,7 +1147,7 @@ qemuDomainReAttachHostUsbDevices(virQEMUDriverPtr driver, virDomainHostdevDefPtr *hostdevs, int nhostdevs) { - int i; + size_t i; virObjectLock(driver->activeUsbHostdevs); for (i = 0; i < nhostdevs; i++) { @@ -1208,7 +1210,7 @@ qemuDomainReAttachHostScsiDevices(virQEMUDriverPtr driver, virDomainHostdevDefPtr *hostdevs, int nhostdevs) { - int i; + size_t i; virObjectLock(driver->activeScsiHostdevs); for (i = 0; i < nhostdevs; i++) { diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a350059..162fb03 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -182,7 +182,7 @@ qemuDomainCheckEjectableMedia(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv = vm->privateData; virHashTablePtr table = NULL; int ret = -1; - int i; + size_t i; if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) { table = qemuMonitorGetBlockInfo(priv->mon); @@ -221,7 +221,8 @@ int qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, virDomainObjPtr vm, virDomainDiskDefPtr disk) { - int i, ret = -1; + size_t i; + int ret = -1; const char* type = virDomainDiskBusTypeToString(disk->bus); qemuDomainObjPrivatePtr priv = vm->privateData; char *devstr = NULL; @@ -425,7 +426,7 @@ qemuDomainFindOrCreateSCSIDiskController(virQEMUDriverPtr driver, virDomainObjPtr vm, int controller) { - int i; + size_t i; virDomainControllerDefPtr cont; for (i = 0; i < vm->def->ncontrollers; i++) { @@ -472,7 +473,7 @@ int qemuDomainAttachSCSIDisk(virConnectPtr conn, virDomainObjPtr vm, virDomainDiskDefPtr disk) { - int i; + size_t i; qemuDomainObjPrivatePtr priv = vm->privateData; virDomainControllerDefPtr cont = NULL; char *drivestr = NULL; @@ -598,7 +599,8 @@ int qemuDomainAttachUsbMassstorageDevice(virConnectPtr conn, virDomainDiskDefPtr disk) { qemuDomainObjPrivatePtr priv = vm->privateData; - int i, ret = -1; + size_t i; + int ret = -1; char *drivestr = NULL; char *devstr = NULL; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); @@ -708,7 +710,7 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, bool iface_connected = false; int actualType; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); - int i; + size_t i; /* preallocate new slot for device */ if (VIR_REALLOC_N(vm->def->nets, vm->def->nnets+1) < 0) { @@ -832,12 +834,12 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, } 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 no_memory; } 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 no_memory; } @@ -1387,7 +1389,7 @@ cleanup: static virDomainNetDefPtr *qemuDomainFindNet(virDomainObjPtr vm, virDomainNetDefPtr dev) { - int i; + size_t i; for (i = 0; i < vm->def->nnets; i++) { if (virMacAddrCmp(&vm->def->nets[i]->mac, &dev->mac) == 0) @@ -1941,7 +1943,7 @@ cleanup: static virDomainGraphicsDefPtr qemuDomainFindGraphics(virDomainObjPtr vm, virDomainGraphicsDefPtr dev) { - int i; + size_t i; for (i = 0; i < vm->def->ngraphics; i++) { if (vm->def->graphics[i]->type == dev->type) @@ -2123,7 +2125,7 @@ cleanup: static inline int qemuFindDisk(virDomainDefPtr def, const char *dst) { - int i; + size_t i; for (i = 0; i < def->ndisks; i++) { if (STREQ(def->disks[i]->dst, dst)) { @@ -2166,20 +2168,21 @@ int qemuDomainDetachVirtioDiskDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainDeviceDefPtr dev) { - int i, ret = -1; + int idx; + int ret = -1; virDomainDiskDefPtr detach = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; 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, _("disk %s not found"), dev->data.disk->dst); goto cleanup; } - detach = vm->def->disks[i]; + detach = vm->def->disks[idx]; if (qemuIsMultiFunctionDevice(vm->def, &detach->info)) { virReportError(VIR_ERR_OPERATION_FAILED, @@ -2247,7 +2250,7 @@ int qemuDomainDetachVirtioDiskDevice(virQEMUDriverPtr driver, &detach->info.addr.pci) < 0) 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; detach->backingChain = NULL; @@ -2275,14 +2278,15 @@ int qemuDomainDetachDiskDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainDeviceDefPtr dev) { - int i, ret = -1; + int idx; + int ret = -1; virDomainDiskDefPtr detach = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; 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, _("disk %s not found"), dev->data.disk->dst); goto cleanup; @@ -2295,7 +2299,7 @@ int qemuDomainDetachDiskDevice(virQEMUDriverPtr driver, goto cleanup; } - detach = vm->def->disks[i]; + detach = vm->def->disks[idx]; if (detach->mirror) { virReportError(VIR_ERR_BLOCK_COPY_ACTIVE, @@ -2326,7 +2330,7 @@ int qemuDomainDetachDiskDevice(virQEMUDriverPtr driver, virDomainAuditDisk(vm, detach->src, NULL, "detach", true); - virDomainDiskRemove(vm->def, i); + virDomainDiskRemove(vm->def, idx); dev->data.disk->backingChain = detach->backingChain; detach->backingChain = NULL; @@ -2353,7 +2357,7 @@ cleanup: static bool qemuDomainDiskControllerIsBusy(virDomainObjPtr vm, virDomainControllerDefPtr detach) { - int i; + size_t i; virDomainDiskDefPtr disk; for (i = 0; i < vm->def->ndisks; i++) { @@ -3016,9 +3020,9 @@ int qemuDomainDetachLease(virQEMUDriverPtr driver, virDomainLeaseDefPtr 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, _("Lease %s in lockspace %s does not exist"), lease->key, NULLSTR(lease->lockspace)); @@ -3028,7 +3032,7 @@ int qemuDomainDetachLease(virQEMUDriverPtr driver, if (virDomainLockLeaseDetach(driver->lockManager, vm, lease) < 0) return -1; - det_lease = virDomainLeaseRemoveAt(vm->def, i); + det_lease = virDomainLeaseRemoveAt(vm->def, idx); virDomainLeaseDefFree(det_lease); return 0; } diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a6b7acb..387147b 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -183,7 +183,7 @@ static void qemuMigrationCookieGraphicsFree(qemuMigrationCookieGraphicsPtr grap) static void qemuMigrationCookieNetworkFree(qemuMigrationCookieNetworkPtr network) { - int i; + size_t i; if (!network) return; @@ -338,7 +338,7 @@ qemuMigrationCookieNetworkAlloc(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, virDomainDefPtr def) { qemuMigrationCookieNetworkPtr mig; - int i; + size_t i; if (VIR_ALLOC(mig) < 0) goto no_memory; @@ -567,7 +567,7 @@ static void qemuMigrationCookieNetworkXMLFormat(virBufferPtr buf, qemuMigrationCookieNetworkPtr optr) { - int i; + size_t i; bool empty = true; for (i = 0; i < optr->nnets; i++) { @@ -577,7 +577,7 @@ qemuMigrationCookieNetworkXMLFormat(virBufferPtr buf, virBufferAddLit(buf, " <network>\n"); empty = false; } - virBufferAsprintf(buf, " <interface index='%d' vporttype='%s'", + virBufferAsprintf(buf, " <interface index='%zu' vporttype='%s'", i, virNetDevVPortTypeToString(optr->net[i].vporttype)); if (optr->net[i].portdata) { virBufferAddLit(buf, ">\n"); @@ -601,7 +601,7 @@ qemuMigrationCookieXMLFormat(virQEMUDriverPtr driver, { char uuidstr[VIR_UUID_STRING_BUFLEN]; char hostuuidstr[VIR_UUID_STRING_BUFLEN]; - int i; + size_t i; virUUIDFormat(mig->uuid, uuidstr); virUUIDFormat(mig->localHostuuid, hostuuidstr); @@ -734,7 +734,7 @@ static qemuMigrationCookieNetworkPtr qemuMigrationCookieNetworkXMLParse(xmlXPathContextPtr ctxt) { qemuMigrationCookieNetworkPtr optr; - int i; + size_t i; int n; xmlNodePtr *interfaces = NULL; char *vporttype; @@ -792,7 +792,8 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, char uuidstr[VIR_UUID_STRING_BUFLEN]; char *tmp = NULL; xmlNodePtr *nodes = NULL; - int i, n; + size_t i; + int n; virCapsPtr caps = NULL; if (!(caps = virQEMUDriverGetCapabilities(driver, false))) @@ -1430,7 +1431,7 @@ qemuMigrationIsAllowed(virQEMUDriverPtr driver, virDomainObjPtr vm, int nsnapshots; int pauseReason; bool forbid; - int i; + size_t i; if (vm) { if (qemuProcessAutoDestroyActive(driver, vm)) { @@ -1496,7 +1497,7 @@ qemuMigrationIsAllowed(virQEMUDriverPtr driver, virDomainObjPtr vm, static bool qemuMigrationIsSafe(virDomainDefPtr def) { - int i; + size_t i; for (i = 0; i < def->ndisks; i++) { virDomainDiskDefPtr disk = def->disks[i]; @@ -1828,7 +1829,7 @@ qemuDomainMigrateGraphicsRelocate(virQEMUDriverPtr driver, } if (uri) { - int i; + size_t i; if ((type = virDomainGraphicsTypeFromString(uri->scheme)) < 0) { virReportError(VIR_ERR_INVALID_ARG, @@ -1885,7 +1886,7 @@ qemuDomainMigrateOPDRelocate(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, { virDomainNetDefPtr netptr; int ret = -1; - int i; + size_t i; for (i = 0; i < cookie->network->nnets; i++) { netptr = vm->def->nets[i]; @@ -4286,7 +4287,7 @@ qemuMigrationPerform(virQEMUDriverPtr driver, static int qemuMigrationVPAssociatePortProfiles(virDomainDefPtr def) { - int i; + size_t i; int last_good_net = -1; virDomainNetDefPtr net; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index fe5ab0a..56c7b20 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -133,7 +133,7 @@ VIR_ENUM_IMPL(qemuMonitorBlockIOStatus, char *qemuMonitorEscapeArg(const char *in) { int len = 0; - int i, j; + size_t i, j; char *out; /* 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) { - int i, j; + size_t i, j; char *out; int len = strlen(in); char next; @@ -224,7 +224,7 @@ char *qemuMonitorUnescapeArg(const char *in) # include <c-ctype.h> static char * qemuMonitorEscapeNonPrintable(const char *text) { - int i; + size_t i; virBuffer buf = VIR_BUFFER_INITIALIZER; for (i = 0; text[i] != '\0'; i++) { if (c_isprint(text[i]) || @@ -257,7 +257,8 @@ qemuMonitorOpenUnix(const char *monitor, pid_t cpid) struct sockaddr_un addr; int monfd; int timeout = 3; /* In seconds */ - int ret, i = 0; + int ret; + size_t i = 0; if ((monfd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { virReportSystemError(errno, @@ -2491,7 +2492,7 @@ int qemuMonitorAddHostNetwork(qemuMonitorPtr mon, int *vhostfd, char **vhostfdName, int vhostfdSize) { 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 " "vhostfd=%p vhostfdName=%p vhostfdSize=%d", @@ -2564,7 +2565,7 @@ int qemuMonitorAddNetdev(qemuMonitorPtr mon, int *vhostfd, char **vhostfdName, int vhostfdSize) { 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" "vhostfd=%p vhostfdName=%p vhostfdSize=%d", diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 3383c88..5a70a87 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -514,7 +514,7 @@ error: static void qemuFreeKeywords(int nkeywords, char **keywords, char **values) { - int i; + size_t i; for (i = 0; i < nkeywords; i++) { VIR_FREE(keywords[i]); VIR_FREE(values[i]); @@ -530,7 +530,7 @@ qemuMonitorJSONKeywordStringToJSON(const char *str, const char *firstkeyword) char **keywords = NULL; char **values = NULL; int nkeywords = 0; - int i; + size_t i; if (!(ret = virJSONValueNewObject())) goto no_memory; @@ -1004,7 +1004,8 @@ qemuMonitorJSONStartCPUs(qemuMonitorPtr mon, int ret; virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("cont", NULL); virJSONValuePtr reply = NULL; - int i = 0, timeout = 3; + size_t i = 0; + int timeout = 3; if (!cmd) return -1; @@ -1180,7 +1181,7 @@ qemuMonitorJSONExtractCPUInfo(virJSONValuePtr reply, { virJSONValuePtr data; int ret = -1; - int i; + size_t i; int *threads = NULL; int ncpus; @@ -1499,7 +1500,7 @@ int qemuMonitorJSONGetBlockInfo(qemuMonitorPtr mon, virHashTablePtr table) { int ret; - int i; + size_t i; virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("query-block", NULL); @@ -1605,7 +1606,7 @@ int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon, long long *errs) { int ret; - int i; + size_t i; bool found = false; virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("query-blockstats", NULL); @@ -1755,7 +1756,8 @@ cleanup: int qemuMonitorJSONGetBlockStatsParamsNumber(qemuMonitorPtr mon, int *nparams) { - int ret, i, num = 0; + int ret, num = 0; + size_t i; virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("query-blockstats", NULL); virJSONValuePtr reply = NULL; @@ -1829,7 +1831,7 @@ int qemuMonitorJSONGetBlockExtent(qemuMonitorPtr mon, unsigned long long *extent) { int ret = -1; - int i; + size_t i; bool found = false; virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("query-blockstats", NULL); @@ -2941,7 +2943,7 @@ static int qemuMonitorJSONExtractPtyPaths(virJSONValuePtr reply, { virJSONValuePtr data; int ret = -1; - int i; + size_t i; if (!(data = virJSONValueObjectGet(reply, "return"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -3408,7 +3410,7 @@ int qemuMonitorJSONSendKey(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr keys = NULL; virJSONValuePtr key = NULL; - unsigned int i; + size_t i; /* create the key data array */ if (!(keys = virJSONValueNewArray())) @@ -3417,7 +3419,7 @@ int qemuMonitorJSONSendKey(qemuMonitorPtr mon, for (i = 0; i < nkeycodes; i++) { if (keycodes[i] > 0xffff) { 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; } @@ -3553,7 +3555,8 @@ static int qemuMonitorJSONGetBlockJobInfo(virJSONValuePtr reply, virDomainBlockJobInfoPtr info) { virJSONValuePtr data; - int nr_results, i; + int nr_results; + size_t i; if (!info) return -1; @@ -3729,7 +3732,7 @@ qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr result, { virJSONValuePtr io_throttle; int ret = -1; - int i; + size_t i; bool found = false; io_throttle = virJSONValueObjectGet(result, "return"); @@ -4668,7 +4671,7 @@ qemuMonitorJSONGetMigrationCapability(qemuMonitorPtr mon, virJSONValuePtr cmd; virJSONValuePtr reply = NULL; virJSONValuePtr caps; - int i; + size_t i; if (!(cmd = qemuMonitorJSONMakeCommand("query-migrate-capabilities", NULL))) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 15fbcb7..3c6f3b4 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -157,7 +157,7 @@ int qemuMonitorTextIOProcess(qemuMonitorPtr mon ATTRIBUTE_UNUSED, VIR_DEBUG("Seen a password prompt [%s]", data + used); #endif if (msg->passwordHandler) { - int i; + size_t i; /* Try and handle the prompt. The handler is required * to report a normal libvirt error */ if (msg->passwordHandler(mon, msg, @@ -2976,7 +2976,7 @@ int qemuMonitorTextSendKey(qemuMonitorPtr mon, unsigned int *keycodes, unsigned int nkeycodes) { - int i; + size_t i; virBuffer buf = VIR_BUFFER_INITIALIZER; char *cmd, *reply = NULL; int ret = -1; @@ -2988,7 +2988,7 @@ int qemuMonitorTextSendKey(qemuMonitorPtr mon, for (i = 0; i < nkeycodes; i++) { if (keycodes[i] > 0xffff) { virReportError(VIR_ERR_OPERATION_FAILED, - _("keycode %d is invalid: 0x%X"), + _("keycode %zu is invalid: 0x%X"), i, keycodes[i]); virBufferFreeAndReset(&buf); return -1; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f8c652f..2b3eca0 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -197,7 +197,7 @@ static virDomainChrSourceDefPtr qemuFindAgentConfig(virDomainDefPtr def) { virDomainChrSourceDefPtr config = NULL; - int i; + size_t i; for (i = 0; i < def->nchannels; i++) { virDomainChrDefPtr channel = def->channels[i]; @@ -365,10 +365,10 @@ static virDomainDiskDefPtr qemuProcessFindDomainDiskByPath(virDomainObjPtr vm, const char *path) { - int i = virDomainDiskIndexByName(vm->def, path, true); + int idx = virDomainDiskIndexByName(vm->def, path, true); - if (i >= 0) - return vm->def->disks[i]; + if (idx >= 0) + return vm->def->disks[idx]; virReportError(VIR_ERR_INTERNAL_ERROR, _("no disk found with path %s"), @@ -380,7 +380,7 @@ static virDomainDiskDefPtr qemuProcessFindDomainDiskByAlias(virDomainObjPtr vm, const char *alias) { - int i; + size_t i; if (STRPREFIX(alias, QEMU_DRIVE_HOST_PREFIX)) alias += strlen(QEMU_DRIVE_HOST_PREFIX); @@ -1020,7 +1020,7 @@ qemuProcessHandleGraphics(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainEventGraphicsAddressPtr localAddr = NULL; virDomainEventGraphicsAddressPtr remoteAddr = NULL; virDomainEventGraphicsSubjectPtr subject = NULL; - int i; + size_t i; if (VIR_ALLOC(localAddr) < 0) goto no_memory; @@ -1565,7 +1565,7 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices, virHashTablePtr paths, bool chardevfmt) { - int i; + size_t i; const char *prefix = chardevfmt ? "char" : ""; for (i = 0; i < count; i++) { @@ -1610,7 +1610,7 @@ qemuProcessFindCharDevicePTYsMonitor(virDomainObjPtr vm, virHashTablePtr paths) { bool chardevfmt = virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV); - int i = 0; + size_t i = 0; if (qemuProcessLookupPTYs(vm->def->serials, vm->def->nserials, paths, chardevfmt) < 0) @@ -1652,7 +1652,8 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm, int fd ATTRIBUTE_UNUSED) { 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 it procsses its serial and parallel @@ -1852,7 +1853,8 @@ virBitmapPtr qemuPrepareCpumap(virQEMUDriverPtr driver, virBitmapPtr nodemask) { - int i, hostcpus, maxcpu = QEMUD_CPUMASK_LEN; + size_t i; + int hostcpus, maxcpu = QEMUD_CPUMASK_LEN; virBitmapPtr cpumap = NULL; virCapsPtr caps = NULL; @@ -1877,7 +1879,7 @@ qemuPrepareCpumap(virQEMUDriverPtr driver, } for (i = 0; i < caps->host.nnumaCell; i++) { - int j; + size_t j; int cur_ncpus = caps->host.numaCell[i]->ncpus; bool result; if (virBitmapGetBit(nodemask, i, &result) < 0) { @@ -1952,7 +1954,7 @@ qemuProcessSetLinkStates(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; virDomainDefPtr def = vm->def; - int i; + size_t i; int ret = 0; for (i = 0; i < def->nnets; i++) { @@ -2040,7 +2042,7 @@ qemuProcessInitPasswords(virConnectPtr conn, int ret = 0; qemuDomainObjPrivatePtr priv = vm->privateData; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); - int i; + size_t i; for (i = 0; i < vm->def->ngraphics; ++i) { virDomainGraphicsDefPtr graphics = vm->def->graphics[i]; @@ -2131,7 +2133,7 @@ qemuProcessAssignNextPCIAddress(virDomainDeviceInfo *info, int naddrs) { bool found = false; - int i; + size_t i; VIR_DEBUG("Look for %x:%x out of %d", vendor, product, naddrs); @@ -2139,7 +2141,7 @@ qemuProcessAssignNextPCIAddress(virDomainDeviceInfo *info, VIR_DEBUG("Maybe %x:%x", addrs[i].vendor, addrs[i].product); if (addrs[i].vendor == vendor && addrs[i].product == product) { - VIR_DEBUG("Match %d", i); + VIR_DEBUG("Match %zu", i); found = true; break; } @@ -2345,7 +2347,7 @@ qemuProcessDetectPCIAddresses(virDomainObjPtr vm, int naddrs) { unsigned int vendor = 0, product = 0; - int i; + size_t i; /* XXX should all these vendor/product IDs be kept in the * actual device data structure instead ? @@ -2661,10 +2663,10 @@ int qemuProcessStopCPUs(virQEMUDriverPtr driver, virDomainObjPtr vm, static int qemuProcessNotifyNets(virDomainDefPtr def) { - int ii; + size_t i; - for (ii = 0; ii < def->nnets; ii++) { - virDomainNetDefPtr net = def->nets[ii]; + for (i = 0; i < def->nnets; i++) { + virDomainNetDefPtr net = def->nets[i]; if (networkNotifyActualDevice(net) < 0) return -1; } @@ -2675,7 +2677,7 @@ static int qemuProcessFiltersInstantiate(virConnectPtr conn, virDomainDefPtr def) { - int i; + size_t i; if (!conn) return 1; @@ -3282,7 +3284,7 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driver, { unsigned short port = 0; unsigned short tlsPort; - int i; + size_t i; int defaultMode = graphics->data.spice.defaultMode; bool needTLSPort = false; @@ -3410,7 +3412,7 @@ int qemuProcessStart(virConnectPtr conn, virCommandPtr cmd = NULL; struct qemuProcessHookData hookData; unsigned long cur_balloon; - int i; + size_t i; char *nodeset = NULL; virBitmapPtr nodemask = NULL; unsigned int stop_flags; @@ -4022,7 +4024,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, virErrorPtr orig_err; virDomainDefPtr def; virNetDevVPortProfilePtr vport = NULL; - int i; + size_t i; int logfile = -1; char *timestamp; char ebuf[1024]; -- 1.8.1.4

From: "Daniel P. Berrange" <berrange@redhat.com> 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> --- src/phyp/phyp_driver.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index cae3b59..1c41360 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -425,7 +425,7 @@ phypUUIDTable_WriteFile(virConnectPtr conn) { phyp_driverPtr phyp_driver = conn->privateData; uuid_tablePtr uuid_table = phyp_driver->uuid_table; - unsigned int i = 0; + size_t i = 0; int fd = -1; char local_file[] = "./uuid_table"; @@ -549,7 +549,7 @@ phypUUIDTable_RemLpar(virConnectPtr conn, int id) { phyp_driverPtr phyp_driver = conn->privateData; uuid_tablePtr uuid_table = phyp_driver->uuid_table; - unsigned int i = 0; + size_t i = 0; for (i = 0; i <= uuid_table->nlpars; i++) { if (uuid_table->lpars[i]->id == id) { @@ -577,7 +577,7 @@ phypUUIDTable_AddLpar(virConnectPtr conn, unsigned char *uuid, int id) uuid_tablePtr uuid_table = phyp_driver->uuid_table; uuid_table->nlpars++; - unsigned int i = uuid_table->nlpars; + size_t i = uuid_table->nlpars; i--; if (VIR_REALLOC_N(uuid_table->lpars, uuid_table->nlpars) < 0) { @@ -610,7 +610,7 @@ phypUUIDTable_ReadFile(virConnectPtr conn) { phyp_driverPtr phyp_driver = conn->privateData; uuid_tablePtr uuid_table = phyp_driver->uuid_table; - unsigned int i = 0; + size_t i = 0; int fd = -1; char local_file[] = "./uuid_table"; int rc = 0; @@ -764,7 +764,7 @@ phypUUIDTable_Init(virConnectPtr conn) int nids_numdomains = 0; int nids_listdomains = 0; int *ids = NULL; - unsigned int i = 0; + size_t i = 0; int ret = -1; bool table_created = false; @@ -841,7 +841,7 @@ cleanup: static void phypUUIDTable_Free(uuid_tablePtr uuid_table) { - int i; + size_t i; if (uuid_table == NULL) return; @@ -1319,7 +1319,7 @@ phypGetLparUUID(unsigned char *uuid, int lpar_id, virConnectPtr conn) phyp_driverPtr phyp_driver = conn->privateData; uuid_tablePtr uuid_table = phyp_driver->uuid_table; lparPtr *lpars = uuid_table->lpars; - unsigned int i = 0; + size_t i = 0; for (i = 0; i < uuid_table->nlpars; i++) { if (lpars[i]->id == lpar_id) { @@ -2336,7 +2336,7 @@ phypStoragePoolListVolumes(virStoragePoolPtr pool, char **const volumes, int vios_id = phyp_driver->vios_id; int exit_status = 0; int got = 0; - int i; + size_t i; char *ret = NULL; char *volumes_list = NULL; char *char_ptr = NULL; @@ -2537,7 +2537,7 @@ phypConnectListStoragePools(virConnectPtr conn, char **const pools, int npools) int vios_id = phyp_driver->vios_id; int exit_status = 0; int got = 0; - int i; + size_t i; char *ret = NULL; char *storage_pools = NULL; char *char_ptr = NULL; @@ -2594,7 +2594,7 @@ phypStoragePoolLookupByUUID(virConnectPtr conn, int npools = 0; int gotpools = 0; char **pools = NULL; - unsigned int i = 0; + size_t i = 0; unsigned char *local_uuid = NULL; if (VIR_ALLOC_N(local_uuid, VIR_UUID_BUFLEN) < 0) { @@ -3002,7 +3002,7 @@ phypConnectListInterfaces(virConnectPtr conn, char **const names, int nnames) int vios_id = phyp_driver->vios_id; int exit_status = 0; int got = 0; - int i; + size_t i; char *ret = NULL; char *networks = NULL; char *char_ptr = NULL; @@ -3170,7 +3170,7 @@ phypConnectListDefinedDomains(virConnectPtr conn, char **const names, int nnames char *managed_system = phyp_driver->managed_system; int exit_status = 0; int got = 0; - int i; + size_t i; char *ret = NULL; char *domains = NULL; char *char_ptr = NULL; @@ -3581,7 +3581,7 @@ phypDomainCreateXML(virConnectPtr conn, phyp_driverPtr phyp_driver = conn->privateData; uuid_tablePtr uuid_table = phyp_driver->uuid_table; lparPtr *lpars = uuid_table->lpars; - unsigned int i = 0; + size_t i = 0; char *managed_system = phyp_driver->managed_system; virCheckFlags(0, NULL); -- 1.8.1.4

From: "Daniel P. Berrange" <berrange@redhat.com> 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> --- src/parallels/parallels_driver.c | 15 ++++++++------- src/parallels/parallels_network.c | 3 ++- src/parallels/parallels_storage.c | 8 ++++---- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c index d5e0ea3..de8982a 100644 --- a/src/parallels/parallels_driver.c +++ b/src/parallels/parallels_driver.c @@ -419,7 +419,7 @@ static inline unsigned char hex2int(char c) static int parallelsMacAddrParse(const char *str, virMacAddrPtr addr) { - int i; + size_t i; if (strlen(str) != 12) goto error; @@ -850,7 +850,8 @@ parallelsLoadDomain(parallelsConnPtr privconn, virJSONValuePtr jobj) static int parallelsLoadDomains(parallelsConnPtr privconn, const char *domain_name) { - int count, i; + int count; + size_t i; virJSONValuePtr jobj; virJSONValuePtr jobj2; virDomainObjPtr dom = NULL; @@ -1519,7 +1520,7 @@ static int parallelsApplySerialParams(virDomainChrDefPtr *oldserials, int nold, virDomainChrDefPtr *newserials, int nnew) { - int i, j; + size_t i, j; if (nold != nnew) goto error; @@ -1719,7 +1720,7 @@ parallelsApplyDisksParams(virConnectPtr conn, parallelsDomObjPtr pdom, virDomainDiskDefPtr *olddisks, int nold, virDomainDiskDefPtr *newdisks, int nnew) { - int i, j; + size_t i, j; for (i = 0; i < nold; i++) { virDomainDiskDefPtr newdisk = NULL; @@ -1795,7 +1796,7 @@ static int parallelsApplyIfaceParams(parallelsDomObjPtr pdom, bool is_changed = false; virCommandPtr cmd = NULL; char strmac[VIR_MAC_STRING_BUFLEN]; - int i; + size_t i; int ret = -1; if (!oldnet) { @@ -1925,7 +1926,7 @@ parallelsApplyIfacesParams(parallelsDomObjPtr pdom, virDomainNetDefPtr *oldnets, int nold, virDomainNetDefPtr *newnets, int nnew) { - int i, j; + size_t i, j; virDomainNetDefPtr newnet; virDomainNetDefPtr oldnet; bool found; @@ -2217,7 +2218,7 @@ static int parallelsCreateVm(virConnectPtr conn, virDomainDefPtr def) { parallelsConnPtr privconn = conn->privateData; - int i; + size_t i; virStorageVolDefPtr privvol = NULL; virStoragePoolObjPtr pool = NULL; virStorageVolPtr vol = NULL; diff --git a/src/parallels/parallels_network.c b/src/parallels/parallels_network.c index 26a3f13..b39338a 100644 --- a/src/parallels/parallels_network.c +++ b/src/parallels/parallels_network.c @@ -295,7 +295,8 @@ static int parallelsLoadNetworks(parallelsConnPtr privconn) virJSONValuePtr jobj, jobj2; virNetworkObjPtr net; int ret = -1; - int count, i; + int count; + size_t i; jobj = parallelsParseOutput("prlsrvctl", "net", "list", "-j", NULL); diff --git a/src/parallels/parallels_storage.c b/src/parallels/parallels_storage.c index 3d55e82..63441e3 100644 --- a/src/parallels/parallels_storage.c +++ b/src/parallels/parallels_storage.c @@ -131,14 +131,14 @@ static char *parallelsMakePoolName(virConnectPtr conn, const char *path) { parallelsConnPtr privconn = conn->privateData; char *name; - unsigned int i; + size_t i; for (i = 0; i < UINT_MAX; i++) { bool found = false; - int j; + size_t j; if ((!i && VIR_STRDUP(name, path) < 0) || - (i && virAsprintf(&name, "%s-%u", path, i) < 0)) + (i && virAsprintf(&name, "%s-%zu", path, i) < 0)) return NULL; for (j = 0; j < strlen(name); j++) @@ -220,7 +220,7 @@ parallelsPoolAddByDomain(virConnectPtr conn, virDomainObjPtr dom) virStoragePoolObjListPtr pools = &privconn->pools; char *poolPath; virStoragePoolObjPtr pool = NULL; - int j; + size_t j; poolPath = mdir_name(pdom->home); if (!poolPath) { -- 1.8.1.4

From: "Daniel P. Berrange" <berrange@redhat.com> 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> --- src/openvz/openvz_driver.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 7af0349..7446f73 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -909,7 +909,7 @@ static int openvzDomainSetNetworkConfig(virConnectPtr conn, virDomainDefPtr def) { - unsigned int i; + size_t i; virBuffer buf = VIR_BUFFER_INITIALIZER; char *param; int first = 1; @@ -1793,7 +1793,8 @@ openvzDomainGetMemoryParameters(virDomainPtr domain, int *nparams, unsigned int flags) { - int i, result = -1; + size_t i; + int result = -1; const char *name; long kb_per_pages; unsigned long long barrier, limit, val; @@ -1863,7 +1864,8 @@ openvzDomainSetMemoryParameters(virDomainPtr domain, int nparams, unsigned int flags) { - int i, result = -1; + size_t i; + int result = -1; long kb_per_pages; kb_per_pages = openvzKBPerPages(); @@ -1963,7 +1965,7 @@ openvzDomainInterfaceStats(virDomainPtr dom, { struct openvz_driver *driver = dom->conn->privateData; virDomainObjPtr vm; - int i; + size_t i; int ret = -1; openvzDriverLock(driver); -- 1.8.1.4

From: "Daniel P. Berrange" <berrange@redhat.com> 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> --- src/nwfilter/nwfilter_driver.c | 5 +++-- src/nwfilter/nwfilter_ebiptables_driver.c | 4 ++-- src/nwfilter/nwfilter_gentech_driver.c | 21 +++++++++++---------- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 0fbc940..57f1f54 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -441,7 +441,8 @@ nwfilterClose(virConnectPtr conn) { static int nwfilterConnectNumOfNWFilters(virConnectPtr conn) { virNWFilterDriverStatePtr driver = conn->nwfilterPrivateData; - int i, n; + size_t i; + int n; if (virConnectNumOfNWFiltersEnsureACL(conn) < 0) return -1; @@ -503,7 +504,7 @@ nwfilterConnectListAllNWFilters(virConnectPtr conn, int nfilters = 0; virNWFilterPtr filter = NULL; virNWFilterObjPtr obj = NULL; - int i; + size_t i; int ret = -1; virCheckFlags(0, -1); diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 9a54de4..ee676b7 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -3705,7 +3705,7 @@ ebiptablesApplyNewRules(const char *ifname, int nruleInstances, void **_inst) { - int i, j; + size_t i, j; int cli_status; ebiptablesRuleInstPtr *inst = (ebiptablesRuleInstPtr *)_inst; virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -4078,7 +4078,7 @@ ebiptablesRemoveRules(const char *ifname ATTRIBUTE_UNUSED, { int rc = 0; int cli_status; - int i; + size_t i; virBuffer buf = VIR_BUFFER_INITIALIZER; ebiptablesRuleInstPtr *inst = (ebiptablesRuleInstPtr *)_inst; diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index 4180505..9dc48ef 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -57,7 +57,7 @@ static virNWFilterTechDriverPtr filter_tech_drivers[] = { void virNWFilterTechDriversInit(bool privileged) { - int i = 0; + size_t i = 0; VIR_DEBUG("Initializing NWFilter technology drivers"); while (filter_tech_drivers[i]) { if (!(filter_tech_drivers[i]->flags & TECHDRV_FLAG_INITIALIZED)) @@ -68,7 +68,7 @@ void virNWFilterTechDriversInit(bool privileged) { void virNWFilterTechDriversShutdown(void) { - int i = 0; + size_t i = 0; while (filter_tech_drivers[i]) { if ((filter_tech_drivers[i]->flags & TECHDRV_FLAG_INITIALIZED)) filter_tech_drivers[i]->shutdown(); @@ -79,7 +79,7 @@ void virNWFilterTechDriversShutdown(void) { virNWFilterTechDriverPtr virNWFilterTechDriverForName(const char *name) { - int i = 0; + size_t i = 0; while (filter_tech_drivers[i]) { if (STREQ(filter_tech_drivers[i]->name, name)) { if ((filter_tech_drivers[i]->flags & TECHDRV_FLAG_INITIALIZED) == 0) @@ -122,7 +122,7 @@ virNWFilterRuleInstAddData(virNWFilterRuleInstPtr res, static void virNWFilterRuleInstFree(virNWFilterRuleInstPtr inst) { - int i; + size_t i; if (!inst) return; @@ -300,7 +300,7 @@ virNWFilterRuleInstantiate(virNWFilterTechDriverPtr techdriver, virNWFilterHashTablePtr vars) { int rc; - int i; + size_t i; virNWFilterRuleInstPtr ret; if (VIR_ALLOC(ret) < 0) { @@ -395,7 +395,7 @@ _virNWFilterInstantiateRec(virNWFilterTechDriverPtr techdriver, { virNWFilterObjPtr obj; int rc = 0; - int i; + size_t i; virNWFilterRuleInstPtr inst; virNWFilterDefPtr next_filter; @@ -497,7 +497,7 @@ virNWFilterDetermineMissingVarsRec(virNWFilterDefPtr filter, { virNWFilterObjPtr obj; int rc = 0; - int i, j; + size_t i, j; virNWFilterDefPtr next_filter; virNWFilterVarValuePtr val; @@ -601,7 +601,7 @@ virNWFilterRuleInstancesToArray(int nEntries, void ***ptrs, int *nptrs) { - int i,j; + size_t i,j; *nptrs = 0; @@ -662,7 +662,8 @@ virNWFilterInstantiate(const unsigned char *vmuuid ATTRIBUTE_UNUSED, bool forceWithPendingReq) { int rc; - int j, nptrs; + size_t j; + int nptrs; int nEntries = 0; virNWFilterRuleInstPtr *insts = NULL; void **ptrs = NULL; @@ -1155,7 +1156,7 @@ virNWFilterDomainFWUpdateCB(virDomainObjPtr obj, { virDomainDefPtr vm = obj->def; struct domUpdateCBStruct *cb = data; - int i; + size_t i; bool skipIface; int ret = 0; -- 1.8.1.4

From: "Daniel P. Berrange" <berrange@redhat.com> 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> --- src/node_device/node_device_driver.c | 6 +++--- src/node_device/node_device_hal.c | 9 ++++++--- src/nodeinfo.c | 24 ++++++++++++------------ 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 1f7e0fd..c7b15e1 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -131,7 +131,7 @@ nodeNumOfDevices(virConnectPtr conn, { virNodeDeviceDriverStatePtr driver = conn->nodeDevicePrivateData; int ndevs = 0; - unsigned int i; + size_t i; if (virNodeNumOfDevicesEnsureACL(conn) < 0) return -1; @@ -161,7 +161,7 @@ nodeListDevices(virConnectPtr conn, { virNodeDeviceDriverStatePtr driver = conn->nodeDevicePrivateData; int ndevs = 0; - unsigned int i; + size_t i; if (virNodeListDevicesEnsureACL(conn) < 0) return -1; @@ -249,7 +249,7 @@ nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, const char *wwpn, unsigned int flags) { - unsigned int i; + size_t i; virNodeDeviceDriverStatePtr driver = conn->nodeDevicePrivateData; virNodeDeviceObjListPtr devs = &driver->devs; virNodeDevCapsDefPtr cap = NULL; diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 794f923..d94767c 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -408,7 +408,8 @@ gather_capabilities(LibHalContext *ctx, const char *udi, char *bus_name = NULL; virNodeDevCapsDefPtr caps = NULL; char **hal_cap_names = NULL; - int rv, i; + int rv; + size_t i; if (STREQ(udi, "/org/freedesktop/Hal/devices/computer")) { rv = gather_capability(ctx, udi, "system", &caps); @@ -632,7 +633,8 @@ nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED, { LibHalContext *hal_ctx = NULL; char **udi = NULL; - int num_devs, i; + int num_devs; + size_t i; int ret = -1; DBusConnection *sysbus; DBusError err; @@ -750,7 +752,8 @@ nodeStateReload(void) { DBusError err; char **udi = NULL; - int num_devs, i; + int num_devs; + size_t i; LibHalContext *hal_ctx; VIR_INFO("Reloading HAL device state"); diff --git a/src/nodeinfo.c b/src/nodeinfo.c index a50f892..d48c7ed 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -157,7 +157,7 @@ virNodeCountThreadSiblings(const char *dir, unsigned int cpu) char *path; FILE *pathfp; char str[1024]; - int i; + size_t i; if (virAsprintf(&path, "%s/cpu%u/topology/thread_siblings", dir, cpu) < 0) { @@ -221,7 +221,7 @@ virNodeParseSocket(const char *dir, unsigned int cpu) static int CPU_COUNT(cpu_set_t *set) { - int i, count = 0; + size_t i, count = 0; for (i = 0; i < CPU_SETSIZE; i++) if (CPU_ISSET(i, set)) @@ -251,7 +251,7 @@ virNodeParseNode(const char *node, int sock; cpu_set_t *core_maps = NULL; int core; - int i; + size_t i; int siblings; unsigned int cpu; int online; @@ -635,7 +635,7 @@ int linuxNodeGetCPUStats(FILE *procstat, char *buf = line; if (STRPREFIX(buf, cpu_header)) { /* aka logical CPU time */ - int i; + size_t i; if (sscanf(buf, "%*s %llu %llu %llu %llu %llu" // user ~ iowait @@ -709,7 +709,7 @@ int linuxNodeGetMemoryStats(FILE *meminfo, int *nparams) { int ret = -1; - int i = 0, j = 0, k = 0; + size_t i = 0, j = 0, k = 0; int found = 0; int nr_param; char line[1024]; @@ -1041,7 +1041,7 @@ nodeGetCPUCount(void) * will be consecutive. */ char *cpupath = NULL; - int i = 0; + size_t i = 0; if (virFileExists(SYSFS_SYSTEM_PATH "/cpu/present")) { i = linuxParseCPUmax(SYSFS_SYSTEM_PATH "/cpu/present"); @@ -1049,7 +1049,7 @@ nodeGetCPUCount(void) do { i++; VIR_FREE(cpupath); - if (virAsprintf(&cpupath, "%s/cpu/cpu%d", + if (virAsprintf(&cpupath, "%s/cpu/cpu%zu", SYSFS_SYSTEM_PATH, i) < 0) { virReportOOMError(); return -1; @@ -1087,7 +1087,7 @@ nodeGetCPUBitmap(int *max_id ATTRIBUTE_UNUSED) if (virFileExists(SYSFS_SYSTEM_PATH "/cpu/online")) { cpumap = linuxParseCPUmap(present, SYSFS_SYSTEM_PATH "/cpu/online"); } else { - int i; + size_t i; cpumap = virBitmapNew(present); if (!cpumap) { @@ -1156,7 +1156,7 @@ nodeMemoryParametersIsAllSupported(virTypedParameterPtr params, int nparams) { char *path = NULL; - int i; + size_t i; for (i = 0; i < nparams; i++) { virTypedParameterPtr param = ¶ms[i]; @@ -1193,7 +1193,7 @@ nodeSetMemoryParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED, virCheckFlags(0, -1); #ifdef __linux__ - int i; + size_t i; int rc; if (virTypedParamsValidate(params, nparams, @@ -1296,7 +1296,7 @@ nodeGetMemoryParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED, unsigned long long pages_unshared; unsigned long long pages_volatile; unsigned long long full_scans = 0; - int i; + size_t i; int ret; if ((*nparams) == 0) { @@ -1638,7 +1638,7 @@ nodeCapsInitNUMA(virCapsPtr caps) memset(allonesmask, 0xff, mask_n_bytes); for (n = 0; n <= numa_max_node(); n++) { - int i; + size_t i; /* The first time this returns -1, ENOENT if node doesn't exist... */ if (numa_node_to_cpus(n, mask, mask_n_bytes) < 0) { VIR_WARN("NUMA topology for cell %d of %d not available, ignoring", -- 1.8.1.4

From: "Daniel P. Berrange" <berrange@redhat.com> 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> --- src/lxc/lxc_cgroup.c | 3 ++- src/lxc/lxc_container.c | 6 ++++-- src/lxc/lxc_controller.c | 3 ++- src/lxc/lxc_driver.c | 44 ++++++++++++++++++++++---------------------- src/lxc/lxc_process.c | 2 +- 5 files changed, 31 insertions(+), 27 deletions(-) diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index 4443b83..a96a1f7 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -123,7 +123,8 @@ cleanup: static int virLXCCgroupSetupBlkioTune(virDomainDefPtr def, virCgroupPtr cgroup) { - int i, rc; + size_t i; + int rc; if (def->blkio.weight) { rc = virCgroupSetBlkioWeight(cgroup, def->blkio.weight); diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index c8420db..5665c01 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -231,7 +231,8 @@ static virCommandPtr lxcContainerBuildInitCmd(virDomainDefPtr vmDef) static int lxcContainerSetStdio(int control, int ttyfd, int handshakefd) { int rc = -1; - int open_max, i; + int open_max; + size_t i; if (setsid() < 0) { virReportSystemError(errno, "%s", @@ -712,7 +713,8 @@ static int lxcContainerMountBasicFS(void) { SELINUX_MOUNT, SELINUX_MOUNT, NULL, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY }, #endif }; - int i, rc = -1; + size_t i; + int rc = -1; VIR_DEBUG("Mounting basic filesystems"); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 88601f1..6077116 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1149,7 +1149,8 @@ virLXCControllerSetupUsernsMap(virDomainIdMapEntryPtr map, char *path) { virBuffer map_value = VIR_BUFFER_INITIALIZER; - int i, ret = -1; + size_t i; + int ret = -1; for (i = 0; i < num; i++) virBufferAsprintf(&map_value, "%u %u %u\n", diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 1a6d086..71e3dd7 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -815,7 +815,7 @@ lxcDomainSetMemoryParameters(virDomainPtr dom, unsigned int flags) { virLXCDriverPtr driver = dom->conn->privateData; - int i; + size_t i; virDomainObjPtr vm = NULL; int ret = -1; int rc; @@ -889,7 +889,7 @@ lxcDomainGetMemoryParameters(virDomainPtr dom, unsigned int flags) { virLXCDriverPtr driver = dom->conn->privateData; - int i; + size_t i; virDomainObjPtr vm = NULL; unsigned long long val; int ret = -1; @@ -1846,7 +1846,7 @@ lxcDomainSetSchedulerParametersFlags(virDomainPtr dom, unsigned int flags) { virLXCDriverPtr driver = dom->conn->privateData; - int i; + size_t i; virDomainObjPtr vm = NULL; virDomainDefPtr vmdef = NULL; int ret = -1; @@ -2101,7 +2101,7 @@ lxcDomainSetBlkioParameters(virDomainPtr dom, unsigned int flags) { virLXCDriverPtr driver = dom->conn->privateData; - int i; + size_t i; virDomainObjPtr vm = NULL; virDomainDefPtr persistentDef = NULL; int ret = -1; @@ -2200,7 +2200,7 @@ lxcDomainGetBlkioParameters(virDomainPtr dom, unsigned int flags) { virLXCDriverPtr driver = dom->conn->privateData; - int i; + size_t i; virDomainObjPtr vm = NULL; virDomainDefPtr persistentDef = NULL; unsigned int val; @@ -2305,7 +2305,7 @@ lxcDomainInterfaceStats(virDomainPtr dom, { virLXCDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm; - int i; + size_t i; int ret = -1; lxcDriverLock(driver); @@ -3879,7 +3879,7 @@ lxcDomainDetachDeviceDiskLive(virDomainObjPtr vm, { virLXCDomainObjPrivatePtr priv = vm->privateData; virDomainDiskDefPtr def = NULL; - int i, ret = -1; + int idx, ret = -1; char *dst = NULL; if (!priv->initpid) { @@ -3888,15 +3888,15 @@ lxcDomainDetachDeviceDiskLive(virDomainObjPtr vm, goto cleanup; } - if ((i = virDomainDiskIndexByName(vm->def, - dev->data.disk->dst, - false)) < 0) { + if ((idx = virDomainDiskIndexByName(vm->def, + dev->data.disk->dst, + false)) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, _("disk %s not found"), dev->data.disk->dst); goto cleanup; } - def = vm->def->disks[i]; + def = vm->def->disks[idx]; if (virAsprintf(&dst, "/proc/%llu/root/dev/%s", (unsigned long long)priv->initpid, def->dst) < 0) { @@ -3923,7 +3923,7 @@ lxcDomainDetachDeviceDiskLive(virDomainObjPtr vm, VIR_WARN("cannot deny device %s for domain %s", def->src, vm->def->name); - virDomainDiskRemove(vm->def, i); + virDomainDiskRemove(vm->def, idx); virDomainDiskDefFree(def); ret = 0; @@ -4079,7 +4079,7 @@ lxcDomainDetachDeviceHostdevStorageLive(virDomainObjPtr vm, { virLXCDomainObjPrivatePtr priv = vm->privateData; virDomainHostdevDefPtr def = NULL; - int i, ret = -1; + int idx, ret = -1; char *dst = NULL; if (!priv->initpid) { @@ -4088,9 +4088,9 @@ lxcDomainDetachDeviceHostdevStorageLive(virDomainObjPtr vm, goto cleanup; } - if ((i = virDomainHostdevFind(vm->def, - dev->data.hostdev, - &def)) < 0) { + if ((idx = virDomainHostdevFind(vm->def, + dev->data.hostdev, + &def)) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, _("hostdev %s not found"), dev->data.hostdev->source.caps.u.storage.block); @@ -4123,7 +4123,7 @@ lxcDomainDetachDeviceHostdevStorageLive(virDomainObjPtr vm, VIR_WARN("cannot deny device %s for domain %s", def->source.caps.u.storage.block, vm->def->name); - virDomainHostdevRemove(vm->def, i); + virDomainHostdevRemove(vm->def, idx); virDomainHostdevDefFree(def); ret = 0; @@ -4140,7 +4140,7 @@ lxcDomainDetachDeviceHostdevMiscLive(virDomainObjPtr vm, { virLXCDomainObjPrivatePtr priv = vm->privateData; virDomainHostdevDefPtr def = NULL; - int i, ret = -1; + int idx, ret = -1; char *dst = NULL; if (!priv->initpid) { @@ -4149,9 +4149,9 @@ lxcDomainDetachDeviceHostdevMiscLive(virDomainObjPtr vm, goto cleanup; } - if ((i = virDomainHostdevFind(vm->def, - dev->data.hostdev, - &def)) < 0) { + if ((idx = virDomainHostdevFind(vm->def, + dev->data.hostdev, + &def)) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, _("hostdev %s not found"), dev->data.hostdev->source.caps.u.misc.chardev); @@ -4184,7 +4184,7 @@ lxcDomainDetachDeviceHostdevMiscLive(virDomainObjPtr vm, VIR_WARN("cannot deny device %s for domain %s", def->source.caps.u.misc.chardev, vm->def->name); - virDomainHostdevRemove(vm->def, i); + virDomainHostdevRemove(vm->def, idx); virDomainHostdevDefFree(def); ret = 0; diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 990decb..7f65af2 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -221,7 +221,7 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver, virDomainObjPtr vm, virDomainShutoffReason reason) { - int i; + size_t i; virLXCDomainObjPrivatePtr priv = vm->privateData; virNetDevVPortProfilePtr vport = NULL; -- 1.8.1.4

From: "Daniel P. Berrange" <berrange@redhat.com> 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> --- src/locking/domain_lock.c | 6 +++--- src/locking/lock_driver.h | 2 +- src/locking/lock_driver_lockd.c | 6 +++--- src/locking/lock_driver_sanlock.c | 10 +++++----- src/locking/lock_manager.c | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/locking/domain_lock.c b/src/locking/domain_lock.c index d79aeac..5e02400 100644 --- a/src/locking/domain_lock.c +++ b/src/locking/domain_lock.c @@ -102,7 +102,7 @@ static virLockManagerPtr virDomainLockManagerNew(virLockManagerPluginPtr plugin, bool withResources) { virLockManagerPtr lock; - int i; + size_t i; virLockManagerParam params[] = { { .type = VIR_LOCK_MANAGER_PARAM_TYPE_UUID, .key = "uuid", @@ -113,11 +113,11 @@ static virLockManagerPtr virDomainLockManagerNew(virLockManagerPluginPtr plugin, }, { .type = VIR_LOCK_MANAGER_PARAM_TYPE_UINT, .key = "id", - .value = { .i = dom->def->id }, + .value = { .iv = dom->def->id }, }, { .type = VIR_LOCK_MANAGER_PARAM_TYPE_UINT, .key = "pid", - .value = { .i = dom->pid }, + .value = { .iv = dom->pid }, }, { .type = VIR_LOCK_MANAGER_PARAM_TYPE_CSTRING, .key = "uri", diff --git a/src/locking/lock_driver.h b/src/locking/lock_driver.h index c4b162c..a7d9782 100644 --- a/src/locking/lock_driver.h +++ b/src/locking/lock_driver.h @@ -80,7 +80,7 @@ struct _virLockManagerParam { int type; const char *key; union { - int i; + int iv; long long l; unsigned int ui; unsigned long long ul; diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c index cc3b6b1..7c5e6b0 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -466,9 +466,9 @@ static int virLockManagerLockDaemonNew(virLockManagerPtr lock, if (VIR_STRDUP(priv->name, params[i].value.str) < 0) return -1; } else if (STREQ(params[i].key, "id")) { - priv->id = params[i].value.i; + priv->id = params[i].value.iv; } else if (STREQ(params[i].key, "pid")) { - priv->pid = params[i].value.i; + priv->pid = params[i].value.iv; } else if (STREQ(params[i].key, "uri")) { /* ignored */ } else { @@ -517,7 +517,7 @@ static char *virLockManagerLockDaemonDiskLeaseName(const char *path) { unsigned char buf[SHA256_DIGEST_SIZE]; char *ret; - int i; + size_t i; if (!(sha256_buffer(path, strlen(path), buf))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index de14725..33b042d 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -451,7 +451,7 @@ static int virLockManagerSanlockNew(virLockManagerPtr lock, { virLockManagerParamPtr param; virLockManagerSanlockPrivatePtr priv; - int i; + size_t i; virCheckFlags(0, -1); @@ -506,7 +506,7 @@ error: static void virLockManagerSanlockFree(virLockManagerPtr lock) { virLockManagerSanlockPrivatePtr priv = lock->privateData; - int i; + size_t i; if (!priv) return; @@ -526,7 +526,7 @@ static int virLockManagerSanlockDiskLeaseName(const char *path, size_t strbuflen) { unsigned char buf[MD5_DIGEST_SIZE]; - int i; + size_t i; if (strbuflen < ((MD5_DIGEST_SIZE * 2) + 1)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -557,7 +557,7 @@ static int virLockManagerSanlockAddLease(virLockManagerPtr lock, virLockManagerSanlockPrivatePtr priv = lock->privateData; int ret = -1; struct sanlk_resource *res = NULL; - int i; + size_t i; if (VIR_ALLOC_VAR(res, struct sanlk_disk, 1) < 0) { virReportOOMError(); @@ -905,7 +905,7 @@ static int virLockManagerSanlockAcquire(virLockManagerPtr lock, bool res_free = false; int sock = -1; int rv; - int i; + size_t i; virCheckFlags(VIR_LOCK_MANAGER_ACQUIRE_RESTRICT | VIR_LOCK_MANAGER_ACQUIRE_REGISTER_ONLY, -1); diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c index 7c30c6f..8ab5efe 100644 --- a/src/locking/lock_manager.c +++ b/src/locking/lock_manager.c @@ -77,12 +77,12 @@ virLockManagerSetPluginDir(const char *dir) static void virLockManagerLogParams(size_t nparams, virLockManagerParamPtr params) { - int i; + size_t i; char uuidstr[VIR_UUID_STRING_BUFLEN]; for (i = 0; i < nparams; i++) { switch (params[i].type) { case VIR_LOCK_MANAGER_PARAM_TYPE_INT: - VIR_DEBUG(" key=%s type=int value=%d", params[i].key, params[i].value.i); + VIR_DEBUG(" key=%s type=int value=%d", params[i].key, params[i].value.iv); break; case VIR_LOCK_MANAGER_PARAM_TYPE_UINT: VIR_DEBUG(" key=%s type=uint value=%u", params[i].key, params[i].value.ui); -- 1.8.1.4

From: "Daniel P. Berrange" <berrange@redhat.com> 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> --- src/libxl/libxl_conf.c | 12 ++++++------ src/libxl/libxl_driver.c | 34 ++++++++++++++++++---------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index e170357..aa0588d 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -71,7 +71,7 @@ libxlBuildCapabilities(virArch hostarch, int nr_guest_archs) { virCapsPtr caps; - int i; + size_t i; if ((caps = virCapabilitiesNew(hostarch, 1, 1)) == NULL) goto no_memory; @@ -168,7 +168,7 @@ libxlMakeCapabilitiesInternal(virArch hostarch, char *str, *token; regmatch_t subs[4]; char *saveptr = NULL; - int i; + size_t i; int host_pae = 0; struct guest_arch guest_archs[32]; @@ -336,7 +336,7 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, libxl_domain_config *d_config) { libxl_domain_build_info *b_info = &d_config->b_info; int hvm = STREQ(def->os.type, "hvm"); - int i; + size_t i; libxl_domain_build_info_init(b_info); @@ -574,7 +574,7 @@ libxlMakeDiskList(virDomainDefPtr def, libxl_domain_config *d_config) virDomainDiskDefPtr *l_disks = def->disks; int ndisks = def->ndisks; libxl_device_disk *x_disks; - int i; + size_t i; if (VIR_ALLOC_N(x_disks, ndisks) < 0) { virReportOOMError(); @@ -646,7 +646,7 @@ libxlMakeNicList(virDomainDefPtr def, libxl_domain_config *d_config) virDomainNetDefPtr *l_nics = def->nets; int nnics = def->nnets; libxl_device_nic *x_nics; - int i; + size_t i; if (VIR_ALLOC_N(x_nics, nnics) < 0) { virReportOOMError(); @@ -729,7 +729,7 @@ libxlMakeVfbList(libxlDriverPrivatePtr driver, int nvfbs = def->ngraphics; libxl_device_vfb *x_vfbs; libxl_device_vkb *x_vkbs; - int i; + size_t i; if (nvfbs == 0) return 0; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index ededbbc..0de4e9e 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -639,7 +639,7 @@ libxlVmCleanup(libxlDriverPrivatePtr driver, libxlDomainObjPrivatePtr priv = vm->privateData; int vnc_port; char *file; - int i; + size_t i; if (priv->deathW) { libxl_evdisable_domain_death(priv->ctx, priv->deathW); @@ -833,7 +833,8 @@ libxlDomainSetVcpuAffinities(libxlDriverPrivatePtr driver, virDomainObjPtr vm) uint8_t *cpumap = NULL; virNodeInfo nodeinfo; size_t cpumaplen; - int vcpu, i; + int vcpu; + size_t i; int ret = -1; if (libxlDoNodeGetInfo(driver, &nodeinfo) < 0) @@ -881,7 +882,7 @@ libxlFreeMem(libxlDomainObjPrivatePtr priv, libxl_domain_config *d_config) { uint32_t needed_mem; uint32_t free_mem; - int i; + size_t i; int ret = -1; int tries = 3; int wait_secs = 10; @@ -2733,7 +2734,8 @@ libxlDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, libxl_bitmap map; uint8_t *bitmask = NULL; unsigned int maplen; - unsigned int i, pos; + size_t i; + unsigned int pos; int max; int ret = -1; @@ -3005,7 +3007,7 @@ libxlDomainGetVcpus(virDomainPtr dom, virVcpuInfoPtr info, int maxinfo, int ret = -1; libxl_vcpuinfo *vcpuinfo; int maxcpu, hostcpus; - unsigned int i; + size_t i; unsigned char *cpumap; libxlDriverLock(driver); @@ -3417,7 +3419,7 @@ libxlDomainChangeEjectableMedia(libxlDomainObjPrivatePtr priv, { virDomainDiskDefPtr origdisk = NULL; libxl_device_disk x_disk; - int i; + size_t i; int ret = -1; for (i = 0; i < vm->def->ndisks; i++) { @@ -3533,22 +3535,22 @@ libxlDomainDetachDeviceDiskLive(libxlDomainObjPrivatePtr priv, { virDomainDiskDefPtr l_disk = NULL; libxl_device_disk x_disk; - int i; + int idx; int ret = -1; switch (dev->data.disk->device) { case VIR_DOMAIN_DISK_DEVICE_DISK: if (dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_XEN) { - if ((i = virDomainDiskIndexByName(vm->def, - dev->data.disk->dst, - false)) < 0) { + if ((idx = virDomainDiskIndexByName(vm->def, + dev->data.disk->dst, + false)) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, _("disk %s not found"), dev->data.disk->dst); goto cleanup; } - l_disk = vm->def->disks[i]; + l_disk = vm->def->disks[idx]; if (libxlMakeDisk(l_disk, &x_disk) < 0) goto cleanup; @@ -3561,7 +3563,7 @@ libxlDomainDetachDeviceDiskLive(libxlDomainObjPrivatePtr priv, goto cleanup; } - virDomainDiskRemove(vm->def, i); + virDomainDiskRemove(vm->def, idx); virDomainDiskDefFree(l_disk); } else { @@ -3718,18 +3720,18 @@ libxlDomainUpdateDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev) { virDomainDiskDefPtr orig; virDomainDiskDefPtr disk; - int i; + int idx; int ret = -1; switch (dev->type) { case VIR_DOMAIN_DEVICE_DISK: disk = dev->data.disk; - if ((i = virDomainDiskIndexByName(vmdef, disk->dst, false)) < 0) { + if ((idx = virDomainDiskIndexByName(vmdef, disk->dst, false)) < 0) { virReportError(VIR_ERR_INVALID_ARG, _("target %s doesn't exist."), disk->dst); goto cleanup; } - orig = vmdef->disks[i]; + orig = vmdef->disks[idx]; if (!(orig->device == VIR_DOMAIN_DISK_DEVICE_CDROM)) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("this disk doesn't support update")); @@ -4441,7 +4443,7 @@ libxlDomainSetSchedulerParametersFlags(virDomainPtr dom, virDomainObjPtr vm; libxl_domain_sched_params sc_info; int sched_id; - int i; + size_t i; int ret = -1; virCheckFlags(0, -1); -- 1.8.1.4

From: "Daniel P. Berrange" <berrange@redhat.com> 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> --- src/network/bridge_driver.c | 281 +++++++++++++++++++++++--------------------- 1 file changed, 144 insertions(+), 137 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index d7e90ac..80f9a13 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -262,7 +262,7 @@ networkBridgeDummyNicName(const char *brname) static void networkFindActiveConfigs(struct network_driver *driver) { - unsigned int i; + size_t i; for (i = 0; i < driver->networks.count; i++) { virNetworkObjPtr obj = driver->networks.objs[i]; @@ -315,7 +315,7 @@ networkFindActiveConfigs(struct network_driver *driver) static void networkAutostartConfigs(struct network_driver *driver) { - unsigned int i; + size_t i; for (i = 0; i < driver->networks.count; i++) { virNetworkObjLock(driver->networks.objs[i]); @@ -544,7 +544,8 @@ networkStateCleanup(void) { static int networkKillDaemon(pid_t pid, const char *daemonName, const char *networkName) { - int ii, ret = -1; + size_t i; + int ret = -1; const char *signame = "TERM"; /* send SIGTERM, then wait up to 3 seconds for the process to @@ -552,11 +553,11 @@ networkKillDaemon(pid_t pid, const char *daemonName, const char *networkName) * seconds. If that fails, log a warning and continue, hoping * for the best. */ - for (ii = 0; ii < 25; ii++) { + for (i = 0; i < 25; i++) { int signum = 0; - if (ii == 0) + if (i == 0) signum = SIGTERM; - else if (ii == 15) { + else if (i == 15) { signum = SIGKILL; signame = "KILL"; } @@ -604,7 +605,7 @@ static int networkBuildDnsmasqDhcpHostsList(dnsmasqContext *dctx, virNetworkIpDefPtr ipdef) { - unsigned int i; + size_t i; bool ipv6 = false; if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET6)) @@ -624,7 +625,7 @@ static int networkBuildDnsmasqHostsList(dnsmasqContext *dctx, virNetworkDNSDefPtr dnsdef) { - unsigned int i, j; + size_t i, j; if (dnsdef) { for (i = 0; i < dnsdef->nhosts; i++) { @@ -651,7 +652,7 @@ networkDnsmasqConfContents(virNetworkObjPtr network, virBuffer configbuf = VIR_BUFFER_INITIALIZER; int r, ret = -1; int nbleases = 0; - int ii; + size_t i; char *record = NULL; char *recordPort = NULL; char *recordWeight = NULL; @@ -728,9 +729,9 @@ networkDnsmasqConfContents(virNetworkObjPtr network, * * So listen on all defined IPv[46] addresses */ - for (ii = 0; - (tmpipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, ii)); - ii++) { + for (i = 0; + (tmpipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, i)); + i++) { char *ipaddr = virSocketAddrFormat(&tmpipdef->address); if (!ipaddr) @@ -776,38 +777,38 @@ networkDnsmasqConfContents(virNetworkObjPtr network, "no-resolv\n"); } - for (ii = 0; ii < dns->ntxts; ii++) { + for (i = 0; i < dns->ntxts; i++) { virBufferAsprintf(&configbuf, "txt-record=%s,%s\n", - dns->txts[ii].name, - dns->txts[ii].value); + dns->txts[i].name, + dns->txts[i].value); } - for (ii = 0; ii < dns->nsrvs; ii++) { - if (dns->srvs[ii].service && dns->srvs[ii].protocol) { - if (dns->srvs[ii].port) { - if (virAsprintf(&recordPort, "%d", dns->srvs[ii].port) < 0) { + for (i = 0; i < dns->nsrvs; i++) { + if (dns->srvs[i].service && dns->srvs[i].protocol) { + if (dns->srvs[i].port) { + if (virAsprintf(&recordPort, "%d", dns->srvs[i].port) < 0) { virReportOOMError(); goto cleanup; } } - if (dns->srvs[ii].priority) { - if (virAsprintf(&recordPriority, "%d", dns->srvs[ii].priority) < 0) { + if (dns->srvs[i].priority) { + if (virAsprintf(&recordPriority, "%d", dns->srvs[i].priority) < 0) { virReportOOMError(); goto cleanup; } } - if (dns->srvs[ii].weight) { - if (virAsprintf(&recordWeight, "%d", dns->srvs[ii].weight) < 0) { + if (dns->srvs[i].weight) { + if (virAsprintf(&recordWeight, "%d", dns->srvs[i].weight) < 0) { virReportOOMError(); goto cleanup; } } if (virAsprintf(&record, "%s.%s.%s,%s,%s,%s,%s", - dns->srvs[ii].service, - dns->srvs[ii].protocol, - dns->srvs[ii].domain ? dns->srvs[ii].domain : "", - dns->srvs[ii].target ? dns->srvs[ii].target : "", + dns->srvs[i].service, + dns->srvs[i].protocol, + dns->srvs[i].domain ? dns->srvs[i].domain : "", + dns->srvs[i].target ? dns->srvs[i].target : "", recordPort ? recordPort : "", recordPriority ? recordPriority : "", recordWeight ? recordWeight : "") < 0) { @@ -824,9 +825,9 @@ networkDnsmasqConfContents(virNetworkObjPtr network, } /* Find the first dhcp for both IPv4 and IPv6 */ - for (ii = 0, ipv4def = NULL, ipv6def = NULL, ipv6SLAAC = false; - (ipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, ii)); - ii++) { + for (i = 0, ipv4def = NULL, ipv6def = NULL, ipv6SLAAC = false; + (ipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, i)); + i++) { if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) { if (ipdef->nranges || ipdef->nhosts) { if (ipv4def) { @@ -978,9 +979,9 @@ networkDnsmasqConfContents(virNetworkObjPtr network, if (ipv6def) virBufferAddLit(&configbuf, "enable-ra\n"); else { - for (ii = 0; - (ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET6, ii)); - ii++) { + for (i = 0; + (ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET6, i)); + i++) { if (!(ipdef->nranges || ipdef->nhosts)) { char *bridgeaddr = virSocketAddrFormat(&ipdef->address); if (!bridgeaddr) @@ -1141,7 +1142,8 @@ static int networkRefreshDhcpDaemon(struct network_driver *driver, virNetworkObjPtr network) { - int ret = -1, ii; + int ret = -1; + size_t i; virNetworkIpDefPtr ipdef, ipv4def, ipv6def; dnsmasqContext *dctx = NULL; @@ -1164,17 +1166,17 @@ networkRefreshDhcpDaemon(struct network_driver *driver, * and on one IPv6 subnetwork. */ ipv4def = NULL; - for (ii = 0; - (ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET, ii)); - ii++) { + for (i = 0; + (ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET, i)); + i++) { if (!ipv4def && (ipdef->nranges || ipdef->nhosts)) ipv4def = ipdef; } ipv6def = NULL; - for (ii = 0; - (ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET6, ii)); - ii++) { + for (i = 0; + (ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET6, i)); + i++) { if (!ipv6def && (ipdef->nranges || ipdef->nhosts)) ipv6def = ipdef; } @@ -1228,16 +1230,17 @@ static int networkRadvdConfContents(virNetworkObjPtr network, char **configstr) { virBuffer configbuf = VIR_BUFFER_INITIALIZER; - int ret = -1, ii; + int ret = -1; + size_t i; virNetworkIpDefPtr ipdef; bool v6present = false, dhcp6 = false; *configstr = NULL; /* Check if DHCPv6 is needed */ - for (ii = 0; - (ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET6, ii)); - ii++) { + for (i = 0; + (ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET6, i)); + i++) { v6present = true; if (ipdef->nranges || ipdef->nhosts) { dhcp6 = true; @@ -1265,9 +1268,9 @@ networkRadvdConfContents(virNetworkObjPtr network, char **configstr) dhcp6 ? "\n" : radvd1); /* add a section for each IPv6 address in the config */ - for (ii = 0; - (ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET6, ii)); - ii++) { + for (i = 0; + (ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET6, i)); + i++) { int prefix; char *netaddr; @@ -1510,7 +1513,7 @@ networkRestartRadvd(struct network_driver *driver, static void networkRefreshDaemons(struct network_driver *driver) { - unsigned int i; + size_t i; VIR_INFO("Refreshing network daemons"); @@ -1887,14 +1890,14 @@ networkRemoveGeneralIp6tablesRules(virNetworkObjPtr network) static int networkAddGeneralIptablesRules(virNetworkObjPtr network) { - int ii; + size_t i; virNetworkIpDefPtr ipv4def; /* First look for first IPv4 address that has dhcp or tftpboot defined. */ /* We support dhcp config on 1 IPv4 interface only. */ - for (ii = 0; - (ipv4def = virNetworkDefGetIpByIndex(network->def, AF_INET, ii)); - ii++) { + for (i = 0; + (ipv4def = virNetworkDefGetIpByIndex(network->def, AF_INET, i)); + i++) { if (ipv4def->nranges || ipv4def->nhosts || ipv4def->tftproot) break; } @@ -2009,14 +2012,14 @@ err1: static void networkRemoveGeneralIptablesRules(virNetworkObjPtr network) { - int ii; + size_t i; virNetworkIpDefPtr ipv4def; networkRemoveGeneralIp6tablesRules(network); - for (ii = 0; - (ipv4def = virNetworkDefGetIpByIndex(network->def, AF_INET, ii)); - ii++) { + for (i = 0; + (ipv4def = virNetworkDefGetIpByIndex(network->def, AF_INET, i)); + i++) { if (ipv4def->nranges || ipv4def->nhosts || ipv4def->tftproot) break; } @@ -2073,7 +2076,7 @@ networkRemoveIpSpecificIptablesRules(virNetworkObjPtr network, static int networkAddIptablesRules(virNetworkObjPtr network) { - int ii; + size_t i, j; virNetworkIpDefPtr ipdef; virErrorPtr orig_error; @@ -2081,9 +2084,9 @@ networkAddIptablesRules(virNetworkObjPtr network) if (networkAddGeneralIptablesRules(network) < 0) return -1; - for (ii = 0; - (ipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, ii)); - ii++) { + for (i = 0; + (ipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, i)); + i++) { /* Add address-specific iptables rules */ if (networkAddIpSpecificIptablesRules(network, ipdef) < 0) { goto err; @@ -2099,9 +2102,9 @@ err: * have removed any rules it created, but we need to remove those * added for previous IP addresses. */ - while ((--ii >= 0) && - (ipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, ii))) { - networkRemoveIpSpecificIptablesRules(network, ipdef); + for (j = 0; j < i; j++) { + if ((ipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, j))) + networkRemoveIpSpecificIptablesRules(network, ipdef); } networkRemoveGeneralIptablesRules(network); @@ -2115,12 +2118,12 @@ err: static void networkRemoveIptablesRules(virNetworkObjPtr network) { - int ii; + size_t i; virNetworkIpDefPtr ipdef; - for (ii = 0; - (ipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, ii)); - ii++) { + for (i = 0; + (ipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, i)); + i++) { networkRemoveIpSpecificIptablesRules(network, ipdef); } networkRemoveGeneralIptablesRules(network); @@ -2129,7 +2132,7 @@ networkRemoveIptablesRules(virNetworkObjPtr network) static void networkReloadIptablesRules(struct network_driver *driver) { - unsigned int i; + size_t i; VIR_INFO("Reloading iptables rules"); @@ -2276,7 +2279,8 @@ networkCheckRouteCollision(virNetworkObjPtr network) char iface[17], dest[128], mask[128]; unsigned int addr_val, mask_val; virNetworkIpDefPtr ipdef; - int num, ii; + int num; + size_t i; /* NUL-terminate the line, so sscanf doesn't go beyond a newline. */ char *nl = strchr(cur, '\n'); @@ -2305,9 +2309,9 @@ networkCheckRouteCollision(virNetworkObjPtr network) addr_val &= mask_val; - for (ii = 0; - (ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET, ii)); - ii++) { + for (i = 0; + (ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET, i)); + i++) { unsigned int net_dest; virSocketAddr netmask; @@ -2411,7 +2415,7 @@ static int networkStartNetworkVirtual(struct network_driver *driver, virNetworkObjPtr network) { - int ii; + size_t i; bool v4present = false, v6present = false; virErrorPtr save_err = NULL; virNetworkIpDefPtr ipdef; @@ -2474,9 +2478,9 @@ networkStartNetworkVirtual(struct network_driver *driver, if (networkAddIptablesRules(network) < 0) goto err1; - for (ii = 0; - (ipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, ii)); - ii++) { + for (i = 0; + (ipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, i)); + i++) { if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) v4present = true; if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET6)) @@ -2492,8 +2496,8 @@ networkStartNetworkVirtual(struct network_driver *driver, if (virNetDevSetOnline(network->def->bridge, 1) < 0) goto err2; - for (ii = 0; ii < network->def->nroutes; ii++) { - routedef = &network->def->routes[ii]; + for (i = 0; i < network->def->nroutes; i++) { + routedef = &network->def->routes[i]; /* Add the IP route to the bridge */ /* ignore errors, error msg will be generated */ /* but libvirt will not know and net-destroy will work. */ @@ -3019,7 +3023,7 @@ networkValidate(struct network_driver *driver, virNetworkDefPtr def, bool check_active) { - int ii; + size_t i; bool vlanUsed, vlanAllowed, badVlanUse = false; virPortGroupDefPtr defaultPortGroup = NULL; virNetworkIpDefPtr ipdef; @@ -3073,9 +3077,9 @@ networkValidate(struct network_driver *driver, /* We only support dhcp on one IPv4 address and * on one IPv6 address per defined network */ - for (ii = 0; - (ipdef = virNetworkDefGetIpByIndex(def, AF_UNSPEC, ii)); - ii++) { + for (i = 0; + (ipdef = virNetworkDefGetIpByIndex(def, AF_UNSPEC, i)); + i++) { if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) { if (ipdef->nranges || ipdef->nhosts) { if (ipv4def) { @@ -3116,16 +3120,16 @@ networkValidate(struct network_driver *driver, def->forward.type == VIR_NETWORK_FORWARD_HOSTDEV); vlanUsed = def->vlan.nTags > 0; - for (ii = 0; ii < def->nPortGroups; ii++) { - if (vlanUsed || def->portGroups[ii].vlan.nTags > 0) { + for (i = 0; i < def->nPortGroups; i++) { + if (vlanUsed || def->portGroups[i].vlan.nTags > 0) { /* anyone using this portgroup will get a vlan tag. Verify * that they will also be using an openvswitch connection, * as that is the only type of network that currently * supports a vlan tag. */ - if (def->portGroups[ii].virtPortProfile) { + if (def->portGroups[i].virtPortProfile) { if (def->forward.type != VIR_NETWORK_FORWARD_BRIDGE || - def->portGroups[ii].virtPortProfile->virtPortType + def->portGroups[i].virtPortProfile->virtPortType != VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) { badVlanUse = true; } @@ -3134,17 +3138,17 @@ networkValidate(struct network_driver *driver, badVlanUse = true; } } - if (def->portGroups[ii].isDefault) { + if (def->portGroups[i].isDefault) { if (defaultPortGroup) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("network '%s' has multiple default " "<portgroup> elements (%s and %s), " "but only one default is allowed"), def->name, defaultPortGroup->name, - def->portGroups[ii].name); + def->portGroups[i].name); return -1; } - defaultPortGroup = &def->portGroups[ii]; + defaultPortGroup = &def->portGroups[i]; } } if (badVlanUse || @@ -3323,7 +3327,8 @@ networkUpdate(virNetworkPtr net, { struct network_driver *driver = net->conn->networkPrivateData; virNetworkObjPtr network = NULL; - int isActive, ret = -1, ii; + int isActive, ret = -1; + size_t i; virNetworkIpDefPtr ipdef; bool oldDhcpActive = false; @@ -3345,9 +3350,9 @@ networkUpdate(virNetworkPtr net, goto cleanup; /* see if we are listening for dhcp pre-modification */ - for (ii = 0; - (ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET, ii)); - ii++) { + for (i = 0; + (ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET, i)); + i++) { if (ipdef->nranges || ipdef->nhosts) { oldDhcpActive = true; break; @@ -3403,9 +3408,9 @@ networkUpdate(virNetworkPtr net, */ bool newDhcpActive = false; - for (ii = 0; - (ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET, ii)); - ii++) { + for (i = 0; + (ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET, i)); + i++) { if (ipdef->nranges || ipdef->nhosts) { newDhcpActive = true; break; @@ -3757,7 +3762,7 @@ networkCreateInterfacePool(virNetworkDefPtr netdef) { unsigned int num_virt_fns = 0; char **vfname = NULL; virPCIDeviceAddressPtr *virt_fns; - int ret = -1, ii = 0; + int ret = -1, i = 0; if ((virNetDevGetVirtualFunctions(netdef->forward.pfs->dev, &vfname, &virt_fns, &num_virt_fns)) < 0) { @@ -3781,14 +3786,14 @@ networkCreateInterfacePool(virNetworkDefPtr netdef) { netdef->forward.nifs = num_virt_fns; - for (ii = 0; ii < netdef->forward.nifs; ii++) { + for (i = 0; i < netdef->forward.nifs; i++) { if ((netdef->forward.type == VIR_NETWORK_FORWARD_BRIDGE) || (netdef->forward.type == VIR_NETWORK_FORWARD_PRIVATE) || (netdef->forward.type == VIR_NETWORK_FORWARD_VEPA) || (netdef->forward.type == VIR_NETWORK_FORWARD_PASSTHROUGH)) { - netdef->forward.ifs[ii].type = VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_NETDEV; - if (vfname[ii]) { - if (VIR_STRDUP(netdef->forward.ifs[ii].device.dev, vfname[ii]) < 0) + netdef->forward.ifs[i].type = VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_NETDEV; + if (vfname[i]) { + if (VIR_STRDUP(netdef->forward.ifs[i].device.dev, vfname[i]) < 0) goto finish; } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -3798,19 +3803,19 @@ networkCreateInterfacePool(virNetworkDefPtr netdef) { } else if (netdef->forward.type == VIR_NETWORK_FORWARD_HOSTDEV) { /* VF's are always PCI devices */ - netdef->forward.ifs[ii].type = VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_PCI; - netdef->forward.ifs[ii].device.pci.domain = virt_fns[ii]->domain; - netdef->forward.ifs[ii].device.pci.bus = virt_fns[ii]->bus; - netdef->forward.ifs[ii].device.pci.slot = virt_fns[ii]->slot; - netdef->forward.ifs[ii].device.pci.function = virt_fns[ii]->function; + netdef->forward.ifs[i].type = VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_PCI; + netdef->forward.ifs[i].device.pci.domain = virt_fns[i]->domain; + netdef->forward.ifs[i].device.pci.bus = virt_fns[i]->bus; + netdef->forward.ifs[i].device.pci.slot = virt_fns[i]->slot; + netdef->forward.ifs[i].device.pci.function = virt_fns[i]->function; } } ret = 0; finish: - for (ii = 0; ii < num_virt_fns; ii++) { - VIR_FREE(vfname[ii]); - VIR_FREE(virt_fns[ii]); + for (i = 0; i < num_virt_fns; i++) { + VIR_FREE(vfname[i]); + VIR_FREE(virt_fns[i]); } VIR_FREE(vfname); VIR_FREE(virt_fns); @@ -3840,7 +3845,7 @@ networkAllocateActualDevice(virDomainNetDefPtr iface) virNetDevVPortProfilePtr virtport = iface->virtPortProfile; virNetDevVlanPtr vlan = NULL; virNetworkForwardIfDefPtr dev = NULL; - int ii; + size_t i; int ret = -1; if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK) @@ -3977,9 +3982,9 @@ networkAllocateActualDevice(virDomainNetDefPtr iface) } /* pick first dev with 0 connections */ - for (ii = 0; ii < netdef->forward.nifs; ii++) { - if (netdef->forward.ifs[ii].connections == 0) { - dev = &netdef->forward.ifs[ii]; + for (i = 0; i < netdef->forward.nifs; i++) { + if (netdef->forward.ifs[i].connections == 0) { + dev = &netdef->forward.ifs[i]; break; } } @@ -4130,18 +4135,18 @@ networkAllocateActualDevice(virDomainNetDefPtr iface) == VIR_NETDEV_VPORT_PROFILE_8021QBH))) { /* pick first dev with 0 connections */ - for (ii = 0; ii < netdef->forward.nifs; ii++) { - if (netdef->forward.ifs[ii].connections == 0) { - dev = &netdef->forward.ifs[ii]; + for (i = 0; i < netdef->forward.nifs; i++) { + if (netdef->forward.ifs[i].connections == 0) { + dev = &netdef->forward.ifs[i]; break; } } } else { /* pick least used dev */ dev = &netdef->forward.ifs[0]; - for (ii = 1; ii < netdef->forward.nifs; ii++) { - if (netdef->forward.ifs[ii].connections < dev->connections) - dev = &netdef->forward.ifs[ii]; + for (i = 1; i < netdef->forward.nifs; i++) { + if (netdef->forward.ifs[i].connections < dev->connections) + dev = &netdef->forward.ifs[i]; } } /* dev points at the physical device we want to use */ @@ -4245,7 +4250,8 @@ networkNotifyActualDevice(virDomainNetDefPtr iface) virNetworkObjPtr network; virNetworkDefPtr netdef; virNetworkForwardIfDefPtr dev = NULL; - int ii, ret = -1; + size_t i; + int ret = -1; if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK) return 0; @@ -4292,11 +4298,11 @@ networkNotifyActualDevice(virDomainNetDefPtr iface) } /* find the matching interface and increment its connections */ - for (ii = 0; ii < netdef->forward.nifs; ii++) { - if (netdef->forward.ifs[ii].type + for (i = 0; i < netdef->forward.nifs; i++) { + if (netdef->forward.ifs[i].type == VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_NETDEV && - STREQ(actualDev, netdef->forward.ifs[ii].device.dev)) { - dev = &netdef->forward.ifs[ii]; + STREQ(actualDev, netdef->forward.ifs[i].device.dev)) { + dev = &netdef->forward.ifs[i]; break; } } @@ -4343,12 +4349,12 @@ networkNotifyActualDevice(virDomainNetDefPtr iface) } /* find the matching interface and increment its connections */ - for (ii = 0; ii < netdef->forward.nifs; ii++) { - if (netdef->forward.ifs[ii].type + for (i = 0; i < netdef->forward.nifs; i++) { + if (netdef->forward.ifs[i].type == VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_PCI && virDevicePCIAddressEqual(&hostdev->source.subsys.u.pci.addr, - &netdef->forward.ifs[ii].device.pci)) { - dev = &netdef->forward.ifs[ii]; + &netdef->forward.ifs[i].device.pci)) { + dev = &netdef->forward.ifs[i]; break; } } @@ -4422,7 +4428,8 @@ networkReleaseActualDevice(virDomainNetDefPtr iface) virNetworkObjPtr network; virNetworkDefPtr netdef; virNetworkForwardIfDefPtr dev = NULL; - int ii, ret = -1; + size_t i; + int ret = -1; if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK) return 0; @@ -4470,11 +4477,11 @@ networkReleaseActualDevice(virDomainNetDefPtr iface) goto error; } - for (ii = 0; ii < netdef->forward.nifs; ii++) { - if (netdef->forward.ifs[ii].type + for (i = 0; i < netdef->forward.nifs; i++) { + if (netdef->forward.ifs[i].type == VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_NETDEV && - STREQ(actualDev, netdef->forward.ifs[ii].device.dev)) { - dev = &netdef->forward.ifs[ii]; + STREQ(actualDev, netdef->forward.ifs[i].device.dev)) { + dev = &netdef->forward.ifs[i]; break; } } @@ -4501,12 +4508,12 @@ networkReleaseActualDevice(virDomainNetDefPtr iface) goto error; } - for (ii = 0; ii < netdef->forward.nifs; ii++) { - if (netdef->forward.ifs[ii].type + for (i = 0; i < netdef->forward.nifs; i++) { + if (netdef->forward.ifs[i].type == VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_PCI && virDevicePCIAddressEqual(&hostdev->source.subsys.u.pci.addr, - &netdef->forward.ifs[ii].device.pci)) { - dev = &netdef->forward.ifs[ii]; + &netdef->forward.ifs[i].device.pci)) { + dev = &netdef->forward.ifs[i]; break; } } -- 1.8.1.4

From: "Daniel P. Berrange" <berrange@redhat.com> 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> --- src/interface/interface_backend_netcf.c | 6 +++--- src/interface/interface_backend_udev.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index 760540a..3b1d0bd 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -217,7 +217,7 @@ static int netcfConnectNumOfInterfacesImpl(virConnectPtr conn, int count; int want = 0; int ret = -1; - int i; + size_t i; char **names = NULL; /* List all interfaces, in case we might support new filter flags @@ -313,7 +313,7 @@ static int netcfConnectListInterfacesImpl(virConnectPtr conn, int count = 0; int want = 0; int ret = -1; - int i; + size_t i; char **allnames = NULL; count = ncf_num_of_interfaces(driver->netcf, status); @@ -483,7 +483,7 @@ netcfConnectListAllInterfaces(virConnectPtr conn, { struct interface_driver *driver = conn->interfacePrivateData; int count; - int i; + size_t i; struct netcf_if *iface = NULL; virInterfacePtr *tmp_iface_objs = NULL; virInterfacePtr iface_obj = NULL; diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 6270c9d..0e99ccb 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -641,7 +641,7 @@ udevGetIfaceDefBond(struct udev *udev, { struct dirent **slave_list = NULL; int slave_count = 0; - int i; + size_t i; const char *tmp_str; int tmp_int; @@ -872,7 +872,7 @@ udevGetIfaceDefBridge(struct udev *udev, char *member_path; const char *tmp_str; int stp; - int i; + size_t i; /* Set our type to Bridge */ ifacedef->type = VIR_INTERFACE_TYPE_BRIDGE; -- 1.8.1.4

From: "Daniel P. Berrange" <berrange@redhat.com> 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> --- src/cpu/cpu.c | 22 +++++++++++----------- src/cpu/cpu_generic.c | 6 +++--- src/cpu/cpu_powerpc.c | 2 +- src/cpu/cpu_x86.c | 26 +++++++++++++------------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index 68125a5..45725d7 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -50,8 +50,8 @@ static struct cpuArchDriver *drivers[] = { static struct cpuArchDriver * cpuGetSubDriver(virArch arch) { - unsigned int i; - unsigned int j; + size_t i; + size_t j; if (arch == VIR_ARCH_NONE) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -140,9 +140,9 @@ cpuDecode(virCPUDefPtr cpu, VIR_DEBUG("cpu=%p, data=%p, nmodels=%u, preferred=%s", cpu, data, nmodels, NULLSTR(preferred)); if (models) { - unsigned int i; + size_t i; for (i = 0; i < nmodels; i++) - VIR_DEBUG("models[%u]=%s", i, NULLSTR(models[i])); + VIR_DEBUG("models[%zu]=%s", i, NULLSTR(models[i])); } if (models == NULL && nmodels != 0) { @@ -284,16 +284,16 @@ cpuBaselineXML(const char **xmlCPUs, virCPUDefPtr *cpus = NULL; virCPUDefPtr cpu = NULL; char *cpustr; - unsigned int i; + size_t i; VIR_DEBUG("ncpus=%u, nmodels=%u", ncpus, nmodels); if (xmlCPUs) { for (i = 0; i < ncpus; i++) - VIR_DEBUG("xmlCPUs[%u]=%s", i, NULLSTR(xmlCPUs[i])); + VIR_DEBUG("xmlCPUs[%zu]=%s", i, NULLSTR(xmlCPUs[i])); } if (models) { for (i = 0; i < nmodels; i++) - VIR_DEBUG("models[%u]=%s", i, NULLSTR(models[i])); + VIR_DEBUG("models[%zu]=%s", i, NULLSTR(models[i])); } if (xmlCPUs == NULL && ncpus != 0) { @@ -356,16 +356,16 @@ cpuBaseline(virCPUDefPtr *cpus, unsigned int nmodels) { struct cpuArchDriver *driver; - unsigned int i; + size_t i; VIR_DEBUG("ncpus=%u, nmodels=%u", ncpus, nmodels); if (cpus) { for (i = 0; i < ncpus; i++) - VIR_DEBUG("cpus[%u]=%p", i, cpus[i]); + VIR_DEBUG("cpus[%zu]=%p", i, cpus[i]); } if (models) { for (i = 0; i < nmodels; i++) - VIR_DEBUG("models[%u]=%s", i, NULLSTR(models[i])); + VIR_DEBUG("models[%zu]=%s", i, NULLSTR(models[i])); } if (cpus == NULL && ncpus != 0) { @@ -448,7 +448,7 @@ cpuModelIsAllowed(const char *model, const char **models, unsigned int nmodels) { - unsigned int i; + size_t i; if (!models || !nmodels) return true; diff --git a/src/cpu/cpu_generic.c b/src/cpu/cpu_generic.c index 7e3eda2..1dbaaa7 100644 --- a/src/cpu/cpu_generic.c +++ b/src/cpu/cpu_generic.c @@ -37,7 +37,7 @@ static virHashTablePtr genericHashFeatures(virCPUDefPtr cpu) { virHashTablePtr hash; - unsigned int i; + size_t i; if ((hash = virHashCreate(cpu->nfeatures, NULL)) == NULL) return NULL; @@ -61,7 +61,7 @@ genericCompare(virCPUDefPtr host, { virHashTablePtr hash; virCPUCompareResult ret = VIR_CPU_COMPARE_ERROR; - unsigned int i; + size_t i; unsigned int reqfeatures; if (((cpu->arch != VIR_ARCH_NONE) && @@ -121,7 +121,7 @@ genericBaseline(virCPUDefPtr *cpus, virCPUFeatureDefPtr features = NULL; unsigned int nfeatures; unsigned int count; - unsigned int i, j; + size_t i, j; if (!cpuModelIsAllowed(cpus[0]->model, models, nmodels)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c index d17f9ca..1a2b41c 100644 --- a/src/cpu/cpu_powerpc.c +++ b/src/cpu/cpu_powerpc.c @@ -391,7 +391,7 @@ ppcBaseline(virCPUDefPtr *cpus, const struct ppc_model *model; const struct ppc_vendor *vendor = NULL; virCPUDefPtr cpu = NULL; - unsigned int i; + size_t i; if (!(map = ppcLoadMap())) goto error; diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 5d479c2..ce1e15f 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -185,7 +185,7 @@ x86DataCpuid(const union cpuData *data, { struct cpuX86cpuid *cpuids; int len; - unsigned int i; + size_t i; if (function < CPUX86_EXTENDED) { cpuids = data->x86.basic; @@ -221,7 +221,7 @@ static union cpuData * x86DataCopy(const union cpuData *data) { union cpuData *copy = NULL; - int i; + size_t i; if (VIR_ALLOC(copy) < 0 || VIR_ALLOC_N(copy->x86.basic, data->x86.basic_len) < 0 @@ -307,7 +307,7 @@ static int x86DataAdd(union cpuData *data1, const union cpuData *data2) { - unsigned int i; + size_t i; if (x86DataExpand(data1, data2->x86.basic_len - data1->x86.basic_len, @@ -332,7 +332,7 @@ static void x86DataSubtract(union cpuData *data1, const union cpuData *data2) { - unsigned int i; + size_t i; unsigned int len; len = MIN(data1->x86.basic_len, data2->x86.basic_len); @@ -656,7 +656,7 @@ x86FeatureLoad(xmlXPathContextPtr ctxt, xmlNodePtr ctxt_node = ctxt->node; struct x86_feature *feature; int ret = 0; - int i; + size_t i; int n; if (!(feature = x86FeatureNew())) @@ -695,7 +695,7 @@ x86FeatureLoad(xmlXPathContextPtr ctxt, if (ret_fun < 0 || ret_eax == -2 || ret_ebx == -2 || ret_ecx == -2 || ret_edx == -2) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid cpuid[%d] in %s feature"), i, feature->name); + _("Invalid cpuid[%zu] in %s feature"), i, feature->name); goto ignore; } @@ -803,7 +803,7 @@ x86ModelFromCPU(const virCPUDefPtr cpu, int policy) { struct x86_model *model = NULL; - int i; + size_t i; if (policy == VIR_CPU_FEATURE_REQUIRE) { if ((model = x86ModelFind(map, cpu->model)) == NULL) { @@ -854,7 +854,7 @@ x86ModelSubtractCPU(struct x86_model *model, const struct x86_map *map) { const struct x86_model *cpu_model; - unsigned int i; + size_t i; if (!(cpu_model = x86ModelFind(map, cpu->model))) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -936,7 +936,7 @@ x86ModelLoad(xmlXPathContextPtr ctxt, struct x86_model *model; char *vendor = NULL; int ret = 0; - int i; + size_t i; int n; if (!(model = x86ModelNew())) @@ -1154,7 +1154,7 @@ x86Compute(virCPUDefPtr host, struct x86_model *guest_model = NULL; virCPUCompareResult ret; enum compare_result result; - unsigned int i; + size_t i; if (cpu->arch != VIR_ARCH_NONE) { bool found = false; @@ -1309,7 +1309,7 @@ x86Decode(virCPUDefPtr cpu, const struct x86_model *candidate; virCPUDefPtr cpuCandidate; virCPUDefPtr cpuModel = NULL; - unsigned int i; + size_t i; if (data == NULL || (map = x86LoadMap()) == NULL) return -1; @@ -1615,7 +1615,7 @@ x86Baseline(virCPUDefPtr *cpus, struct x86_map *map = NULL; struct x86_model *base_model = NULL; virCPUDefPtr cpu = NULL; - unsigned int i; + size_t i; const struct x86_vendor *vendor = NULL; struct x86_model *model = NULL; bool outputVendor = true; @@ -1720,7 +1720,7 @@ x86UpdateCustom(virCPUDefPtr guest, const virCPUDefPtr host) { int ret = -1; - unsigned int i; + size_t i; struct x86_map *map; struct x86_model *host_model = NULL; -- 1.8.1.4

From: "Daniel P. Berrange" <berrange@redhat.com> 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> --- src/fdstream.c | 2 +- src/libvirt-lxc.c | 2 +- src/libvirt.c | 40 ++++++++++++++++++++++------------------ 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/fdstream.c b/src/fdstream.c index d5e5aaf..f0cdfd3 100644 --- a/src/fdstream.c +++ b/src/fdstream.c @@ -524,7 +524,7 @@ int virFDStreamConnectUNIX(virStreamPtr st, bool abstract) { struct sockaddr_un sa; - int i = 0; + size_t i = 0; int timeout = 3; int ret; diff --git a/src/libvirt-lxc.c b/src/libvirt-lxc.c index f30b6c3..da69dce 100644 --- a/src/libvirt-lxc.c +++ b/src/libvirt-lxc.c @@ -136,7 +136,7 @@ virDomainLxcEnterNamespace(virDomainPtr domain, int **oldfdlist, unsigned int flags) { - int i; + size_t i; virCheckFlagsGoto(0, error); diff --git a/src/libvirt.c b/src/libvirt.c index 8e19c64..51fe2d6 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -149,7 +149,7 @@ cleanup: static int virConnectAuthCallbackDefault(virConnectCredentialPtr cred, unsigned int ncred, void *cbdata ATTRIBUTE_UNUSED) { - int i; + size_t i; for (i = 0; i < ncred; i++) { char buf[1024]; @@ -816,7 +816,7 @@ int virStateInitialize(bool privileged, virStateInhibitCallback callback, void *opaque) { - int i; + size_t i; if (virInitialize() < 0) return -1; @@ -847,7 +847,8 @@ int virStateInitialize(bool privileged, * Returns 0 if all succeed, -1 upon any failure. */ int virStateCleanup(void) { - int i, ret = 0; + size_t i; + int ret = 0; for (i = 0; i < virStateDriverTabCount; i++) { if (virStateDriverTab[i]->stateCleanup && @@ -865,7 +866,8 @@ int virStateCleanup(void) { * Returns 0 if all succeed, -1 upon any failure. */ int virStateReload(void) { - int i, ret = 0; + size_t i; + int ret = 0; for (i = 0; i < virStateDriverTabCount; i++) { if (virStateDriverTab[i]->stateReload && @@ -883,7 +885,8 @@ int virStateReload(void) { * Returns 0 if successful, -1 on failure */ int virStateStop(void) { - int i, ret = 0; + size_t i; + int ret = 0; for (i = 0; i < virStateDriverTabCount; i++) { if (virStateDriverTab[i]->stateStop && @@ -1100,7 +1103,8 @@ do_open(const char *name, virConnectAuthPtr auth, unsigned int flags) { - int i, res; + size_t i; + int res; virConnectPtr ret; virConfPtr conf = NULL; @@ -1201,10 +1205,10 @@ do_open(const char *name, goto failed; } - VIR_DEBUG("trying driver %d (%s) ...", i, virDriverTab[i]->name); + VIR_DEBUG("trying driver %zu (%s) ...", i, virDriverTab[i]->name); ret->driver = virDriverTab[i]; res = virDriverTab[i]->connectOpen(ret, auth, flags); - VIR_DEBUG("driver %d %s returned %s", + VIR_DEBUG("driver %zu %s returned %s", i, virDriverTab[i]->name, res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : (res == VIR_DRV_OPEN_DECLINED ? "DECLINED" : @@ -1230,7 +1234,7 @@ do_open(const char *name, for (i = 0; i < virNetworkDriverTabCount; i++) { res = virNetworkDriverTab[i]->networkOpen(ret, auth, flags); - VIR_DEBUG("network driver %d %s returned %s", + VIR_DEBUG("network driver %zu %s returned %s", i, virNetworkDriverTab[i]->name, res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : (res == VIR_DRV_OPEN_DECLINED ? "DECLINED" : @@ -1246,7 +1250,7 @@ do_open(const char *name, for (i = 0; i < virInterfaceDriverTabCount; i++) { res = virInterfaceDriverTab[i]->interfaceOpen(ret, auth, flags); - VIR_DEBUG("interface driver %d %s returned %s", + VIR_DEBUG("interface driver %zu %s returned %s", i, virInterfaceDriverTab[i]->name, res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : (res == VIR_DRV_OPEN_DECLINED ? "DECLINED" : @@ -1263,7 +1267,7 @@ do_open(const char *name, /* Secondary driver for storage. Optional */ for (i = 0; i < virStorageDriverTabCount; i++) { res = virStorageDriverTab[i]->storageOpen(ret, auth, flags); - VIR_DEBUG("storage driver %d %s returned %s", + VIR_DEBUG("storage driver %zu %s returned %s", i, virStorageDriverTab[i]->name, res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : (res == VIR_DRV_OPEN_DECLINED ? "DECLINED" : @@ -1280,7 +1284,7 @@ do_open(const char *name, /* Node driver (optional) */ for (i = 0; i < virNodeDeviceDriverTabCount; i++) { res = virNodeDeviceDriverTab[i]->nodeDeviceOpen(ret, auth, flags); - VIR_DEBUG("node driver %d %s returned %s", + VIR_DEBUG("node driver %zu %s returned %s", i, virNodeDeviceDriverTab[i]->name, res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : (res == VIR_DRV_OPEN_DECLINED ? "DECLINED" : @@ -1297,7 +1301,7 @@ do_open(const char *name, /* Secret manipulation driver. Optional */ for (i = 0; i < virSecretDriverTabCount; i++) { res = virSecretDriverTab[i]->secretOpen(ret, auth, flags); - VIR_DEBUG("secret driver %d %s returned %s", + VIR_DEBUG("secret driver %zu %s returned %s", i, virSecretDriverTab[i]->name, res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : (res == VIR_DRV_OPEN_DECLINED ? "DECLINED" : @@ -1314,7 +1318,7 @@ do_open(const char *name, /* Network filter driver. Optional */ for (i = 0; i < virNWFilterDriverTabCount; i++) { res = virNWFilterDriverTab[i]->nwfilterOpen(ret, auth, flags); - VIR_DEBUG("nwfilter driver %d %s returned %s", + VIR_DEBUG("nwfilter driver %zu %s returned %s", i, virNWFilterDriverTab[i]->name, res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : (res == VIR_DRV_OPEN_DECLINED ? "DECLINED" : @@ -3790,7 +3794,7 @@ virTypedParameterValidateSet(virConnectPtr conn, int nparams) { bool string_okay; - int i; + size_t i; string_okay = VIR_DRV_SUPPORTS_FEATURE(conn->driver, conn, @@ -9198,7 +9202,7 @@ error: * * Example of usage: * virDomainPtr *domains; - * int i; + * size_t i; * int ret; * unsigned int flags = VIR_CONNECT_LIST_DOMAINS_RUNNING | * VIR_CONNECT_LIST_DOMAINS_PERSISTENT; @@ -18294,13 +18298,13 @@ virConnectBaselineCPU(virConnectPtr conn, unsigned int ncpus, unsigned int flags) { - unsigned int i; + size_t i; VIR_DEBUG("conn=%p, xmlCPUs=%p, ncpus=%u, flags=%x", conn, xmlCPUs, ncpus, flags); if (xmlCPUs) { for (i = 0; i < ncpus; i++) - VIR_DEBUG("xmlCPUs[%u]=%s", i, NULLSTR(xmlCPUs[i])); + VIR_DEBUG("xmlCPUs[%zu]=%s", i, NULLSTR(xmlCPUs[i])); } virResetLastError(); -- 1.8.1.4

From: "Daniel P. Berrange" <berrange@redhat.com> 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> --- python/libvirt-lxc-override.c | 2 +- python/libvirt-override.c | 111 ++++++++++++++++++++++++++---------------- 2 files changed, 69 insertions(+), 44 deletions(-) diff --git a/python/libvirt-lxc-override.c b/python/libvirt-lxc-override.c index c69affc..73685df 100644 --- a/python/libvirt-lxc-override.c +++ b/python/libvirt-lxc-override.c @@ -64,7 +64,7 @@ libvirt_lxc_virDomainLxcOpenNamespace(PyObject *self ATTRIBUTE_UNUSED, unsigned int flags; int c_retval; int *fdlist = NULL; - int i; + size_t i; if (!PyArg_ParseTuple(args, (char *)"Oi:virDomainLxcOpenNamespace", &pyobj_domain, &flags)) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 5c5586d..fcdc91b 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -76,7 +76,7 @@ static PyObject * getPyVirTypedParameter(const virTypedParameterPtr params, int nparams) { PyObject *key, *val, *info; - int i; + size_t i; if ((info = PyDict_New()) == NULL) return NULL; @@ -159,7 +159,7 @@ setPyVirTypedParameter(PyObject *info, #endif virTypedParameterPtr temp = NULL, ret = NULL; Py_ssize_t size; - int i; + size_t i; if ((size = PyDict_Size(info)) < 0) return NULL; @@ -287,7 +287,7 @@ virPyDictToTypedParams(PyObject *dict, Py_ssize_t pos = 0; #endif virTypedParameterPtr params = NULL; - int i; + size_t i; int n = 0; int max = 0; int ret = -1; @@ -540,7 +540,8 @@ libvirt_virDomainGetCPUStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) PyObject *error = NULL; int ncpus = -1, start_cpu = 0; int sumparams = 0, nparams = -1; - int i, i_retval; + size_t i; + int i_retval; unsigned int flags; bool totalflag; virTypedParameterPtr params = NULL, cpuparams; @@ -704,7 +705,8 @@ static PyObject * libvirt_virDomainMemoryStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { virDomainPtr domain; PyObject *pyobj_domain; - unsigned int nr_stats, i; + unsigned int nr_stats; + size_t i; virDomainMemoryStatStruct stats[VIR_DOMAIN_MEMORY_STAT_NR]; PyObject *info; @@ -1597,7 +1599,7 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, } for (i = 0; i < dominfo.nrVirtCpu; i++) { PyObject *info = PyTuple_New(cpunum); - int j; + size_t j; if (info == NULL) goto cleanup; for (j = 0; j < cpunum; j++) { @@ -1641,7 +1643,8 @@ libvirt_virDomainPinVcpu(PyObject *self ATTRIBUTE_UNUSED, PyObject *pyobj_domain, *pycpumap; PyObject *ret = NULL; unsigned char *cpumap; - int cpumaplen, i, vcpu, tuple_size, cpunum; + int cpumaplen, vcpu, tuple_size, cpunum; + size_t i; int i_retval; if (!PyArg_ParseTuple(args, (char *)"OiO:virDomainPinVcpu", @@ -1704,7 +1707,8 @@ libvirt_virDomainPinVcpuFlags(PyObject *self ATTRIBUTE_UNUSED, PyObject *pyobj_domain, *pycpumap; PyObject *ret = NULL; unsigned char *cpumap; - int cpumaplen, i, vcpu, tuple_size, cpunum; + int cpumaplen, vcpu, tuple_size, cpunum; + size_t i; unsigned int flags; int i_retval; @@ -1831,7 +1835,8 @@ libvirt_virDomainPinEmulator(PyObject *self ATTRIBUTE_UNUSED, virDomainPtr domain; PyObject *pyobj_domain, *pycpumap; unsigned char *cpumap = NULL; - int cpumaplen, i, tuple_size, cpunum; + int cpumaplen, tuple_size, cpunum; + size_t i; int i_retval; unsigned int flags; @@ -2187,7 +2192,7 @@ libvirt_virConnectOpenAuth(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { auth.ncredtype = PyList_Size(pycredtype); if (auth.ncredtype) { - int i; + size_t i; if (VIR_ALLOC_N(auth.credtype, auth.ncredtype) < 0) return VIR_PY_NONE; for (i = 0; i < auth.ncredtype; i++) { @@ -2300,7 +2305,8 @@ static PyObject * libvirt_virConnectListDomainsID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyObject *py_retval; - int *ids = NULL, c_retval, i; + int *ids = NULL, c_retval; + size_t i; virConnectPtr conn; PyObject *pyobj_conn; @@ -2349,7 +2355,7 @@ libvirt_virConnectListAllDomains(PyObject *self ATTRIBUTE_UNUSED, virConnectPtr conn; virDomainPtr *doms = NULL; int c_retval = 0; - int i; + size_t i; unsigned int flags; if (!PyArg_ParseTuple(args, (char *)"Oi:virConnectListAllDomains", @@ -2391,7 +2397,8 @@ libvirt_virConnectListDefinedDomains(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyObject *py_retval; char **names = NULL; - int c_retval, i; + int c_retval; + size_t i; virConnectPtr conn; PyObject *pyobj_conn; @@ -2436,7 +2443,8 @@ libvirt_virDomainSnapshotListNames(PyObject *self ATTRIBUTE_UNUSED, { PyObject *py_retval; char **names = NULL; - int c_retval, i; + int c_retval; + size_t i; virDomainPtr dom; PyObject *pyobj_dom; PyObject *pyobj_snap; @@ -2492,7 +2500,8 @@ libvirt_virDomainListAllSnapshots(PyObject *self ATTRIBUTE_UNUSED, { PyObject *py_retval = NULL; virDomainSnapshotPtr *snaps = NULL; - int c_retval, i; + int c_retval; + size_t i; virDomainPtr dom; PyObject *pyobj_dom; unsigned int flags; @@ -2537,7 +2546,8 @@ libvirt_virDomainSnapshotListChildrenNames(PyObject *self ATTRIBUTE_UNUSED, { PyObject *py_retval; char **names = NULL; - int c_retval, i; + int c_retval; + size_t i; virDomainSnapshotPtr snap; PyObject *pyobj_snap; unsigned int flags; @@ -2591,7 +2601,8 @@ libvirt_virDomainSnapshotListAllChildren(PyObject *self ATTRIBUTE_UNUSED, { PyObject *py_retval = NULL; virDomainSnapshotPtr *snaps = NULL; - int c_retval, i; + int c_retval; + size_t i; virDomainSnapshotPtr parent; PyObject *pyobj_parent; unsigned int flags; @@ -2870,7 +2881,8 @@ libvirt_virConnectListNetworks(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyObject *py_retval; char **names = NULL; - int c_retval, i; + int c_retval; + size_t i; virConnectPtr conn; PyObject *pyobj_conn; @@ -2915,7 +2927,8 @@ libvirt_virConnectListDefinedNetworks(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyObject *py_retval; char **names = NULL; - int c_retval, i; + int c_retval; + size_t i; virConnectPtr conn; PyObject *pyobj_conn; @@ -2964,7 +2977,7 @@ libvirt_virConnectListAllNetworks(PyObject *self ATTRIBUTE_UNUSED, virConnectPtr conn; virNetworkPtr *nets = NULL; int c_retval = 0; - int i; + size_t i; unsigned int flags; if (!PyArg_ParseTuple(args, (char *)"Oi:virConnectListAllNetworks", @@ -3128,7 +3141,8 @@ libvirt_virNodeGetCellsFreeMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *arg { PyObject *py_retval; PyObject *pyobj_conn; - int startCell, maxCells, c_retval, i; + int startCell, maxCells, c_retval; + size_t i; virConnectPtr conn; unsigned long long *freeMems; @@ -3168,7 +3182,8 @@ libvirt_virNodeGetCPUStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) PyObject *pyobj_conn; virConnectPtr conn; unsigned int flags; - int cpuNum, c_retval, i; + int cpuNum, c_retval; + size_t i; int nparams = 0; virNodeCPUStatsPtr stats = NULL; @@ -3231,7 +3246,8 @@ libvirt_virNodeGetMemoryStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) PyObject *pyobj_conn; virConnectPtr conn; unsigned int flags; - int cellNum, c_retval, i; + int cellNum, c_retval; + size_t i; int nparams = 0; virNodeMemoryStatsPtr stats = NULL; @@ -3290,7 +3306,8 @@ libvirt_virConnectListStoragePools(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyObject *py_retval; char **names = NULL; - int c_retval, i; + int c_retval; + size_t i; virConnectPtr conn; PyObject *pyobj_conn; @@ -3343,7 +3360,8 @@ libvirt_virConnectListDefinedStoragePools(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyObject *py_retval; char **names = NULL; - int c_retval, i; + int c_retval; + size_t i; virConnectPtr conn; PyObject *pyobj_conn; @@ -3400,7 +3418,7 @@ libvirt_virConnectListAllStoragePools(PyObject *self ATTRIBUTE_UNUSED, virConnectPtr conn; virStoragePoolPtr *pools = NULL; int c_retval = 0; - int i; + size_t i; unsigned int flags; if (!PyArg_ParseTuple(args, (char *)"Oi:virConnectListAllStoragePools", @@ -3442,7 +3460,8 @@ libvirt_virStoragePoolListVolumes(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyObject *py_retval; char **names = NULL; - int c_retval, i; + int c_retval; + size_t i; virStoragePoolPtr pool; PyObject *pyobj_pool; @@ -3498,7 +3517,7 @@ libvirt_virStoragePoolListAllVolumes(PyObject *self ATTRIBUTE_UNUSED, virStoragePoolPtr pool; virStorageVolPtr *vols = NULL; int c_retval = 0; - int i; + size_t i; unsigned int flags; PyObject *pyobj_pool; @@ -3701,7 +3720,8 @@ libvirt_virNodeListDevices(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyObject *py_retval; char **names = NULL; - int c_retval, i; + int c_retval; + size_t i; virConnectPtr conn; PyObject *pyobj_conn; char *cap; @@ -3752,7 +3772,7 @@ libvirt_virConnectListAllNodeDevices(PyObject *self ATTRIBUTE_UNUSED, virConnectPtr conn; virNodeDevicePtr *devices = NULL; int c_retval = 0; - int i; + size_t i; unsigned int flags; if (!PyArg_ParseTuple(args, (char *)"Oi:virConnectListAllNodeDevices", @@ -3794,7 +3814,8 @@ libvirt_virNodeDeviceListCaps(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyObject *py_retval; char **names = NULL; - int c_retval, i; + int c_retval; + size_t i; virNodeDevicePtr dev; PyObject *pyobj_dev; @@ -3914,7 +3935,8 @@ libvirt_virConnectListSecrets(PyObject *self ATTRIBUTE_UNUSED, PyObject *py_retval; char **uuids = NULL; virConnectPtr conn; - int c_retval, i; + int c_retval; + size_t i; PyObject *pyobj_conn; if (!PyArg_ParseTuple(args, (char *)"O:virConnectListSecrets", &pyobj_conn)) @@ -3961,7 +3983,7 @@ libvirt_virConnectListAllSecrets(PyObject *self ATTRIBUTE_UNUSED, virConnectPtr conn; virSecretPtr *secrets = NULL; int c_retval = 0; - int i; + size_t i; unsigned int flags; if (!PyArg_ParseTuple(args, (char *)"Oi:virConnectListAllSecrets", @@ -4133,7 +4155,8 @@ libvirt_virConnectListNWFilters(PyObject *self ATTRIBUTE_UNUSED, PyObject *py_retval; char **uuids = NULL; virConnectPtr conn; - int c_retval, i; + int c_retval; + size_t i; PyObject *pyobj_conn; if (!PyArg_ParseTuple(args, (char *)"O:virConnectListNWFilters", &pyobj_conn)) @@ -4180,7 +4203,7 @@ libvirt_virConnectListAllNWFilters(PyObject *self ATTRIBUTE_UNUSED, virConnectPtr conn; virNWFilterPtr *filters = NULL; int c_retval = 0; - int i; + size_t i; unsigned int flags; if (!PyArg_ParseTuple(args, (char *)"Oi:virConnectListAllNWFilters", @@ -4222,7 +4245,8 @@ libvirt_virConnectListInterfaces(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyObject *py_retval; char **names = NULL; - int c_retval, i; + int c_retval; + size_t i; virConnectPtr conn; PyObject *pyobj_conn; @@ -4275,7 +4299,8 @@ libvirt_virConnectListDefinedInterfaces(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyObject *py_retval; char **names = NULL; - int c_retval, i; + int c_retval; + size_t i; virConnectPtr conn; PyObject *pyobj_conn; @@ -4334,7 +4359,7 @@ libvirt_virConnectListAllInterfaces(PyObject *self ATTRIBUTE_UNUSED, virConnectPtr conn; virInterfacePtr *ifaces = NULL; int c_retval = 0; - int i; + size_t i; unsigned int flags; if (!PyArg_ParseTuple(args, (char *)"Oi:virConnectListAllInterfaces", @@ -4389,7 +4414,7 @@ libvirt_virConnectBaselineCPU(PyObject *self ATTRIBUTE_UNUSED, conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); if (PyList_Check(list)) { - int i; + size_t i; ncpus = PyList_Size(list); if (VIR_ALLOC_N(xmlcpus, ncpus) < 0) @@ -4669,7 +4694,7 @@ libvirt_virDomainGetDiskErrors(PyObject *self ATTRIBUTE_UNUSED, virDomainDiskErrorPtr disks = NULL; unsigned int ndisks; int count; - int i; + size_t i; if (!PyArg_ParseTuple(args, (char *) "Oi:virDomainGetDiskErrors", &pyobj_domain, &flags)) @@ -5773,7 +5798,7 @@ libvirt_virConnectDomainEventGraphicsCallback(virConnectPtr conn ATTRIBUTE_UNUSE PyObject *pyobj_remote; PyObject *pyobj_subject; int ret = -1; - int i; + size_t i; LIBVIRT_ENSURE_THREAD_STATE; @@ -6561,7 +6586,7 @@ libvirt_virDomainSendKey(PyObject *self ATTRIBUTE_UNUSED, int holdtime; unsigned int flags; int ret; - int i; + size_t i; unsigned int keycodes[VIR_DOMAIN_SEND_KEY_MAX_KEYS]; unsigned int nkeycodes; @@ -6920,7 +6945,7 @@ libvirt_virNodeGetCPUMap(PyObject *self ATTRIBUTE_UNUSED, unsigned char *cpumap = NULL; unsigned int online = 0; unsigned int flags; - int i; + size_t i; if (!PyArg_ParseTuple(args, (char *)"Oi:virNodeGetCPUMap", &pyobj_conn, &flags)) -- 1.8.1.4

From: "Daniel P. Berrange" <berrange@redhat.com> 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> --- examples/domain-events/events-c/event-test.c | 2 +- examples/domsuspend/suspend.c | 14 ++++++++------ examples/openauth/openauth.c | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/examples/domain-events/events-c/event-test.c b/examples/domain-events/events-c/event-test.c index 1b425fb..e9b3881 100644 --- a/examples/domain-events/events-c/event-test.c +++ b/examples/domain-events/events-c/event-test.c @@ -320,7 +320,7 @@ static int myDomainEventGraphicsCallback(virConnectPtr conn ATTRIBUTE_UNUSED, virDomainEventGraphicsSubjectPtr subject, void *opaque ATTRIBUTE_UNUSED) { - int i; + size_t i; printf("%s EVENT: Domain %s(%d) graphics ", __func__, virDomainGetName(dom), virDomainGetID(dom)); diff --git a/examples/domsuspend/suspend.c b/examples/domsuspend/suspend.c index d9f56bb..6a0f5c9 100644 --- a/examples/domsuspend/suspend.c +++ b/examples/domsuspend/suspend.c @@ -107,15 +107,17 @@ int main(int argc, char **argv) { id = atoi(argv[1]); } if (id == 0) { - int i, j, ids[10]; - i = virConnectListDomains(conn, &ids[0], 10); - if (i < 0) { + int n; + size_t i; + int ids[10]; + n = virConnectListDomains(conn, &ids[0], 10); + if (n < 0) { fprintf(stderr, "Failed to list the domains\n"); goto error; } - for (j = 0; j < i; j++) { - if (ids[j] != 0) { - id = ids[j]; + for (i = 0; i < n; i++) { + if (ids[i] != 0) { + id = ids[i]; break; } } diff --git a/examples/openauth/openauth.c b/examples/openauth/openauth.c index 628451c..dd44ee9 100644 --- a/examples/openauth/openauth.c +++ b/examples/openauth/openauth.c @@ -161,7 +161,7 @@ typedef struct _AuthData AuthData; static int authCallback(virConnectCredentialPtr cred, unsigned int ncred, void *cbdata) { - int i; + size_t i; AuthData *authData = cbdata; /* libvirt might request multiple credentials in a single call. -- 1.8.1.4

From: "Daniel P. Berrange" <berrange@redhat.com> Add two syntax-check rules - sc_prohibit_int_ijk - block use of 'int' as a data type for any variables named 'i', 'j', 'k' - sc_prohibit_int_iijjkk - block use of 'ii', 'jj', 'kk' for any variable names --- cfg.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/cfg.mk b/cfg.mk index bbe84b3..2285f08 100644 --- a/cfg.mk +++ b/cfg.mk @@ -545,6 +545,17 @@ sc_avoid_attribute_unused_in_header: halt='use ATTRIBUTE_UNUSED in .c rather than .h files' \ $(_sc_search_regexp) +sc_prohibit_int_ijk: + @prohibit='\<int ([^=\(]+ )*(i|j|k)(\s|,|;)' \ + halt='use size_t, not int/unsigned int for loop vars i, j, k' \ + $(_sc_search_regexp) + +sc_prohibit_loop_iijjkk: + @prohibit='\<int ([^=]+ )*(ii|jj|kk)(\s|,|;)' \ + halt='use i, j, k for loop iterators, not ii, jj, kk' \ + $(_sc_search_regexp) + + # Many of the function names below came from this filter: # git grep -B2 '\<_('|grep -E '\.c- *[[:alpha:]_][[:alnum:]_]* ?\(.*[,;]$' \ # |sed 's/.*\.c- *//'|perl -pe 's/ ?\(.*//'|sort -u \ @@ -971,3 +982,6 @@ exclude_file_name_regexp--sc_prohibit_include_public_headers_quote = \ exclude_file_name_regexp--sc_prohibit_include_public_headers_brackets = \ ^(python/|tools/|examples/|include/libvirt/(virterror|libvirt-(qemu|lxc))\.h$$) + +exclude_file_name_regexp--sc_prohibit_int_ijk = \ + ^(src/remote_protocol-structs|src/remote/remote_protocol.x|cfg.mk|include/)$ -- 1.8.1.4