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

Convert 'int i' to 'size_t i' in src/lxc/ 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 11f1e1009a
commit a4b57dfb9e
5 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lxc/lxc_cgroup.c
View File

@ -123,7 +123,8 @@ cleanup:
static int virLXCCgroupSetupBlkioTune(virDomainDefPtr def, static int virLXCCgroupSetupBlkioTune(virDomainDefPtr def,
virCgroupPtr cgroup) virCgroupPtr cgroup)
{ {
int i, rc; size_t i;
int rc;
if (def->blkio.weight) { if (def->blkio.weight) {
rc = virCgroupSetBlkioWeight(cgroup, def->blkio.weight); rc = virCgroupSetBlkioWeight(cgroup, def->blkio.weight);

12
src/lxc/lxc_container.c
View File

@ -229,7 +229,8 @@ static virCommandPtr lxcContainerBuildInitCmd(virDomainDefPtr vmDef)
static int lxcContainerSetStdio(int control, int ttyfd, int handshakefd) static int lxcContainerSetStdio(int control, int ttyfd, int handshakefd)
{ {
int rc = -1; int rc = -1;
int open_max, i; int open_max;
int fd;
if (setsid() < 0) { if (setsid() < 0) {
virReportSystemError(errno, "%s", virReportSystemError(errno, "%s",
@ -246,9 +247,9 @@ static int lxcContainerSetStdio(int control, int ttyfd, int handshakefd)
/* Just in case someone forget to set FD_CLOEXEC, explicitly /* Just in case someone forget to set FD_CLOEXEC, explicitly
* close all FDs before executing the container */ * close all FDs before executing the container */
open_max = sysconf(_SC_OPEN_MAX); open_max = sysconf(_SC_OPEN_MAX);
for (i = 0; i < open_max; i++) for (fd = 0; fd < open_max; fd++)
if (i != ttyfd && i != control && i != handshakefd) { if (fd != ttyfd && fd != control && fd != handshakefd) {
int tmpfd = i; int tmpfd = fd;
VIR_MASS_CLOSE(tmpfd); VIR_MASS_CLOSE(tmpfd);
} }
@ -701,7 +702,8 @@ static int lxcContainerMountBasicFS(void)
{ SELINUX_MOUNT, SELINUX_MOUNT, NULL, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY }, { SELINUX_MOUNT, SELINUX_MOUNT, NULL, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY },
#endif #endif
}; };
int i, rc = -1; size_t i;
int rc = -1;
VIR_DEBUG("Mounting basic filesystems"); VIR_DEBUG("Mounting basic filesystems");

3
src/lxc/lxc_controller.c
View File

@ -1141,7 +1141,8 @@ virLXCControllerSetupUsernsMap(virDomainIdMapEntryPtr map,
char *path) char *path)
{ {
virBuffer map_value = VIR_BUFFER_INITIALIZER; virBuffer map_value = VIR_BUFFER_INITIALIZER;
int i, ret = -1; size_t i;
int ret = -1;
for (i = 0; i < num; i++) for (i = 0; i < num; i++)
virBufferAsprintf(&map_value, "%u %u %u\n", virBufferAsprintf(&map_value, "%u %u %u\n",

44
src/lxc/lxc_driver.c
View File

@ -815,7 +815,7 @@ lxcDomainSetMemoryParameters(virDomainPtr dom,
unsigned int flags) unsigned int flags)
{ {
virLXCDriverPtr driver = dom->conn->privateData; virLXCDriverPtr driver = dom->conn->privateData;
int i; size_t i;
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
int ret = -1; int ret = -1;
int rc; int rc;
@ -889,7 +889,7 @@ lxcDomainGetMemoryParameters(virDomainPtr dom,
unsigned int flags) unsigned int flags)
{ {
virLXCDriverPtr driver = dom->conn->privateData; virLXCDriverPtr driver = dom->conn->privateData;
int i; size_t i;
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
unsigned long long val; unsigned long long val;
int ret = -1; int ret = -1;
@ -1846,7 +1846,7 @@ lxcDomainSetSchedulerParametersFlags(virDomainPtr dom,
unsigned int flags) unsigned int flags)
{ {
virLXCDriverPtr driver = dom->conn->privateData; virLXCDriverPtr driver = dom->conn->privateData;
int i; size_t i;
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
virDomainDefPtr vmdef = NULL; virDomainDefPtr vmdef = NULL;
int ret = -1; int ret = -1;
@ -2101,7 +2101,7 @@ lxcDomainSetBlkioParameters(virDomainPtr dom,
unsigned int flags) unsigned int flags)
{ {
virLXCDriverPtr driver = dom->conn->privateData; virLXCDriverPtr driver = dom->conn->privateData;
int i; size_t i;
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
virDomainDefPtr persistentDef = NULL; virDomainDefPtr persistentDef = NULL;
int ret = -1; int ret = -1;
@ -2200,7 +2200,7 @@ lxcDomainGetBlkioParameters(virDomainPtr dom,
unsigned int flags) unsigned int flags)
{ {
virLXCDriverPtr driver = dom->conn->privateData; virLXCDriverPtr driver = dom->conn->privateData;
int i; size_t i;
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
virDomainDefPtr persistentDef = NULL; virDomainDefPtr persistentDef = NULL;
unsigned int val; unsigned int val;
@ -2305,7 +2305,7 @@ lxcDomainInterfaceStats(virDomainPtr dom,
{ {
virLXCDriverPtr driver = dom->conn->privateData; virLXCDriverPtr driver = dom->conn->privateData;
virDomainObjPtr vm; virDomainObjPtr vm;
int i; size_t i;
int ret = -1; int ret = -1;
lxcDriverLock(driver); lxcDriverLock(driver);
@ -3857,7 +3857,7 @@ lxcDomainDetachDeviceDiskLive(virDomainObjPtr vm,
{ {
virLXCDomainObjPrivatePtr priv = vm->privateData; virLXCDomainObjPrivatePtr priv = vm->privateData;
virDomainDiskDefPtr def = NULL; virDomainDiskDefPtr def = NULL;
int i, ret = -1; int idx, ret = -1;
char *dst = NULL; char *dst = NULL;
if (!priv->initpid) { if (!priv->initpid) {
@ -3866,15 +3866,15 @@ lxcDomainDetachDeviceDiskLive(virDomainObjPtr vm,
goto cleanup; goto cleanup;
} }
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,
_("disk %s not found"), dev->data.disk->dst); _("disk %s not found"), dev->data.disk->dst);
goto cleanup; goto cleanup;
} }
def = vm->def->disks[i]; def = vm->def->disks[idx];
if (virAsprintf(&dst, "/proc/%llu/root/dev/%s", if (virAsprintf(&dst, "/proc/%llu/root/dev/%s",
(unsigned long long)priv->initpid, def->dst) < 0) (unsigned long long)priv->initpid, def->dst) < 0)
@ -3899,7 +3899,7 @@ lxcDomainDetachDeviceDiskLive(virDomainObjPtr vm,
VIR_WARN("cannot deny device %s for domain %s", VIR_WARN("cannot deny device %s for domain %s",
def->src, vm->def->name); def->src, vm->def->name);
virDomainDiskRemove(vm->def, i); virDomainDiskRemove(vm->def, idx);
virDomainDiskDefFree(def); virDomainDiskDefFree(def);
ret = 0; ret = 0;
@ -4051,7 +4051,7 @@ lxcDomainDetachDeviceHostdevStorageLive(virDomainObjPtr vm,
{ {
virLXCDomainObjPrivatePtr priv = vm->privateData; virLXCDomainObjPrivatePtr priv = vm->privateData;
virDomainHostdevDefPtr def = NULL; virDomainHostdevDefPtr def = NULL;
int i, ret = -1; int idx, ret = -1;
char *dst = NULL; char *dst = NULL;
if (!priv->initpid) { if (!priv->initpid) {
@ -4060,9 +4060,9 @@ lxcDomainDetachDeviceHostdevStorageLive(virDomainObjPtr vm,
goto cleanup; goto cleanup;
} }
if ((i = virDomainHostdevFind(vm->def, if ((idx = virDomainHostdevFind(vm->def,
dev->data.hostdev, dev->data.hostdev,
&def)) < 0) { &def)) < 0) {
virReportError(VIR_ERR_OPERATION_FAILED, virReportError(VIR_ERR_OPERATION_FAILED,
_("hostdev %s not found"), _("hostdev %s not found"),
dev->data.hostdev->source.caps.u.storage.block); dev->data.hostdev->source.caps.u.storage.block);
@ -4093,7 +4093,7 @@ lxcDomainDetachDeviceHostdevStorageLive(virDomainObjPtr vm,
VIR_WARN("cannot deny device %s for domain %s", VIR_WARN("cannot deny device %s for domain %s",
def->source.caps.u.storage.block, vm->def->name); def->source.caps.u.storage.block, vm->def->name);
virDomainHostdevRemove(vm->def, i); virDomainHostdevRemove(vm->def, idx);
virDomainHostdevDefFree(def); virDomainHostdevDefFree(def);
ret = 0; ret = 0;
@ -4110,7 +4110,7 @@ lxcDomainDetachDeviceHostdevMiscLive(virDomainObjPtr vm,
{ {
virLXCDomainObjPrivatePtr priv = vm->privateData; virLXCDomainObjPrivatePtr priv = vm->privateData;
virDomainHostdevDefPtr def = NULL; virDomainHostdevDefPtr def = NULL;
int i, ret = -1; int idx, ret = -1;
char *dst = NULL; char *dst = NULL;
if (!priv->initpid) { if (!priv->initpid) {
@ -4119,9 +4119,9 @@ lxcDomainDetachDeviceHostdevMiscLive(virDomainObjPtr vm,
goto cleanup; goto cleanup;
} }
if ((i = virDomainHostdevFind(vm->def, if ((idx = virDomainHostdevFind(vm->def,
dev->data.hostdev, dev->data.hostdev,
&def)) < 0) { &def)) < 0) {
virReportError(VIR_ERR_OPERATION_FAILED, virReportError(VIR_ERR_OPERATION_FAILED,
_("hostdev %s not found"), _("hostdev %s not found"),
dev->data.hostdev->source.caps.u.misc.chardev); dev->data.hostdev->source.caps.u.misc.chardev);
@ -4152,7 +4152,7 @@ lxcDomainDetachDeviceHostdevMiscLive(virDomainObjPtr vm,
VIR_WARN("cannot deny device %s for domain %s", VIR_WARN("cannot deny device %s for domain %s",
def->source.caps.u.misc.chardev, vm->def->name); def->source.caps.u.misc.chardev, vm->def->name);
virDomainHostdevRemove(vm->def, i); virDomainHostdevRemove(vm->def, idx);
virDomainHostdevDefFree(def); virDomainHostdevDefFree(def);
ret = 0; ret = 0;

2
src/lxc/lxc_process.c
View File

@ -221,7 +221,7 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
virDomainShutoffReason reason) virDomainShutoffReason reason)
{ {
int i; size_t i;
virLXCDomainObjPrivatePtr priv = vm->privateData; virLXCDomainObjPrivatePtr priv = vm->privateData;
virNetDevVPortProfilePtr vport = NULL; virNetDevVPortProfilePtr vport = NULL;