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

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

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

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-07-08 15:09:33 +01:00
parent 88e4e9c6b2
commit bdf91a0ce5
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libxl/libxl_conf.c
View File

@ -71,7 +71,7 @@ libxlBuildCapabilities(virArch hostarch,
int nr_guest_archs) int nr_guest_archs)
{ {
virCapsPtr caps; virCapsPtr caps;
int i; size_t i;
if ((caps = virCapabilitiesNew(hostarch, 1, 1)) == NULL) if ((caps = virCapabilitiesNew(hostarch, 1, 1)) == NULL)
goto no_memory; goto no_memory;
@ -168,7 +168,7 @@ libxlMakeCapabilitiesInternal(virArch hostarch,
char *str, *token; char *str, *token;
regmatch_t subs[4]; regmatch_t subs[4];
char *saveptr = NULL; char *saveptr = NULL;
int i; size_t i;
int host_pae = 0; int host_pae = 0;
struct guest_arch guest_archs[32]; struct guest_arch guest_archs[32];
@ -335,7 +335,7 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, libxl_domain_config *d_config)
{ {
libxl_domain_build_info *b_info = &d_config->b_info; libxl_domain_build_info *b_info = &d_config->b_info;
int hvm = STREQ(def->os.type, "hvm"); int hvm = STREQ(def->os.type, "hvm");
int i; size_t i;
libxl_domain_build_info_init(b_info); libxl_domain_build_info_init(b_info);
@ -573,7 +573,7 @@ libxlMakeDiskList(virDomainDefPtr def, libxl_domain_config *d_config)
virDomainDiskDefPtr *l_disks = def->disks; virDomainDiskDefPtr *l_disks = def->disks;
int ndisks = def->ndisks; int ndisks = def->ndisks;
libxl_device_disk *x_disks; libxl_device_disk *x_disks;
int i; size_t i;
if (VIR_ALLOC_N(x_disks, ndisks) < 0) if (VIR_ALLOC_N(x_disks, ndisks) < 0)
return -1; return -1;
@ -643,7 +643,7 @@ libxlMakeNicList(virDomainDefPtr def, libxl_domain_config *d_config)
virDomainNetDefPtr *l_nics = def->nets; virDomainNetDefPtr *l_nics = def->nets;
int nnics = def->nnets; int nnics = def->nnets;
libxl_device_nic *x_nics; libxl_device_nic *x_nics;
int i; size_t i;
if (VIR_ALLOC_N(x_nics, nnics) < 0) if (VIR_ALLOC_N(x_nics, nnics) < 0)
return -1; return -1;
@ -724,7 +724,7 @@ libxlMakeVfbList(libxlDriverPrivatePtr driver,
int nvfbs = def->ngraphics; int nvfbs = def->ngraphics;
libxl_device_vfb *x_vfbs; libxl_device_vfb *x_vfbs;
libxl_device_vkb *x_vkbs; libxl_device_vkb *x_vkbs;
int i; size_t i;
if (nvfbs == 0) if (nvfbs == 0)
return 0; return 0;

30
src/libxl/libxl_driver.c
View File

@ -629,7 +629,7 @@ libxlVmCleanup(libxlDriverPrivatePtr driver,
libxlDomainObjPrivatePtr priv = vm->privateData; libxlDomainObjPrivatePtr priv = vm->privateData;
int vnc_port; int vnc_port;
char *file; char *file;
int i; size_t i;
if (priv->deathW) { if (priv->deathW) {
libxl_evdisable_domain_death(priv->ctx, priv->deathW); libxl_evdisable_domain_death(priv->ctx, priv->deathW);
@ -823,7 +823,8 @@ libxlDomainSetVcpuAffinities(libxlDriverPrivatePtr driver, virDomainObjPtr vm)
uint8_t *cpumap = NULL; uint8_t *cpumap = NULL;
virNodeInfo nodeinfo; virNodeInfo nodeinfo;
size_t cpumaplen; size_t cpumaplen;
int vcpu, i; int vcpu;
size_t i;
int ret = -1; int ret = -1;
if (libxlDoNodeGetInfo(driver, &nodeinfo) < 0) if (libxlDoNodeGetInfo(driver, &nodeinfo) < 0)
@ -869,7 +870,7 @@ libxlFreeMem(libxlDomainObjPrivatePtr priv, libxl_domain_config *d_config)
{ {
uint32_t needed_mem; uint32_t needed_mem;
uint32_t free_mem; uint32_t free_mem;
int i; size_t i;
int ret = -1; int ret = -1;
int tries = 3; int tries = 3;
int wait_secs = 10; int wait_secs = 10;
@ -2718,7 +2719,8 @@ libxlDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus,
libxl_bitmap map; libxl_bitmap map;
uint8_t *bitmask = NULL; uint8_t *bitmask = NULL;
unsigned int maplen; unsigned int maplen;
unsigned int i, pos; size_t i;
unsigned int pos;
int max; int max;
int ret = -1; int ret = -1;
@ -2986,7 +2988,7 @@ libxlDomainGetVcpus(virDomainPtr dom, virVcpuInfoPtr info, int maxinfo,
int ret = -1; int ret = -1;
libxl_vcpuinfo *vcpuinfo; libxl_vcpuinfo *vcpuinfo;
int maxcpu, hostcpus; int maxcpu, hostcpus;
unsigned int i; size_t i;
unsigned char *cpumap; unsigned char *cpumap;
libxlDriverLock(driver); libxlDriverLock(driver);
@ -3396,7 +3398,7 @@ libxlDomainChangeEjectableMedia(libxlDomainObjPrivatePtr priv,
{ {
virDomainDiskDefPtr origdisk = NULL; virDomainDiskDefPtr origdisk = NULL;
libxl_device_disk x_disk; libxl_device_disk x_disk;
int i; size_t i;
int ret = -1; int ret = -1;
for (i = 0; i < vm->def->ndisks; i++) { for (i = 0; i < vm->def->ndisks; i++) {
@ -3510,14 +3512,14 @@ libxlDomainDetachDeviceDiskLive(libxlDomainObjPrivatePtr priv,
{ {
virDomainDiskDefPtr l_disk = NULL; virDomainDiskDefPtr l_disk = NULL;
libxl_device_disk x_disk; libxl_device_disk x_disk;
int i; int idx;
int ret = -1; int ret = -1;
switch (dev->data.disk->device) { switch (dev->data.disk->device) {
case VIR_DOMAIN_DISK_DEVICE_DISK: case VIR_DOMAIN_DISK_DEVICE_DISK:
if (dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_XEN) { if (dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_XEN) {
if ((i = virDomainDiskIndexByName(vm->def, if ((idx = virDomainDiskIndexByName(vm->def,
dev->data.disk->dst, dev->data.disk->dst,
false)) < 0) { false)) < 0) {
virReportError(VIR_ERR_OPERATION_FAILED, virReportError(VIR_ERR_OPERATION_FAILED,
@ -3525,7 +3527,7 @@ libxlDomainDetachDeviceDiskLive(libxlDomainObjPrivatePtr priv,
goto cleanup; goto cleanup;
} }
l_disk = vm->def->disks[i]; l_disk = vm->def->disks[idx];
if (libxlMakeDisk(l_disk, &x_disk) < 0) if (libxlMakeDisk(l_disk, &x_disk) < 0)
goto cleanup; goto cleanup;
@ -3538,7 +3540,7 @@ libxlDomainDetachDeviceDiskLive(libxlDomainObjPrivatePtr priv,
goto cleanup; goto cleanup;
} }
virDomainDiskRemove(vm->def, i); virDomainDiskRemove(vm->def, idx);
virDomainDiskDefFree(l_disk); virDomainDiskDefFree(l_disk);
} else { } else {
@ -3693,18 +3695,18 @@ libxlDomainUpdateDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev)
{ {
virDomainDiskDefPtr orig; virDomainDiskDefPtr orig;
virDomainDiskDefPtr disk; virDomainDiskDefPtr disk;
int i; int idx;
int ret = -1; int ret = -1;
switch (dev->type) { switch (dev->type) {
case VIR_DOMAIN_DEVICE_DISK: case VIR_DOMAIN_DEVICE_DISK:
disk = dev->data.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, virReportError(VIR_ERR_INVALID_ARG,
_("target %s doesn't exist."), disk->dst); _("target %s doesn't exist."), disk->dst);
goto cleanup; goto cleanup;
} }
orig = vmdef->disks[i]; orig = vmdef->disks[idx];
if (!(orig->device == VIR_DOMAIN_DISK_DEVICE_CDROM)) { if (!(orig->device == VIR_DOMAIN_DISK_DEVICE_CDROM)) {
virReportError(VIR_ERR_INVALID_ARG, "%s", virReportError(VIR_ERR_INVALID_ARG, "%s",
_("this disk doesn't support update")); _("this disk doesn't support update"));
@ -4416,7 +4418,7 @@ libxlDomainSetSchedulerParametersFlags(virDomainPtr dom,
virDomainObjPtr vm; virDomainObjPtr vm;
libxl_domain_sched_params sc_info; libxl_domain_sched_params sc_info;
int sched_id; int sched_id;
int i; size_t i;
int ret = -1; int ret = -1;
virCheckFlags(0, -1); virCheckFlags(0, -1);