5 a.m.
Inspired by [1] from Daniel, when I tried to add the syntax-check
rule, it detected the various places which use the whitespace before
";". So before adding the syntax-check rule, I cleaned up them first
by a simple Bash script:
\#!/bin/bash
for dir in $dirs; do
files=$(find $dir -type f -name "*.[ch]")
for file in $files; do
sed -r -i -e "/^ \s+;/!s/\s+;/;/g" $file
done
git add $files
git commit -m "$1: Remove the whitespace before ';'"
done
So it's rather mechanically, except I need to change a few places of the
generated patch.
[1] https://www.redhat.com/archives/libvir-list/2013-May/msg01397.html
Osier Yang (31):
src/network: Remove the whitespace before ';'
src/libxl: Remove the whitespace before ';'
src/conf: Remove the whitespace before ';'
src/test: Remove the whitespace before ';'
src/vbox: Remove the whitespace before ';'
src/xenxs: Remove the whitespace before ';'
src/nwfilter: Remove the whitespace before ';'
src/phyp: Remove the whitespace before ';'
src/node_device: Remove the whitespace before ';'
src/openvz: Remove the whitespace before ';'
src/uml: Remove the whitespace before ';'
src/parallels: Remove the whitespace before ';'
src/interface: Remove the whitespace before ';'
src/qemu: Remove the whitespace before ';'
src/vmware: Remove the whitespace before ';'
src/xen: Remove the whitespace before ';'
src/security: Remove the whitespace before ';'
src/storage: Remove the whitespace before ';'
tools: Remove the whitespace before ";"
daemon: Remove the whitespace before ";"
tests/: Remove the whitespace before ";"
src/utils: Remove the whitespace before ";"
src/rpc: Remove the whitespace before ";"
src/remote: Remove the whitespace before ";"
src/lxc: Remove the whitespace before ";"
examples: Remove the whitespace before ';'
python: Remove the whitespace before ";"
src/locking: Remove the whitespace before ";"
src/*.[ch]: Remove the whitespace before ";"
nwfitler: Change the comment style
syntax-check: Add the rule to forbid whitespace before ";"
build-aux/bracket-spacing.pl | 18 +++
daemon/libvirtd-config.c | 2 +-
daemon/remote.c | 12 +-
examples/domain-events/events-c/event-test.c | 2 +-
examples/openauth/openauth.c | 4 +-
python/libvirt-lxc-override.c | 4 +-
python/libvirt-override.c | 16 +-
src/conf/capabilities.c | 50 +++---
src/conf/cpu_conf.c | 14 +-
src/conf/domain_audit.c | 10 +-
src/conf/domain_conf.c | 230 +++++++++++++--------------
src/conf/domain_event.c | 32 ++--
src/conf/interface_conf.c | 8 +-
src/conf/network_conf.c | 28 ++--
src/conf/node_device_conf.c | 12 +-
src/conf/nwfilter_conf.c | 8 +-
src/conf/storage_conf.c | 8 +-
src/interface/interface_backend_udev.c | 2 +-
src/libvirt-lxc.c | 2 +-
src/libvirt.c | 10 +-
src/libxl/libxl_conf.c | 4 +-
src/libxl/libxl_driver.c | 2 +-
src/locking/domain_lock.c | 4 +-
src/locking/lock_daemon.c | 4 +-
src/locking/lock_driver_lockd.c | 12 +-
src/locking/lock_driver_sanlock.c | 6 +-
src/locking/lock_manager.c | 2 +-
src/lxc/lxc_cgroup.c | 4 +-
src/lxc/lxc_container.c | 24 +--
src/lxc/lxc_controller.c | 28 ++--
src/lxc/lxc_driver.c | 4 +-
src/lxc/lxc_hostdev.c | 4 +-
src/lxc/lxc_process.c | 18 +--
src/network/bridge_driver.c | 22 +--
src/node_device/node_device_udev.c | 2 +-
src/nodeinfo.c | 18 +--
src/nwfilter/nwfilter_dhcpsnoop.c | 10 +-
src/nwfilter/nwfilter_driver.c | 6 +-
src/openvz/openvz_driver.c | 6 +-
src/parallels/parallels_network.c | 12 +-
src/phyp/phyp_driver.c | 6 +-
src/qemu/qemu_agent.c | 4 +-
src/qemu/qemu_capabilities.c | 32 ++--
src/qemu/qemu_cgroup.c | 4 +-
src/qemu/qemu_command.c | 170 ++++++++++----------
src/qemu/qemu_conf.c | 4 +-
src/qemu/qemu_domain.c | 12 +-
src/qemu/qemu_driver.c | 30 ++--
src/qemu/qemu_hostdev.c | 8 +-
src/qemu/qemu_hotplug.c | 14 +-
src/qemu/qemu_migration.c | 6 +-
src/qemu/qemu_monitor.c | 2 +-
src/qemu/qemu_monitor_json.c | 34 ++--
src/qemu/qemu_monitor_text.c | 2 +-
src/qemu/qemu_process.c | 44 ++---
src/remote/remote_driver.c | 24 +--
src/rpc/virnetclient.c | 12 +-
src/rpc/virnetclientprogram.c | 12 +-
src/rpc/virnetmessage.c | 6 +-
src/rpc/virnetserver.c | 26 +--
src/rpc/virnetserverclient.c | 4 +-
src/rpc/virnetserverprogram.c | 2 +-
src/rpc/virnetserverservice.c | 14 +-
src/rpc/virnetsocket.c | 2 +-
src/rpc/virnettlscontext.c | 2 +-
src/security/security_dac.c | 8 +-
src/security/security_driver.c | 2 +-
src/security/security_selinux.c | 8 +-
src/security/virt-aa-helper.c | 4 +-
src/storage/storage_backend.c | 14 +-
src/storage/storage_backend_disk.c | 2 +-
src/storage/storage_backend_iscsi.c | 10 +-
src/storage/storage_backend_logical.c | 6 +-
src/storage/storage_driver.c | 26 +--
src/test/test_driver.c | 80 +++++-----
src/uml/uml_conf.c | 12 +-
src/uml/uml_driver.c | 14 +-
src/util/virarch.c | 2 +-
src/util/virauth.c | 2 +-
src/util/vircgroup.c | 38 ++---
src/util/vircommand.c | 12 +-
src/util/vireventpoll.c | 22 +--
src/util/virhash.c | 6 +-
src/util/viridentity.c | 4 +-
src/util/virjson.c | 16 +-
src/util/virlockspace.c | 10 +-
src/util/virportallocator.c | 2 +-
src/util/virprocess.c | 14 +-
src/util/virstoragefile.c | 4 +-
src/util/virstring.c | 2 +-
src/util/virthreadwin32.c | 4 +-
src/util/viruri.c | 2 +-
src/util/virutil.c | 2 +-
src/vbox/vbox_tmpl.c | 2 +-
src/vmware/vmware_conf.c | 2 +-
src/vmware/vmware_driver.c | 2 +-
src/xen/xen_driver.c | 6 +-
src/xen/xen_driver.h | 2 +-
src/xen/xen_hypervisor.c | 4 +-
src/xen/xen_inotify.c | 4 +-
src/xen/xm_internal.c | 4 +-
src/xen/xs_internal.c | 12 +-
src/xenxs/xen_sxpr.c | 20 +--
src/xenxs/xen_xm.c | 16 +-
tests/commandhelper.c | 6 +-
tests/eventtest.c | 18 +--
tests/fdstreamtest.c | 14 +-
tests/libvirtdconftest.c | 2 +-
tests/nodeinfotest.c | 2 +-
tests/qemuhelptest.c | 2 +-
tests/qemumonitortestutils.c | 2 +-
tests/qemuxml2argvtest.c | 4 +-
tests/securityselinuxlabeltest.c | 12 +-
tests/ssh.c | 4 +-
tests/testutils.c | 16 +-
tests/vircgrouptest.c | 2 +-
tests/virnetsockettest.c | 10 +-
tests/viruritest.c | 2 +-
tools/virsh-domain.c | 6 +-
tools/virsh-nodedev.c | 6 +-
tools/virsh-nwfilter.c | 2 +-
tools/virsh-secret.c | 2 +-
tools/virsh.c | 4 +-
123 files changed, 838 insertions(+), 820 deletions(-)
--
1.8.1.4
5 a.m.
New subject: [libvirt] [PATCH 01/31] src/network: Remove the whitespace before '; '
---
src/network/bridge_driver.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 6c6ce6d..c3a2e1b 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -264,7 +264,7 @@ networkFindActiveConfigs(struct network_driver *driver)
{
unsigned int i;
- for (i = 0 ; i < driver->networks.count ; i++) {
+ for (i = 0; i < driver->networks.count; i++) {
virNetworkObjPtr obj = driver->networks.objs[i];
virNetworkObjLock(obj);
@@ -317,7 +317,7 @@ static void
networkAutostartConfigs(struct network_driver *driver) {
unsigned int i;
- for (i = 0 ; i < driver->networks.count ; i++) {
+ for (i = 0; i < driver->networks.count; i++) {
virNetworkObjLock(driver->networks.objs[i]);
if (driver->networks.objs[i]->autostart &&
!virNetworkObjIsActive(driver->networks.objs[i])) {
@@ -888,7 +888,7 @@ networkDnsmasqConfContents(virNetworkObjPtr network,
ipdef = ipv4def ? ipv4def : ipv6def;
while (ipdef) {
- for (r = 0 ; r < ipdef->nranges ; r++) {
+ for (r = 0; r < ipdef->nranges; r++) {
char *saddr = virSocketAddrFormat(&ipdef->ranges[r].start);
if (!saddr)
goto cleanup;
@@ -1521,7 +1521,7 @@ networkRefreshDaemons(struct network_driver *driver)
VIR_INFO("Refreshing network daemons");
- for (i = 0 ; i < driver->networks.count ; i++) {
+ for (i = 0; i < driver->networks.count; i++) {
virNetworkObjPtr network = driver->networks.objs[i];
virNetworkObjLock(network);
@@ -2187,7 +2187,7 @@ networkReloadIptablesRules(struct network_driver *driver)
VIR_INFO("Reloading iptables rules");
- for (i = 0 ; i < driver->networks.count ; i++) {
+ for (i = 0; i < driver->networks.count; i++) {
virNetworkObjPtr network = driver->networks.objs[i];
virNetworkObjLock(network);
@@ -2887,7 +2887,7 @@ static int networkConnectNumOfNetworks(virConnectPtr conn) {
struct network_driver *driver = conn->networkPrivateData;
networkDriverLock(driver);
- for (i = 0 ; i < driver->networks.count ; i++) {
+ for (i = 0; i < driver->networks.count; i++) {
virNetworkObjLock(driver->networks.objs[i]);
if (virNetworkObjIsActive(driver->networks.objs[i]))
nactive++;
@@ -2903,7 +2903,7 @@ static int networkConnectListNetworks(virConnectPtr conn, char
**const names, in
int got = 0, i;
networkDriverLock(driver);
- for (i = 0 ; i < driver->networks.count && got < nnames ; i++) {
+ for (i = 0; i < driver->networks.count && got < nnames; i++) {
virNetworkObjLock(driver->networks.objs[i]);
if (virNetworkObjIsActive(driver->networks.objs[i])) {
if (VIR_STRDUP(names[got], driver->networks.objs[i]->def->name) <
0) {
@@ -2920,7 +2920,7 @@ static int networkConnectListNetworks(virConnectPtr conn, char
**const names, in
cleanup:
networkDriverUnlock(driver);
- for (i = 0 ; i < got ; i++)
+ for (i = 0; i < got; i++)
VIR_FREE(names[i]);
return -1;
}
@@ -2930,7 +2930,7 @@ static int networkConnectNumOfDefinedNetworks(virConnectPtr conn) {
struct network_driver *driver = conn->networkPrivateData;
networkDriverLock(driver);
- for (i = 0 ; i < driver->networks.count ; i++) {
+ for (i = 0; i < driver->networks.count; i++) {
virNetworkObjLock(driver->networks.objs[i]);
if (!virNetworkObjIsActive(driver->networks.objs[i]))
ninactive++;
@@ -2946,7 +2946,7 @@ static int networkConnectListDefinedNetworks(virConnectPtr conn,
char **const na
int got = 0, i;
networkDriverLock(driver);
- for (i = 0 ; i < driver->networks.count && got < nnames ; i++) {
+ for (i = 0; i < driver->networks.count && got < nnames; i++) {
virNetworkObjLock(driver->networks.objs[i]);
if (!virNetworkObjIsActive(driver->networks.objs[i])) {
if (VIR_STRDUP(names[got], driver->networks.objs[i]->def->name) <
0) {
@@ -2962,7 +2962,7 @@ static int networkConnectListDefinedNetworks(virConnectPtr conn,
char **const na
cleanup:
networkDriverUnlock(driver);
- for (i = 0 ; i < got ; i++)
+ for (i = 0; i < got; i++)
VIR_FREE(names[i]);
return -1;
}
--
1.8.1.4
10:12 a.m.
New subject: [libvirt] [PATCH 01/31] src/network: Remove the whitespace before '; '
On 05/21/2013 04:00 AM, Osier Yang wrote:
---
src/network/bridge_driver.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
ACK.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
5 a.m.
New subject: [libvirt] [PATCH 02/31] src/libxl: Remove the whitespace before '; '
---
src/libxl/libxl_conf.c | 4 ++--
src/libxl/libxl_driver.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 1a7e430..90d563b 100644
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -244,7 +244,7 @@ libxlMakeCapabilitiesInternal(virArch hostarch,
}
/* Search for existing matching (model,hvm) tuple */
- for (i = 0 ; i < nr_guest_archs ; i++) {
+ for (i = 0; i < nr_guest_archs; i++) {
if ((guest_archs[i].arch == arch) &&
guest_archs[i].hvm == hvm) {
break;
@@ -377,7 +377,7 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, libxl_domain_config
*d_config)
libxl_defbool_set(&b_info->u.hvm.hpet, 1);
}
}
- for (i = 0 ; i < def->os.nBootDevs ; i++) {
+ for (i = 0; i < def->os.nBootDevs; i++) {
switch (def->os.bootDevs[i]) {
case VIR_DOMAIN_BOOT_FLOPPY:
bootorder[i] = 'a';
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index d268eea..7245f97 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -3213,7 +3213,7 @@ libxlDomainChangeEjectableMedia(libxlDomainObjPrivatePtr priv,
int i;
int ret = -1;
- for (i = 0 ; i < vm->def->ndisks ; i++) {
+ for (i = 0; i < vm->def->ndisks; i++) {
if (vm->def->disks[i]->bus == disk->bus &&
STREQ(vm->def->disks[i]->dst, disk->dst)) {
origdisk = vm->def->disks[i];
--
1.8.1.4
10:13 a.m.
New subject: [libvirt] [PATCH 02/31] src/libxl: Remove the whitespace before '; '
On 05/21/2013 04:00 AM, Osier Yang wrote:
---
src/libxl/libxl_conf.c | 4 ++--
src/libxl/libxl_driver.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
ACK.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
5 a.m.
New subject: [libvirt] [PATCH 03/31] src/conf: Remove the whitespace before '; '
---
src/conf/capabilities.c | 50 +++++-----
src/conf/cpu_conf.c | 14 +--
src/conf/domain_audit.c | 10 +-
src/conf/domain_conf.c | 230 ++++++++++++++++++++++----------------------
src/conf/domain_event.c | 32 +++---
src/conf/interface_conf.c | 8 +-
src/conf/network_conf.c | 28 +++---
src/conf/node_device_conf.c | 12 +--
src/conf/nwfilter_conf.c | 8 +-
src/conf/storage_conf.c | 8 +-
10 files changed, 200 insertions(+), 200 deletions(-)
diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index 5340b63..e997969 100644
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -129,7 +129,7 @@ virCapabilitiesFreeGuestDomain(virCapsGuestDomainPtr dom)
VIR_FREE(dom->info.emulator);
VIR_FREE(dom->info.loader);
- for (i = 0 ; i < dom->info.nmachines ; i++)
+ for (i = 0; i < dom->info.nmachines; i++)
virCapabilitiesFreeGuestMachine(dom->info.machines[i]);
VIR_FREE(dom->info.machines);
VIR_FREE(dom->type);
@@ -157,15 +157,15 @@ virCapabilitiesFreeGuest(virCapsGuestPtr guest)
VIR_FREE(guest->arch.defaultInfo.emulator);
VIR_FREE(guest->arch.defaultInfo.loader);
- for (i = 0 ; i < guest->arch.defaultInfo.nmachines ; i++)
+ for (i = 0; i < guest->arch.defaultInfo.nmachines; i++)
virCapabilitiesFreeGuestMachine(guest->arch.defaultInfo.machines[i]);
VIR_FREE(guest->arch.defaultInfo.machines);
- for (i = 0 ; i < guest->arch.ndomains ; i++)
+ for (i = 0; i < guest->arch.ndomains; i++)
virCapabilitiesFreeGuestDomain(guest->arch.domains[i]);
VIR_FREE(guest->arch.domains);
- for (i = 0 ; i < guest->nfeatures ; i++)
+ for (i = 0; i < guest->nfeatures; i++)
virCapabilitiesFreeGuestFeature(guest->features[i]);
VIR_FREE(guest->features);
@@ -177,7 +177,7 @@ virCapabilitiesFreeNUMAInfo(virCapsPtr caps)
{
int i;
- for (i = 0 ; i < caps->host.nnumaCell ; i++)
+ for (i = 0; i < caps->host.nnumaCell; i++)
virCapabilitiesFreeHostNUMACell(caps->host.numaCell[i]);
VIR_FREE(caps->host.numaCell);
caps->host.nnumaCell = 0;
@@ -189,17 +189,17 @@ virCapabilitiesDispose(void *object)
virCapsPtr caps = object;
int i;
- for (i = 0 ; i < caps->nguests ; i++)
+ for (i = 0; i < caps->nguests; i++)
virCapabilitiesFreeGuest(caps->guests[i]);
VIR_FREE(caps->guests);
- for (i = 0 ; i < caps->host.nfeatures ; i++)
+ for (i = 0; i < caps->host.nfeatures; i++)
VIR_FREE(caps->host.features[i]);
VIR_FREE(caps->host.features);
virCapabilitiesFreeNUMAInfo(caps);
- for (i = 0 ; i < caps->host.nmigrateTrans ; i++)
+ for (i = 0; i < caps->host.nmigrateTrans; i++)
VIR_FREE(caps->host.migrateTrans[i]);
VIR_FREE(caps->host.migrateTrans);
@@ -527,7 +527,7 @@ virCapabilitiesSupportsGuestArch(virCapsPtr caps,
virArch arch)
{
int i;
- for (i = 0 ; i < caps->nguests ; i++) {
+ for (i = 0; i < caps->nguests; i++) {
if (caps->guests[i]->arch.id == arch)
return 1;
}
@@ -548,7 +548,7 @@ virCapabilitiesSupportsGuestOSType(virCapsPtr caps,
const char *ostype)
{
int i;
- for (i = 0 ; i < caps->nguests ; i++) {
+ for (i = 0; i < caps->nguests; i++) {
if (STREQ(caps->guests[i]->ostype, ostype))
return 1;
}
@@ -571,7 +571,7 @@ virCapabilitiesSupportsGuestOSTypeArch(virCapsPtr caps,
virArch arch)
{
int i;
- for (i = 0 ; i < caps->nguests ; i++) {
+ for (i = 0; i < caps->nguests; i++) {
if (STREQ(caps->guests[i]->ostype, ostype) &&
caps->guests[i]->arch.id == arch)
return 1;
@@ -596,9 +596,9 @@ virCapabilitiesDefaultGuestArch(virCapsPtr caps,
int i, j;
/* First try to find one matching host arch */
- for (i = 0 ; i < caps->nguests ; i++) {
+ for (i = 0; i < caps->nguests; i++) {
if (STREQ(caps->guests[i]->ostype, ostype)) {
- for (j = 0 ; j < caps->guests[i]->arch.ndomains ; j++) {
+ for (j = 0; j < caps->guests[i]->arch.ndomains; j++) {
if (STREQ(caps->guests[i]->arch.domains[j]->type, domain)
&&
caps->guests[i]->arch.id == caps->host.arch)
return caps->guests[i]->arch.id;
@@ -607,9 +607,9 @@ virCapabilitiesDefaultGuestArch(virCapsPtr caps,
}
/* Otherwise find the first match */
- for (i = 0 ; i < caps->nguests ; i++) {
+ for (i = 0; i < caps->nguests; i++) {
if (STREQ(caps->guests[i]->ostype, ostype)) {
- for (j = 0 ; j < caps->guests[i]->arch.ndomains ; j++) {
+ for (j = 0; j < caps->guests[i]->arch.ndomains; j++) {
if (STREQ(caps->guests[i]->arch.domains[j]->type, domain))
return caps->guests[i]->arch.id;
}
@@ -638,7 +638,7 @@ virCapabilitiesDefaultGuestMachine(virCapsPtr caps,
{
int i;
- for (i = 0 ; i < caps->nguests ; i++) {
+ for (i = 0; i < caps->nguests; i++) {
virCapsGuestPtr guest = caps->guests[i];
int j;
@@ -683,12 +683,12 @@ virCapabilitiesDefaultGuestEmulator(virCapsPtr caps,
const char *domain)
{
int i, j;
- for (i = 0 ; i < caps->nguests ; i++) {
+ for (i = 0; i < caps->nguests; i++) {
char *emulator;
if (STREQ(caps->guests[i]->ostype, ostype) &&
caps->guests[i]->arch.id == arch) {
emulator = caps->guests[i]->arch.defaultInfo.emulator;
- for (j = 0 ; j < caps->guests[i]->arch.ndomains ; j++) {
+ for (j = 0; j < caps->guests[i]->arch.ndomains; j++) {
if (STREQ(caps->guests[i]->arch.domains[j]->type, domain)) {
if (caps->guests[i]->arch.domains[j]->info.emulator)
emulator =
caps->guests[i]->arch.domains[j]->info.emulator;
@@ -778,7 +778,7 @@ virCapabilitiesFormatXML(virCapsPtr caps)
if (caps->host.nfeatures) {
virBufferAddLit(&xml, " <features>\n");
- for (i = 0 ; i < caps->host.nfeatures ; i++) {
+ for (i = 0; i < caps->host.nfeatures; i++) {
virBufferAsprintf(&xml, " <%s/>\n",
caps->host.features[i]);
}
@@ -814,7 +814,7 @@ virCapabilitiesFormatXML(virCapsPtr caps)
virBufferAddLit(&xml, " <live/>\n");
if (caps->host.nmigrateTrans) {
virBufferAddLit(&xml, " <uri_transports>\n");
- for (i = 0 ; i < caps->host.nmigrateTrans ; i++) {
+ for (i = 0; i < caps->host.nmigrateTrans; i++) {
virBufferAsprintf(&xml, "
<uri_transport>%s</uri_transport>\n",
caps->host.migrateTrans[i]);
}
@@ -840,7 +840,7 @@ virCapabilitiesFormatXML(virCapsPtr caps)
virBufferAddLit(&xml, " </host>\n\n");
- for (i = 0 ; i < caps->nguests ; i++) {
+ for (i = 0; i < caps->nguests; i++) {
virBufferAddLit(&xml, " <guest>\n");
virBufferAsprintf(&xml, " <os_type>%s</os_type>\n",
caps->guests[i]->ostype);
@@ -856,7 +856,7 @@ virCapabilitiesFormatXML(virCapsPtr caps)
virBufferAsprintf(&xml, "
<loader>%s</loader>\n",
caps->guests[i]->arch.defaultInfo.loader);
- for (j = 0 ; j < caps->guests[i]->arch.defaultInfo.nmachines ; j++) {
+ for (j = 0; j < caps->guests[i]->arch.defaultInfo.nmachines; j++) {
virCapsGuestMachinePtr machine =
caps->guests[i]->arch.defaultInfo.machines[j];
virBufferAddLit(&xml, " <machine");
if (machine->canonical)
@@ -864,7 +864,7 @@ virCapabilitiesFormatXML(virCapsPtr caps)
virBufferAsprintf(&xml, ">%s</machine>\n",
machine->name);
}
- for (j = 0 ; j < caps->guests[i]->arch.ndomains ; j++) {
+ for (j = 0; j < caps->guests[i]->arch.ndomains; j++) {
virBufferAsprintf(&xml, " <domain
type='%s'>\n",
caps->guests[i]->arch.domains[j]->type);
if (caps->guests[i]->arch.domains[j]->info.emulator)
@@ -874,7 +874,7 @@ virCapabilitiesFormatXML(virCapsPtr caps)
virBufferAsprintf(&xml, "
<loader>%s</loader>\n",
caps->guests[i]->arch.domains[j]->info.loader);
- for (k = 0 ; k < caps->guests[i]->arch.domains[j]->info.nmachines
; k++) {
+ for (k = 0; k < caps->guests[i]->arch.domains[j]->info.nmachines;
k++) {
virCapsGuestMachinePtr machine =
caps->guests[i]->arch.domains[j]->info.machines[k];
virBufferAddLit(&xml, " <machine");
if (machine->canonical)
@@ -889,7 +889,7 @@ virCapabilitiesFormatXML(virCapsPtr caps)
if (caps->guests[i]->nfeatures) {
virBufferAddLit(&xml, " <features>\n");
- for (j = 0 ; j < caps->guests[i]->nfeatures ; j++) {
+ for (j = 0; j < caps->guests[i]->nfeatures; j++) {
if (STREQ(caps->guests[i]->features[j]->name, "pae")
||
STREQ(caps->guests[i]->features[j]->name,
"nonpae") ||
STREQ(caps->guests[i]->features[j]->name,
"ia64_be") ||
diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index 6aaee75..a006556 100644
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -81,7 +81,7 @@ virCPUDefFree(virCPUDefPtr def)
virCPUDefFreeModel(def);
- for (i = 0 ; i < def->ncells ; i++) {
+ for (i = 0; i < def->ncells; i++) {
virBitmapFree(def->cells[i].cpumask);
VIR_FREE(def->cells[i].cpustr);
}
@@ -387,7 +387,7 @@ virCPUDefParseXML(const xmlNodePtr node,
def->nfeatures = n;
}
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
char *name;
int policy; /* enum virDomainCPUFeaturePolicy */
unsigned int j;
@@ -418,7 +418,7 @@ virCPUDefParseXML(const xmlNodePtr node,
goto error;
}
- for (j = 0 ; j < i ; j++) {
+ for (j = 0; j < i; j++) {
if (STREQ(name, def->features[j].name)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("CPU feature `%s' specified more than
once"),
@@ -447,7 +447,7 @@ virCPUDefParseXML(const xmlNodePtr node,
def->ncells = n;
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
char *cpus, *memory;
int ret, ncpus = 0;
@@ -630,7 +630,7 @@ virCPUDefFormatBuf(virBufferPtr buf,
}
if (formatModel) {
- for (i = 0 ; i < def->nfeatures ; i++) {
+ for (i = 0; i < def->nfeatures; i++) {
virCPUFeatureDefPtr feature = def->features + i;
if (!feature->name) {
@@ -679,7 +679,7 @@ virCPUDefAddFeature(virCPUDefPtr def,
{
int i;
- for (i = 0 ; i < def->nfeatures ; i++) {
+ for (i = 0; i < def->nfeatures; i++) {
if (STREQ(name, def->features[i].name)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("CPU feature `%s' specified more than once"),
name);
@@ -796,7 +796,7 @@ virCPUDefIsEqual(virCPUDefPtr src,
goto cleanup;
}
- for (i = 0 ; i < src->nfeatures ; i++) {
+ for (i = 0; i < src->nfeatures; i++) {
if (STRNEQ(src->features[i].name, dst->features[i].name)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Target CPU feature %s does not match source
%s"),
diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c
index a6cefb2..fd3de5e 100644
--- a/src/conf/domain_audit.c
+++ b/src/conf/domain_audit.c
@@ -795,28 +795,28 @@ virDomainAuditStart(virDomainObjPtr vm, const char *reason, bool
success)
{
int i;
- for (i = 0 ; i < vm->def->ndisks ; i++) {
+ for (i = 0; i < vm->def->ndisks; i++) {
virDomainDiskDefPtr disk = vm->def->disks[i];
if (disk->src) /* Skips CDROM without media initially inserted */
virDomainAuditDisk(vm, NULL, disk->src, "start", true);
}
- for (i = 0 ; i < vm->def->nfss ; i++) {
+ for (i = 0; i < vm->def->nfss; i++) {
virDomainFSDefPtr fs = vm->def->fss[i];
virDomainAuditFS(vm, NULL, fs, "start", true);
}
- for (i = 0 ; i < vm->def->nnets ; i++) {
+ for (i = 0; i < vm->def->nnets; i++) {
virDomainNetDefPtr net = vm->def->nets[i];
virDomainAuditNet(vm, NULL, net, "start", true);
}
- for (i = 0 ; i < vm->def->nhostdevs ; i++) {
+ for (i = 0; i < vm->def->nhostdevs; i++) {
virDomainHostdevDefPtr hostdev = vm->def->hostdevs[i];
virDomainAuditHostdev(vm, hostdev, "start", true);
}
- for (i = 0 ; i < vm->def->nredirdevs ; i++) {
+ for (i = 0; i < vm->def->nredirdevs; i++) {
virDomainRedirdevDefPtr redirdev = vm->def->redirdevs[i];
virDomainAuditRedirdev(vm, redirdev, "start", true);
}
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index e7a0381..a8aed06 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1186,7 +1186,7 @@ void virDomainDiskDefFree(virDomainDiskDefPtr def)
VIR_FREE(def->seclabels);
}
- for (i = 0 ; i < def->nhosts ; i++)
+ for (i = 0; i < def->nhosts; i++)
virDomainDiskHostDefFree(&def->hosts[i]);
VIR_FREE(def->hosts);
@@ -1562,7 +1562,7 @@ void virDomainSoundDefFree(virDomainSoundDefPtr def)
virDomainDeviceInfoClear(&def->info);
int i;
- for (i = 0 ; i < def->ncodecs ; i++)
+ for (i = 0; i < def->ncodecs; i++)
virDomainSoundCodecDefFree(def->codecs[i]);
VIR_FREE(def->codecs);
@@ -1885,71 +1885,71 @@ void virDomainDefFree(virDomainDefPtr def)
* so the original object must still be available during the call
* to virDomainHostdevDefFree().
*/
- for (i = 0 ; i < def->nhostdevs ; i++)
+ for (i = 0; i < def->nhostdevs; i++)
virDomainHostdevDefFree(def->hostdevs[i]);
VIR_FREE(def->hostdevs);
- for (i = 0 ; i < def->nleases ; i++)
+ for (i = 0; i < def->nleases; i++)
virDomainLeaseDefFree(def->leases[i]);
VIR_FREE(def->leases);
- for (i = 0 ; i < def->ngraphics ; i++)
+ for (i = 0; i < def->ngraphics; i++)
virDomainGraphicsDefFree(def->graphics[i]);
VIR_FREE(def->graphics);
- for (i = 0 ; i < def->ninputs ; i++)
+ for (i = 0; i < def->ninputs; i++)
virDomainInputDefFree(def->inputs[i]);
VIR_FREE(def->inputs);
- for (i = 0 ; i < def->ndisks ; i++)
+ for (i = 0; i < def->ndisks; i++)
virDomainDiskDefFree(def->disks[i]);
VIR_FREE(def->disks);
- for (i = 0 ; i < def->ncontrollers ; i++)
+ for (i = 0; i < def->ncontrollers; i++)
virDomainControllerDefFree(def->controllers[i]);
VIR_FREE(def->controllers);
- for (i = 0 ; i < def->nfss ; i++)
+ for (i = 0; i < def->nfss; i++)
virDomainFSDefFree(def->fss[i]);
VIR_FREE(def->fss);
- for (i = 0 ; i < def->nnets ; i++)
+ for (i = 0; i < def->nnets; i++)
virDomainNetDefFree(def->nets[i]);
VIR_FREE(def->nets);
- for (i = 0 ; i < def->nsmartcards ; i++)
+ for (i = 0; i < def->nsmartcards; i++)
virDomainSmartcardDefFree(def->smartcards[i]);
VIR_FREE(def->smartcards);
- for (i = 0 ; i < def->nserials ; i++)
+ for (i = 0; i < def->nserials; i++)
virDomainChrDefFree(def->serials[i]);
VIR_FREE(def->serials);
- for (i = 0 ; i < def->nparallels ; i++)
+ for (i = 0; i < def->nparallels; i++)
virDomainChrDefFree(def->parallels[i]);
VIR_FREE(def->parallels);
- for (i = 0 ; i < def->nchannels ; i++)
+ for (i = 0; i < def->nchannels; i++)
virDomainChrDefFree(def->channels[i]);
VIR_FREE(def->channels);
- for (i = 0 ; i < def->nconsoles ; i++)
+ for (i = 0; i < def->nconsoles; i++)
virDomainChrDefFree(def->consoles[i]);
VIR_FREE(def->consoles);
- for (i = 0 ; i < def->nsounds ; i++)
+ for (i = 0; i < def->nsounds; i++)
virDomainSoundDefFree(def->sounds[i]);
VIR_FREE(def->sounds);
- for (i = 0 ; i < def->nvideos ; i++)
+ for (i = 0; i < def->nvideos; i++)
virDomainVideoDefFree(def->videos[i]);
VIR_FREE(def->videos);
- for (i = 0 ; i < def->nhubs ; i++)
+ for (i = 0; i < def->nhubs; i++)
virDomainHubDefFree(def->hubs[i]);
VIR_FREE(def->hubs);
- for (i = 0 ; i < def->nredirdevs ; i++)
+ for (i = 0; i < def->nredirdevs; i++)
virDomainRedirdevDefFree(def->redirdevs[i]);
VIR_FREE(def->redirdevs);
@@ -1960,7 +1960,7 @@ void virDomainDefFree(virDomainDefPtr def)
VIR_FREE(def->os.type);
VIR_FREE(def->os.machine);
VIR_FREE(def->os.init);
- for (i = 0 ; def->os.initargv && def->os.initargv[i] ; i++)
+ for (i = 0; def->os.initargv && def->os.initargv[i]; i++)
VIR_FREE(def->os.initargv[i]);
VIR_FREE(def->os.initargv);
VIR_FREE(def->os.kernel);
@@ -2458,64 +2458,64 @@ virDomainDeviceInfoIterateInternal(virDomainDefPtr def,
virDomainDeviceDef device;
device.type = VIR_DOMAIN_DEVICE_DISK;
- for (i = 0; i < def->ndisks ; i++) {
+ for (i = 0; i < def->ndisks; i++) {
device.data.disk = def->disks[i];
if (cb(def, &device, &def->disks[i]->info, opaque) < 0)
return -1;
}
device.type = VIR_DOMAIN_DEVICE_NET;
- for (i = 0; i < def->nnets ; i++) {
+ for (i = 0; i < def->nnets; i++) {
device.data.net = def->nets[i];
if (cb(def, &device, &def->nets[i]->info, opaque) < 0)
return -1;
}
device.type = VIR_DOMAIN_DEVICE_SOUND;
- for (i = 0; i < def->nsounds ; i++) {
+ for (i = 0; i < def->nsounds; i++) {
device.data.sound = def->sounds[i];
if (cb(def, &device, &def->sounds[i]->info, opaque) < 0)
return -1;
}
device.type = VIR_DOMAIN_DEVICE_HOSTDEV;
- for (i = 0; i < def->nhostdevs ; i++) {
+ for (i = 0; i < def->nhostdevs; i++) {
device.data.hostdev = def->hostdevs[i];
if (cb(def, &device, def->hostdevs[i]->info, opaque) < 0)
return -1;
}
device.type = VIR_DOMAIN_DEVICE_VIDEO;
- for (i = 0; i < def->nvideos ; i++) {
+ for (i = 0; i < def->nvideos; i++) {
device.data.video = def->videos[i];
if (cb(def, &device, &def->videos[i]->info, opaque) < 0)
return -1;
}
device.type = VIR_DOMAIN_DEVICE_CONTROLLER;
- for (i = 0; i < def->ncontrollers ; i++) {
+ for (i = 0; i < def->ncontrollers; i++) {
device.data.controller = def->controllers[i];
if (cb(def, &device, &def->controllers[i]->info, opaque) < 0)
return -1;
}
device.type = VIR_DOMAIN_DEVICE_SMARTCARD;
- for (i = 0; i < def->nsmartcards ; i++) {
+ for (i = 0; i < def->nsmartcards; i++) {
device.data.smartcard = def->smartcards[i];
if (cb(def, &device, &def->smartcards[i]->info, opaque) < 0)
return -1;
}
device.type = VIR_DOMAIN_DEVICE_CHR;
- for (i = 0; i < def->nserials ; i++) {
+ for (i = 0; i < def->nserials; i++) {
device.data.chr = def->serials[i];
if (cb(def, &device, &def->serials[i]->info, opaque) < 0)
return -1;
}
- for (i = 0; i < def->nparallels ; i++) {
+ for (i = 0; i < def->nparallels; i++) {
device.data.chr = def->parallels[i];
if (cb(def, &device, &def->parallels[i]->info, opaque) < 0)
return -1;
}
- for (i = 0; i < def->nchannels ; i++) {
+ for (i = 0; i < def->nchannels; i++) {
device.data.chr = def->channels[i];
if (cb(def, &device, &def->channels[i]->info, opaque) < 0)
return -1;
}
- for (i = 0; i < def->nconsoles ; i++) {
+ for (i = 0; i < def->nconsoles; i++) {
if (!all &&
i == 0 &&
(def->consoles[i]->targetType ==
VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL ||
@@ -2527,13 +2527,13 @@ virDomainDeviceInfoIterateInternal(virDomainDefPtr def,
return -1;
}
device.type = VIR_DOMAIN_DEVICE_INPUT;
- for (i = 0; i < def->ninputs ; i++) {
+ for (i = 0; i < def->ninputs; i++) {
device.data.input = def->inputs[i];
if (cb(def, &device, &def->inputs[i]->info, opaque) < 0)
return -1;
}
device.type = VIR_DOMAIN_DEVICE_FS;
- for (i = 0; i < def->nfss ; i++) {
+ for (i = 0; i < def->nfss; i++) {
device.data.fs = def->fss[i];
if (cb(def, &device, &def->fss[i]->info, opaque) < 0)
return -1;
@@ -2563,7 +2563,7 @@ virDomainDeviceInfoIterateInternal(virDomainDefPtr def,
return -1;
}
device.type = VIR_DOMAIN_DEVICE_HUB;
- for (i = 0; i < def->nhubs ; i++) {
+ for (i = 0; i < def->nhubs; i++) {
device.data.hub = def->hubs[i];
if (cb(def, &device, &def->hubs[i]->info, opaque) < 0)
return -1;
@@ -4002,7 +4002,7 @@ virDomainDiskFindByBusAndDst(virDomainDefPtr def,
if (!dst)
return NULL;
- for (i = 0 ; i < def->ndisks ; i++) {
+ for (i = 0; i < def->ndisks; i++) {
if (def->disks[i]->bus == bus &&
STREQ(def->disks[i]->dst, dst)) {
return def->disks[i];
@@ -9488,7 +9488,7 @@ virDomainHostdevFind(virDomainDefPtr def,
found = &local_found;
*found = NULL;
- for (i = 0 ; i < def->nhostdevs ; i++) {
+ for (i = 0; i < def->nhostdevs; i++) {
if (virDomainHostdevMatch(match, def->hostdevs[i])) {
*found = def->hostdevs[i];
break;
@@ -9561,7 +9561,7 @@ void virDomainDiskInsertPreAlloced(virDomainDefPtr def,
* index greater than the new one, insert at
* that position
*/
- for (i = (def->ndisks - 1) ; i >= 0 ; i--) {
+ for (i = (def->ndisks - 1); i >= 0; i--) {
/* If bus matches and current disk is after
* new disk, then new disk should go here */
if (def->disks[i]->bus == disk->bus &&
@@ -9660,7 +9660,7 @@ virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net)
bool PCIAddrSpecified = virDomainDeviceAddressIsValid(&net->info,
VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI);
- for (ii = 0 ; ii < def->nnets ; ii++) {
+ for (ii = 0; ii < def->nnets; ii++) {
if (virMacAddrCmp(&def->nets[ii]->mac, &net->mac))
continue;
@@ -9750,7 +9750,7 @@ void virDomainControllerInsertPreAlloced(virDomainDefPtr def,
* index greater than the new one, insert at
* that position
*/
- for (i = (def->ncontrollers - 1) ; i >= 0 ; i--) {
+ for (i = (def->ncontrollers - 1); i >= 0; i--) {
/* If bus matches and current controller is after
* new controller, then new controller should go here */
if (def->controllers[i]->type == controller->type &&
@@ -9784,7 +9784,7 @@ virDomainControllerFind(virDomainDefPtr def,
{
int i;
- for (i = 0 ; i < def->ncontrollers ; i++) {
+ for (i = 0; i < def->ncontrollers; i++) {
if ((def->controllers[i]->type == type) &&
(def->controllers[i]->idx == idx)) {
return i;
@@ -9964,7 +9964,7 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt,
goto cleanup;
}
- for (i = 0 ; i < n && i < VIR_DOMAIN_BOOT_LAST ; i++) {
+ for (i = 0; i < n && i < VIR_DOMAIN_BOOT_LAST; i++) {
int val;
char *dev = virXMLPropString(nodes[i], "dev");
if (!dev) {
@@ -10612,7 +10612,7 @@ virDomainDefParseXML(xmlDocPtr xml,
goto error;
}
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virDomainVcpuPinDefPtr vcpupin = NULL;
vcpupin = virDomainVcpuPinDefParseXML(nodes[i], ctxt, def->maxvcpus, 0);
@@ -10835,7 +10835,7 @@ virDomainDefParseXML(xmlDocPtr xml,
if ((n = virXPathNodeSet("./features/*", ctxt, &nodes)) < 0)
goto error;
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
int val = virDomainFeatureTypeFromString((const char *)nodes[i]->name);
if (val < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
@@ -11019,7 +11019,7 @@ virDomainDefParseXML(xmlDocPtr xml,
if (n && VIR_ALLOC_N(def->clock.timers, n) < 0)
goto no_memory;
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virDomainTimerDefPtr timer = virDomainTimerDefParseXML(nodes[i],
ctxt);
if (!timer)
@@ -11135,7 +11135,7 @@ virDomainDefParseXML(xmlDocPtr xml,
if (VIR_ALLOC_N(def->os.initargv, n+1) < 0)
goto no_memory;
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
if (!nodes[i]->children ||
!nodes[i]->children->content) {
virReportError(VIR_ERR_XML_ERROR, "%s",
@@ -11176,7 +11176,7 @@ virDomainDefParseXML(xmlDocPtr xml,
if (n && VIR_ALLOC_N(def->disks, n) < 0)
goto no_memory;
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virDomainDiskDefPtr disk = virDomainDiskDefParseXML(xmlopt,
nodes[i],
ctxt,
@@ -11198,7 +11198,7 @@ virDomainDefParseXML(xmlDocPtr xml,
if (n && VIR_ALLOC_N(def->controllers, n) < 0)
goto no_memory;
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virDomainControllerDefPtr controller = virDomainControllerDefParseXML(nodes[i],
flags);
if (!controller)
@@ -11254,7 +11254,7 @@ virDomainDefParseXML(xmlDocPtr xml,
}
if (n && VIR_ALLOC_N(def->leases, n) < 0)
goto no_memory;
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virDomainLeaseDefPtr lease = virDomainLeaseDefParseXML(nodes[i]);
if (!lease)
goto error;
@@ -11269,7 +11269,7 @@ virDomainDefParseXML(xmlDocPtr xml,
}
if (n && VIR_ALLOC_N(def->fss, n) < 0)
goto no_memory;
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virDomainFSDefPtr fs = virDomainFSDefParseXML(nodes[i], ctxt,
flags);
if (!fs)
@@ -11285,7 +11285,7 @@ virDomainDefParseXML(xmlDocPtr xml,
}
if (n && VIR_ALLOC_N(def->nets, n) < 0)
goto no_memory;
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virDomainNetDefPtr net = virDomainNetDefParseXML(xmlopt,
nodes[i],
ctxt,
@@ -11312,7 +11312,7 @@ virDomainDefParseXML(xmlDocPtr xml,
if (n && VIR_ALLOC_N(def->smartcards, n) < 0)
goto no_memory;
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virDomainSmartcardDefPtr card = virDomainSmartcardDefParseXML(nodes[i],
flags);
if (!card)
@@ -11330,7 +11330,7 @@ virDomainDefParseXML(xmlDocPtr xml,
if (n && VIR_ALLOC_N(def->parallels, n) < 0)
goto no_memory;
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virDomainChrDefPtr chr = virDomainChrDefParseXML(ctxt,
nodes[i],
def->seclabels,
@@ -11342,7 +11342,7 @@ virDomainDefParseXML(xmlDocPtr xml,
if (chr->target.port == -1) {
int maxport = -1;
int j;
- for (j = 0 ; j < i ; j++) {
+ for (j = 0; j < i; j++) {
if (def->parallels[j]->target.port > maxport)
maxport = def->parallels[j]->target.port;
}
@@ -11358,7 +11358,7 @@ virDomainDefParseXML(xmlDocPtr xml,
if (n && VIR_ALLOC_N(def->serials, n) < 0)
goto no_memory;
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virDomainChrDefPtr chr = virDomainChrDefParseXML(ctxt,
nodes[i],
def->seclabels,
@@ -11370,7 +11370,7 @@ virDomainDefParseXML(xmlDocPtr xml,
if (chr->target.port == -1) {
int maxport = -1;
int j;
- for (j = 0 ; j < i ; j++) {
+ for (j = 0; j < i; j++) {
if (def->serials[j]->target.port > maxport)
maxport = def->serials[j]->target.port;
}
@@ -11388,7 +11388,7 @@ virDomainDefParseXML(xmlDocPtr xml,
if (n && VIR_ALLOC_N(def->consoles, n) < 0)
goto no_memory;
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virDomainChrDefPtr chr = virDomainChrDefParseXML(ctxt,
nodes[i],
def->seclabels,
@@ -11408,7 +11408,7 @@ virDomainDefParseXML(xmlDocPtr xml,
if (n && VIR_ALLOC_N(def->channels, n) < 0)
goto no_memory;
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virDomainChrDefPtr chr = virDomainChrDefParseXML(ctxt,
nodes[i],
def->seclabels,
@@ -11428,7 +11428,7 @@ virDomainDefParseXML(xmlDocPtr xml,
chr->info.addr.vioserial.port == 0) {
int maxport = 0;
int j;
- for (j = 0 ; j < i ; j++) {
+ for (j = 0; j < i; j++) {
virDomainChrDefPtr thischr = def->channels[j];
if (thischr->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL
&&
thischr->info.addr.vioserial.controller ==
chr->info.addr.vioserial.controller &&
@@ -11449,7 +11449,7 @@ virDomainDefParseXML(xmlDocPtr xml,
if (n && VIR_ALLOC_N(def->inputs, n) < 0)
goto no_memory;
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virDomainInputDefPtr input = virDomainInputDefParseXML(def->os.type,
nodes[i],
flags);
@@ -11488,7 +11488,7 @@ virDomainDefParseXML(xmlDocPtr xml,
}
if (n && VIR_ALLOC_N(def->graphics, n) < 0)
goto no_memory;
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virDomainGraphicsDefPtr graphics = virDomainGraphicsDefParseXML(nodes[i],
ctxt,
flags);
@@ -11529,7 +11529,7 @@ virDomainDefParseXML(xmlDocPtr xml,
}
if (n && VIR_ALLOC_N(def->sounds, n) < 0)
goto no_memory;
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virDomainSoundDefPtr sound = virDomainSoundDefParseXML(nodes[i],
ctxt,
flags);
@@ -11546,7 +11546,7 @@ virDomainDefParseXML(xmlDocPtr xml,
}
if (n && VIR_ALLOC_N(def->videos, n) < 0)
goto no_memory;
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
size_t ii = def->nvideos;
virDomainVideoDefPtr video = virDomainVideoDefParseXML(nodes[i],
def,
@@ -11603,7 +11603,7 @@ virDomainDefParseXML(xmlDocPtr xml,
}
if (n && VIR_REALLOC_N(def->hostdevs, def->nhostdevs + n) < 0)
goto no_memory;
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virDomainHostdevDefPtr hostdev;
hostdev = virDomainHostdevDefParseXML(nodes[i], ctxt, bootHash, flags);
@@ -11731,7 +11731,7 @@ virDomainDefParseXML(xmlDocPtr xml,
}
if (n && VIR_ALLOC_N(def->hubs, n) < 0)
goto no_memory;
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virDomainHubDefPtr hub = virDomainHubDefParseXML(nodes[i], flags);
if (!hub)
goto error;
@@ -11754,7 +11754,7 @@ virDomainDefParseXML(xmlDocPtr xml,
}
if (n && VIR_ALLOC_N(def->redirdevs, n) < 0)
goto no_memory;
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virDomainRedirdevDefPtr redirdev = virDomainRedirdevDefParseXML(nodes[i],
bootHash,
flags);
@@ -11947,7 +11947,7 @@ virDomainObjParseXML(xmlDocPtr xml,
if ((n = virXPathNodeSet("./taint", ctxt, &nodes)) < 0) {
goto error;
}
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
char *str = virXMLPropString(nodes[i], "flag");
if (str) {
int flag = virDomainTaintTypeFromString(str);
@@ -12881,7 +12881,7 @@ virDomainDefCheckABIStability(virDomainDefPtr src,
return false;
}
- for (i = 0 ; i < src->clock.ntimers ; i++) {
+ for (i = 0; i < src->clock.ntimers; i++) {
if (!virDomainTimerDefCheckABIStability(src->clock.timers[i],
dst->clock.timers[i]))
return false;
@@ -12900,7 +12900,7 @@ virDomainDefCheckABIStability(virDomainDefPtr src,
return false;
}
- for (i = 0 ; i < src->ndisks ; i++)
+ for (i = 0; i < src->ndisks; i++)
if (!virDomainDiskDefCheckABIStability(src->disks[i], dst->disks[i]))
return false;
@@ -12912,7 +12912,7 @@ virDomainDefCheckABIStability(virDomainDefPtr src,
return false;
}
- for (i = 0 ; i < src->ncontrollers ; i++)
+ for (i = 0; i < src->ncontrollers; i++)
if (!virDomainControllerDefCheckABIStability(src->controllers[i],
dst->controllers[i]))
return false;
@@ -12925,7 +12925,7 @@ virDomainDefCheckABIStability(virDomainDefPtr src,
return false;
}
- for (i = 0 ; i < src->nfss ; i++)
+ for (i = 0; i < src->nfss; i++)
if (!virDomainFsDefCheckABIStability(src->fss[i], dst->fss[i]))
return false;
@@ -12937,7 +12937,7 @@ virDomainDefCheckABIStability(virDomainDefPtr src,
return false;
}
- for (i = 0 ; i < src->nnets ; i++)
+ for (i = 0; i < src->nnets; i++)
if (!virDomainNetDefCheckABIStability(src->nets[i], dst->nets[i]))
return false;
@@ -12949,7 +12949,7 @@ virDomainDefCheckABIStability(virDomainDefPtr src,
return false;
}
- for (i = 0 ; i < src->ninputs ; i++)
+ for (i = 0; i < src->ninputs; i++)
if (!virDomainInputDefCheckABIStability(src->inputs[i], dst->inputs[i]))
return false;
@@ -12961,7 +12961,7 @@ virDomainDefCheckABIStability(virDomainDefPtr src,
return false;
}
- for (i = 0 ; i < src->nsounds ; i++)
+ for (i = 0; i < src->nsounds; i++)
if (!virDomainSoundDefCheckABIStability(src->sounds[i], dst->sounds[i]))
return false;
@@ -12973,7 +12973,7 @@ virDomainDefCheckABIStability(virDomainDefPtr src,
return false;
}
- for (i = 0 ; i < src->nvideos ; i++)
+ for (i = 0; i < src->nvideos; i++)
if (!virDomainVideoDefCheckABIStability(src->videos[i], dst->videos[i]))
return false;
@@ -12985,7 +12985,7 @@ virDomainDefCheckABIStability(virDomainDefPtr src,
return false;
}
- for (i = 0 ; i < src->nhostdevs ; i++)
+ for (i = 0; i < src->nhostdevs; i++)
if (!virDomainHostdevDefCheckABIStability(src->hostdevs[i],
dst->hostdevs[i]))
return false;
@@ -12998,7 +12998,7 @@ virDomainDefCheckABIStability(virDomainDefPtr src,
return false;
}
- for (i = 0 ; i < src->nsmartcards ; i++)
+ for (i = 0; i < src->nsmartcards; i++)
if (!virDomainSmartcardDefCheckABIStability(src->smartcards[i],
dst->smartcards[i]))
return false;
@@ -13011,7 +13011,7 @@ virDomainDefCheckABIStability(virDomainDefPtr src,
return false;
}
- for (i = 0 ; i < src->nserials ; i++)
+ for (i = 0; i < src->nserials; i++)
if (!virDomainSerialDefCheckABIStability(src->serials[i],
dst->serials[i]))
return false;
@@ -13024,7 +13024,7 @@ virDomainDefCheckABIStability(virDomainDefPtr src,
return false;
}
- for (i = 0 ; i < src->nparallels ; i++)
+ for (i = 0; i < src->nparallels; i++)
if (!virDomainParallelDefCheckABIStability(src->parallels[i],
dst->parallels[i]))
return false;
@@ -13037,7 +13037,7 @@ virDomainDefCheckABIStability(virDomainDefPtr src,
return false;
}
- for (i = 0 ; i < src->nchannels ; i++)
+ for (i = 0; i < src->nchannels; i++)
if (!virDomainChannelDefCheckABIStability(src->channels[i],
dst->channels[i]))
return false;
@@ -13050,7 +13050,7 @@ virDomainDefCheckABIStability(virDomainDefPtr src,
return false;
}
- for (i = 0 ; i < src->nconsoles ; i++)
+ for (i = 0; i < src->nconsoles; i++)
if (!virDomainConsoleDefCheckABIStability(src->consoles[i],
dst->consoles[i]))
return false;
@@ -13063,7 +13063,7 @@ virDomainDefCheckABIStability(virDomainDefPtr src,
return false;
}
- for (i = 0 ; i < src->nhubs ; i++)
+ for (i = 0; i < src->nhubs; i++)
if (!virDomainHubDefCheckABIStability(src->hubs[i], dst->hubs[i]))
return false;
@@ -13123,7 +13123,7 @@ virDomainDefAddDiskControllersForType(virDomainDefPtr def,
int i;
int maxController = -1;
- for (i = 0 ; i < def->ndisks ; i++) {
+ for (i = 0; i < def->ndisks; i++) {
if (def->disks[i]->bus != diskBus)
continue;
@@ -13134,7 +13134,7 @@ virDomainDefAddDiskControllersForType(virDomainDefPtr def,
maxController = def->disks[i]->info.addr.drive.controller;
}
- for (i = 0 ; i <= maxController ; i++) {
+ for (i = 0; i <= maxController; i++) {
if (virDomainDefMaybeAddController(def, controllerType, i, -1) < 0)
return -1;
}
@@ -13149,7 +13149,7 @@ virDomainDefMaybeAddVirtioSerialController(virDomainDefPtr def)
/* Look for any virtio serial or virtio console devs */
int i;
- for (i = 0 ; i < def->nchannels ; i++) {
+ for (i = 0; i < def->nchannels; i++) {
virDomainChrDefPtr channel = def->channels[i];
if (channel->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO) {
@@ -13163,7 +13163,7 @@ virDomainDefMaybeAddVirtioSerialController(virDomainDefPtr def)
}
}
- for (i = 0 ; i < def->nconsoles ; i++) {
+ for (i = 0; i < def->nconsoles; i++) {
virDomainChrDefPtr console = def->consoles[i];
if (console->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO) {
@@ -13188,7 +13188,7 @@ virDomainDefMaybeAddSmartcardController(virDomainDefPtr def)
/* Look for any smartcard devs */
int i;
- for (i = 0 ; i < def->nsmartcards ; i++) {
+ for (i = 0; i < def->nsmartcards; i++) {
virDomainSmartcardDefPtr smartcard = def->smartcards[i];
int idx = 0;
@@ -15367,7 +15367,7 @@ virDomainGraphicsDefFormat(virBufferPtr buf,
}
if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) {
- for (i = 0 ; i < VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST ; i++) {
+ for (i = 0; i < VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST; i++) {
int mode = def->data.spice.channels[i];
if (mode == VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY)
continue;
@@ -15925,7 +15925,7 @@ virDomainDefFormatInternal(virDomainDefPtr def,
virBufferEscapeString(buf, " <init>%s</init>\n",
def->os.init);
- for (i = 0 ; def->os.initargv && def->os.initargv[i] ; i++)
+ for (i = 0; def->os.initargv && def->os.initargv[i]; i++)
virBufferEscapeString(buf, " <initarg>%s</initarg>\n",
def->os.initargv[i]);
virBufferEscapeString(buf, " <loader>%s</loader>\n",
@@ -15942,7 +15942,7 @@ virDomainDefFormatInternal(virDomainDefPtr def,
def->os.root);
if (!def->os.bootloader) {
- for (n = 0 ; n < def->os.nBootDevs ; n++) {
+ for (n = 0; n < def->os.nBootDevs; n++) {
const char *boottype =
virDomainBootTypeToString(def->os.bootDevs[n]);
if (!boottype) {
@@ -15991,7 +15991,7 @@ virDomainDefFormatInternal(virDomainDefPtr def,
if (def->features) {
virBufferAddLit(buf, " <features>\n");
- for (i = 0 ; i < VIR_DOMAIN_FEATURE_LAST ; i++) {
+ for (i = 0; i < VIR_DOMAIN_FEATURE_LAST; i++) {
if (def->features & (1 << i) && i !=
VIR_DOMAIN_FEATURE_HYPERV) {
const char *name = virDomainFeatureTypeToString(i);
if (!name) {
@@ -16099,39 +16099,39 @@ virDomainDefFormatInternal(virDomainDefPtr def,
virBufferEscapeString(buf, " <emulator>%s</emulator>\n",
def->emulator);
- for (n = 0 ; n < def->ndisks ; n++)
+ for (n = 0; n < def->ndisks; n++)
if (virDomainDiskDefFormat(buf, def->disks[n], flags) < 0)
goto error;
- for (n = 0 ; n < def->ncontrollers ; n++)
+ for (n = 0; n < def->ncontrollers; n++)
if (virDomainControllerDefFormat(buf, def->controllers[n], flags) < 0)
goto error;
- for (n = 0 ; n < def->nleases ; n++)
+ for (n = 0; n < def->nleases; n++)
if (virDomainLeaseDefFormat(buf, def->leases[n]) < 0)
goto error;
- for (n = 0 ; n < def->nfss ; n++)
+ for (n = 0; n < def->nfss; n++)
if (virDomainFSDefFormat(buf, def->fss[n], flags) < 0)
goto error;
- for (n = 0 ; n < def->nnets ; n++)
+ for (n = 0; n < def->nnets; n++)
if (virDomainNetDefFormat(buf, def->nets[n], flags) < 0)
goto error;
- for (n = 0 ; n < def->nsmartcards ; n++)
+ for (n = 0; n < def->nsmartcards; n++)
if (virDomainSmartcardDefFormat(buf, def->smartcards[n], flags) < 0)
goto error;
- for (n = 0 ; n < def->nserials ; n++)
+ for (n = 0; n < def->nserials; n++)
if (virDomainChrDefFormat(buf, def->serials[n], flags) < 0)
goto error;
- for (n = 0 ; n < def->nparallels ; n++)
+ for (n = 0; n < def->nparallels; n++)
if (virDomainChrDefFormat(buf, def->parallels[n], flags) < 0)
goto error;
- for (n = 0 ; n < def->nconsoles ; n++) {
+ for (n = 0; n < def->nconsoles; n++) {
virDomainChrDef console;
/* Back compat, ignore the console element for hvm guests
* if it is type == serial
@@ -16160,11 +16160,11 @@ virDomainDefFormatInternal(virDomainDefPtr def,
goto error;
}
- for (n = 0 ; n < def->nchannels ; n++)
+ for (n = 0; n < def->nchannels; n++)
if (virDomainChrDefFormat(buf, def->channels[n], flags) < 0)
goto error;
- for (n = 0 ; n < def->ninputs ; n++)
+ for (n = 0; n < def->ninputs; n++)
if (def->inputs[n]->bus == VIR_DOMAIN_INPUT_BUS_USB &&
virDomainInputDefFormat(buf, def->inputs[n], flags) < 0)
goto error;
@@ -16186,20 +16186,20 @@ virDomainDefFormatInternal(virDomainDefPtr def,
if (virDomainInputDefFormat(buf, &autoInput, flags) < 0)
goto error;
- for (n = 0 ; n < def->ngraphics ; n++)
+ for (n = 0; n < def->ngraphics; n++)
if (virDomainGraphicsDefFormat(buf, def->graphics[n], flags) < 0)
goto error;
}
- for (n = 0 ; n < def->nsounds ; n++)
+ for (n = 0; n < def->nsounds; n++)
if (virDomainSoundDefFormat(buf, def->sounds[n], flags) < 0)
goto error;
- for (n = 0 ; n < def->nvideos ; n++)
+ for (n = 0; n < def->nvideos; n++)
if (virDomainVideoDefFormat(buf, def->videos[n], flags) < 0)
goto error;
- for (n = 0 ; n < def->nhostdevs ; n++) {
+ for (n = 0; n < def->nhostdevs; n++) {
/* If parent.type != NONE, this is just a pointer to the
* hostdev in a higher-level device (e.g. virDomainNetDef),
* and will have already been formatted there.
@@ -16210,14 +16210,14 @@ virDomainDefFormatInternal(virDomainDefPtr def,
}
}
- for (n = 0 ; n < def->nredirdevs ; n++)
+ for (n = 0; n < def->nredirdevs; n++)
if (virDomainRedirdevDefFormat(buf, def->redirdevs[n], flags) < 0)
goto error;
if (def->redirfilter)
virDomainRedirFilterDefFormat(buf, def->redirfilter);
- for (n = 0 ; n < def->nhubs ; n++)
+ for (n = 0; n < def->nhubs; n++)
if (virDomainHubDefFormat(buf, def->hubs[n], flags) < 0)
goto error;
@@ -16288,7 +16288,7 @@ virDomainObjFormat(virDomainXMLOptionPtr xmlopt,
virDomainStateReasonToString(state, reason),
(long long)obj->pid);
- for (i = 0 ; i < VIR_DOMAIN_TAINT_LAST ; i++) {
+ for (i = 0; i < VIR_DOMAIN_TAINT_LAST; i++) {
if (obj->taint & (1 << i))
virBufferAsprintf(&buf, " <taint
flag='%s'/>\n",
virDomainTaintTypeToString(i));
@@ -16699,7 +16699,7 @@ virDomainGetRootFilesystem(virDomainDefPtr def)
{
int i;
- for (i = 0 ; i < def->nfss ; i++) {
+ for (i = 0; i < def->nfss; i++) {
if (STREQ(def->fss[i]->dst, "/"))
return def->fss[i];
}
@@ -16819,7 +16819,7 @@ virDomainObjListGetInactiveNames(virDomainObjListPtr doms,
virHashForEach(doms->objs, virDomainObjListCopyInactiveNames, &data);
virObjectUnlock(doms);
if (data.oom) {
- for (i = 0 ; i < data.numnames ; i++)
+ for (i = 0; i < data.numnames; i++)
VIR_FREE(data.names[i]);
virReportOOMError();
return -1;
@@ -16870,7 +16870,7 @@ virDomainChrDefForeach(virDomainDefPtr def,
int i;
int rc = 0;
- for (i = 0 ; i < def->nserials ; i++) {
+ for (i = 0; i < def->nserials; i++) {
if ((iter)(def,
def->serials[i],
opaque) < 0)
@@ -16880,7 +16880,7 @@ virDomainChrDefForeach(virDomainDefPtr def,
goto done;
}
- for (i = 0 ; i < def->nparallels ; i++) {
+ for (i = 0; i < def->nparallels; i++) {
if ((iter)(def,
def->parallels[i],
opaque) < 0)
@@ -16890,7 +16890,7 @@ virDomainChrDefForeach(virDomainDefPtr def,
goto done;
}
- for (i = 0 ; i < def->nchannels ; i++) {
+ for (i = 0; i < def->nchannels; i++) {
if ((iter)(def,
def->channels[i],
opaque) < 0)
@@ -16899,7 +16899,7 @@ virDomainChrDefForeach(virDomainDefPtr def,
if (abortOnError && rc != 0)
goto done;
}
- for (i = 0 ; i < def->nconsoles ; i++) {
+ for (i = 0; i < def->nconsoles; i++) {
if ((iter)(def,
def->consoles[i],
opaque) < 0)
@@ -16923,7 +16923,7 @@ virDomainSmartcardDefForeach(virDomainDefPtr def,
int i;
int rc = 0;
- for (i = 0 ; i < def->nsmartcards ; i++) {
+ for (i = 0; i < def->nsmartcards; i++) {
if ((iter)(def,
def->smartcards[i],
opaque) < 0)
diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c
index 825012a..ad23f8e 100644
--- a/src/conf/domain_event.c
+++ b/src/conf/domain_event.c
@@ -162,7 +162,7 @@ virDomainEventCallbackListRemove(virConnectPtr conn,
{
int ret = 0;
int i;
- for (i = 0 ; i < cbList->count ; i++) {
+ for (i = 0; i < cbList->count; i++) {
if (cbList->callbacks[i]->cb == VIR_DOMAIN_EVENT_CALLBACK(callback)
&&
cbList->callbacks[i]->eventID == VIR_DOMAIN_EVENT_ID_LIFECYCLE
&&
cbList->callbacks[i]->conn == conn) {
@@ -184,7 +184,7 @@ virDomainEventCallbackListRemove(virConnectPtr conn,
}
cbList->count--;
- for (i = 0 ; i < cbList->count ; i++) {
+ for (i = 0; i < cbList->count; i++) {
if (!cbList->callbacks[i]->deleted)
ret++;
}
@@ -213,7 +213,7 @@ virDomainEventCallbackListRemoveID(virConnectPtr conn,
{
int ret = 0;
int i;
- for (i = 0 ; i < cbList->count ; i++) {
+ for (i = 0; i < cbList->count; i++) {
if (cbList->callbacks[i]->callbackID == callbackID &&
cbList->callbacks[i]->conn == conn) {
virFreeCallback freecb = cbList->callbacks[i]->freecb;
@@ -234,7 +234,7 @@ virDomainEventCallbackListRemoveID(virConnectPtr conn,
}
cbList->count--;
- for (i = 0 ; i < cbList->count ; i++) {
+ for (i = 0; i < cbList->count; i++) {
if (!cbList->callbacks[i]->deleted)
ret++;
}
@@ -255,12 +255,12 @@ virDomainEventCallbackListMarkDelete(virConnectPtr conn,
{
int ret = 0;
int i;
- for (i = 0 ; i < cbList->count ; i++) {
+ for (i = 0; i < cbList->count; i++) {
if (cbList->callbacks[i]->cb == VIR_DOMAIN_EVENT_CALLBACK(callback)
&&
cbList->callbacks[i]->eventID == VIR_DOMAIN_EVENT_ID_LIFECYCLE
&&
cbList->callbacks[i]->conn == conn) {
cbList->callbacks[i]->deleted = 1;
- for (i = 0 ; i < cbList->count ; i++) {
+ for (i = 0; i < cbList->count; i++) {
if (!cbList->callbacks[i]->deleted)
ret++;
}
@@ -281,11 +281,11 @@ virDomainEventCallbackListMarkDeleteID(virConnectPtr conn,
{
int ret = 0;
int i;
- for (i = 0 ; i < cbList->count ; i++) {
+ for (i = 0; i < cbList->count; i++) {
if (cbList->callbacks[i]->callbackID == callbackID &&
cbList->callbacks[i]->conn == conn) {
cbList->callbacks[i]->deleted = 1;
- for (i = 0 ; i < cbList->count ; i++) {
+ for (i = 0; i < cbList->count; i++) {
if (!cbList->callbacks[i]->deleted)
ret++;
}
@@ -304,7 +304,7 @@ virDomainEventCallbackListPurgeMarked(virDomainEventCallbackListPtr
cbList)
{
int old_count = cbList->count;
int i;
- for (i = 0 ; i < cbList->count ; i++) {
+ for (i = 0; i < cbList->count; i++) {
if (cbList->callbacks[i]->deleted) {
virFreeCallback freecb = cbList->callbacks[i]->freecb;
if (freecb)
@@ -360,7 +360,7 @@ virDomainEventCallbackListAddID(virConnectPtr conn,
}
/* check if we already have this callback on our list */
- for (i = 0 ; i < cbList->count ; i++) {
+ for (i = 0; i < cbList->count; i++) {
if (cbList->callbacks[i]->cb == VIR_DOMAIN_EVENT_CALLBACK(callback)
&&
cbList->callbacks[i]->eventID == eventID &&
cbList->callbacks[i]->conn == conn &&
@@ -402,7 +402,7 @@ virDomainEventCallbackListAddID(virConnectPtr conn,
event->callbackID = cbList->nextID++;
- for (i = 0 ; i < cbList->count ; i++) {
+ for (i = 0; i < cbList->count; i++) {
if (cbList->callbacks[i]->eventID == eventID &&
cbList->callbacks[i]->conn == conn &&
!cbList->callbacks[i]->deleted)
@@ -458,7 +458,7 @@ virDomainEventCallbackListEventID(virConnectPtr conn,
{
int i;
- for (i = 0 ; i < cbList->count ; i++) {
+ for (i = 0; i < cbList->count; i++) {
if (cbList->callbacks[i]->deleted)
continue;
@@ -498,7 +498,7 @@ void virDomainEventFree(virDomainEventPtr event)
VIR_FREE(event->data.graphics.authScheme);
if (event->data.graphics.subject) {
int i;
- for (i = 0 ; i < event->data.graphics.subject->nidentity ; i++) {
+ for (i = 0; i < event->data.graphics.subject->nidentity; i++) {
VIR_FREE(event->data.graphics.subject->identities[i].type);
VIR_FREE(event->data.graphics.subject->identities[i].name);
}
@@ -537,7 +537,7 @@ virDomainEventQueueClear(virDomainEventQueuePtr queue)
if (!queue)
return;
- for (i = 0; i < queue->count ; i++) {
+ for (i = 0; i < queue->count; i++) {
virDomainEventFree(queue->events[i]);
}
VIR_FREE(queue->events);
@@ -1370,7 +1370,7 @@ virDomainEventDispatch(virDomainEventPtr event,
to have any removed */
int cbCount = callbacks->count;
- for (i = 0 ; i < cbCount ; i++) {
+ for (i = 0; i < cbCount; i++) {
if (!virDomainEventDispatchMatchCallback(event, callbacks->callbacks[i]))
continue;
@@ -1391,7 +1391,7 @@ virDomainEventQueueDispatch(virDomainEventQueuePtr queue,
{
int i;
- for (i = 0 ; i < queue->count ; i++) {
+ for (i = 0; i < queue->count; i++) {
virDomainEventDispatch(queue->events[i], callbacks, dispatch, opaque);
virDomainEventFree(queue->events[i]);
}
diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c
index fd3c292..d8100ed 100644
--- a/src/conf/interface_conf.c
+++ b/src/conf/interface_conf.c
@@ -1171,7 +1171,7 @@ int virInterfaceFindByMACString(const virInterfaceObjListPtr
interfaces,
{
unsigned int i, matchct = 0;
- for (i = 0 ; i < interfaces->count ; i++) {
+ for (i = 0; i < interfaces->count; i++) {
virInterfaceObjLock(interfaces->objs[i]);
if (STRCASEEQ(interfaces->objs[i]->def->mac, mac)) {
@@ -1195,7 +1195,7 @@ virInterfaceObjPtr virInterfaceFindByName(const
virInterfaceObjListPtr
{
unsigned int i;
- for (i = 0 ; i < interfaces->count ; i++) {
+ for (i = 0; i < interfaces->count; i++) {
virInterfaceObjLock(interfaces->objs[i]);
if (STREQ(interfaces->objs[i]->def->name, name))
return interfaces->objs[i];
@@ -1209,7 +1209,7 @@ void virInterfaceObjListFree(virInterfaceObjListPtr interfaces)
{
unsigned int i;
- for (i = 0 ; i < interfaces->count ; i++)
+ for (i = 0; i < interfaces->count; i++)
virInterfaceObjFree(interfaces->objs[i]);
VIR_FREE(interfaces->objs);
@@ -1298,7 +1298,7 @@ void virInterfaceRemove(virInterfaceObjListPtr interfaces,
unsigned int i;
virInterfaceObjUnlock(iface);
- for (i = 0 ; i < interfaces->count ; i++) {
+ for (i = 0; i < interfaces->count; i++) {
virInterfaceObjLock(interfaces->objs[i]);
if (interfaces->objs[i] == iface) {
virInterfaceObjUnlock(interfaces->objs[i]);
diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index eb10c0a..8cddcc2 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -71,7 +71,7 @@ virNetworkObjPtr virNetworkFindByUUID(const virNetworkObjListPtr nets,
{
unsigned int i;
- for (i = 0 ; i < nets->count ; i++) {
+ for (i = 0; i < nets->count; i++) {
virNetworkObjLock(nets->objs[i]);
if (!memcmp(nets->objs[i]->def->uuid, uuid, VIR_UUID_BUFLEN))
return nets->objs[i];
@@ -86,7 +86,7 @@ virNetworkObjPtr virNetworkFindByName(const virNetworkObjListPtr nets,
{
unsigned int i;
- for (i = 0 ; i < nets->count ; i++) {
+ for (i = 0; i < nets->count; i++) {
virNetworkObjLock(nets->objs[i]);
if (STREQ(nets->objs[i]->def->name, name))
return nets->objs[i];
@@ -197,12 +197,12 @@ virNetworkForwardDefClear(virNetworkForwardDefPtr def)
{
int ii;
- for (ii = 0 ; ii < def->npfs && def->pfs ; ii++) {
+ for (ii = 0; ii < def->npfs && def->pfs; ii++) {
virNetworkForwardPfDefClear(&def->pfs[ii]);
}
VIR_FREE(def->pfs);
- for (ii = 0 ; ii < def->nifs && def->ifs ; ii++) {
+ for (ii = 0; ii < def->nifs && def->ifs; ii++) {
virNetworkForwardIfDefClear(&def->ifs[ii]);
}
VIR_FREE(def->ifs);
@@ -222,12 +222,12 @@ virNetworkDefFree(virNetworkDefPtr def)
virNetworkForwardDefClear(&def->forward);
- for (ii = 0 ; ii < def->nips && def->ips ; ii++) {
+ for (ii = 0; ii < def->nips && def->ips; ii++) {
virNetworkIpDefClear(&def->ips[ii]);
}
VIR_FREE(def->ips);
- for (ii = 0 ; ii < def->nroutes && def->routes ; ii++) {
+ for (ii = 0; ii < def->nroutes && def->routes; ii++) {
virNetworkRouteDefClear(&def->routes[ii]);
}
VIR_FREE(def->routes);
@@ -264,7 +264,7 @@ void virNetworkObjListFree(virNetworkObjListPtr nets)
{
unsigned int i;
- for (i = 0 ; i < nets->count ; i++)
+ for (i = 0; i < nets->count; i++)
virNetworkObjFree(nets->objs[i]);
VIR_FREE(nets->objs);
@@ -548,7 +548,7 @@ void virNetworkRemoveInactive(virNetworkObjListPtr nets,
unsigned int i;
virNetworkObjUnlock(net);
- for (i = 0 ; i < nets->count ; i++) {
+ for (i = 0; i < nets->count; i++) {
virNetworkObjLock(nets->objs[i]);
if (nets->objs[i] == net) {
virNetworkObjUnlock(nets->objs[i]);
@@ -2291,13 +2291,13 @@ virNetworkDNSDefFormat(virBufferPtr buf,
virBufferAddLit(buf, "<dns>\n");
virBufferAdjustIndent(buf, 2);
- for (i = 0 ; i < def->ntxts ; i++) {
+ for (i = 0; i < def->ntxts; i++) {
virBufferAsprintf(buf, "<txt name='%s' value='%s'
/>\n",
def->txts[i].name,
def->txts[i].value);
}
- for (i = 0 ; i < def->nsrvs ; i++) {
+ for (i = 0; i < def->nsrvs; i++) {
if (def->srvs[i].service && def->srvs[i].protocol) {
virBufferAsprintf(buf, "<srv service='%s'
protocol='%s'",
def->srvs[i].service,
@@ -2321,7 +2321,7 @@ virNetworkDNSDefFormat(virBufferPtr buf,
if (def->nhosts) {
int ii, j;
- for (ii = 0 ; ii < def->nhosts; ii++) {
+ for (ii = 0; ii < def->nhosts; ii++) {
char *ip = virSocketAddrFormat(&def->hosts[ii].ip);
virBufferAsprintf(buf, "<host ip='%s'>\n", ip);
@@ -2381,7 +2381,7 @@ virNetworkIpDefFormat(virBufferPtr buf,
virBufferAddLit(buf, "<dhcp>\n");
virBufferAdjustIndent(buf, 2);
- for (ii = 0 ; ii < def->nranges ; ii++) {
+ for (ii = 0; ii < def->nranges; ii++) {
char *saddr = virSocketAddrFormat(&def->ranges[ii].start);
if (!saddr)
goto error;
@@ -2395,7 +2395,7 @@ virNetworkIpDefFormat(virBufferPtr buf,
VIR_FREE(saddr);
VIR_FREE(eaddr);
}
- for (ii = 0 ; ii < def->nhosts ; ii++) {
+ for (ii = 0; ii < def->nhosts; ii++) {
virBufferAddLit(buf, "<host ");
if (def->hosts[ii].mac)
virBufferAsprintf(buf, "mac='%s' ",
def->hosts[ii].mac);
@@ -3136,7 +3136,7 @@ int virNetworkBridgeInUse(const virNetworkObjListPtr nets,
unsigned int i;
unsigned int ret = 0;
- for (i = 0 ; i < nets->count ; i++) {
+ for (i = 0; i < nets->count; i++) {
virNetworkObjLock(nets->objs[i]);
if (nets->objs[i]->def->bridge &&
STREQ(nets->objs[i]->def->bridge, bridge) &&
diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index f9303c1..4e0c6e2 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -156,7 +156,7 @@ void virNodeDeviceObjFree(virNodeDeviceObjPtr dev)
void virNodeDeviceObjListFree(virNodeDeviceObjListPtr devs)
{
unsigned int i;
- for (i = 0 ; i < devs->count ; i++)
+ for (i = 0; i < devs->count; i++)
virNodeDeviceObjFree(devs->objs[i]);
VIR_FREE(devs->objs);
devs->count = 0;
@@ -317,7 +317,7 @@ char *virNodeDeviceDefFormat(const virNodeDeviceDefPtr def)
}
if (data->pci_dev.flags & VIR_NODE_DEV_CAP_FLAG_PCI_VIRTUAL_FUNCTION)
{
virBufferAddLit(&buf, " <capability
type='virt_functions'>\n");
- for (i = 0 ; i < data->pci_dev.num_virtual_functions ; i++) {
+ for (i = 0; i < data->pci_dev.num_virtual_functions; i++) {
virBufferAsprintf(&buf,
" <address domain='0x%.4x'
bus='0x%.2x' "
"slot='0x%.2x'
function='0x%.1x'/>\n",
@@ -571,7 +571,7 @@ virNodeDevCapStorageParseXML(xmlXPathContextPtr ctxt,
goto out;
}
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
char *type = virXMLPropString(nodes[i], "type");
if (!type) {
@@ -734,7 +734,7 @@ virNodeDevCapScsiHostParseXML(xmlXPathContextPtr ctxt,
goto out;
}
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
type = virXMLPropString(nodes[i], "type");
if (!type) {
@@ -1189,7 +1189,7 @@ virNodeDeviceDefParseXML(xmlXPathContextPtr ctxt,
}
next_cap = &def->caps;
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
*next_cap = virNodeDevCapsDefParseXML(ctxt, def,
nodes[i],
create,
@@ -1380,7 +1380,7 @@ void virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps)
VIR_FREE(data->pci_dev.product_name);
VIR_FREE(data->pci_dev.vendor_name);
VIR_FREE(data->pci_dev.physical_function);
- for (i = 0 ; i < data->pci_dev.num_virtual_functions ; i++) {
+ for (i = 0; i < data->pci_dev.num_virtual_functions; i++) {
VIR_FREE(data->pci_dev.virtual_functions[i]);
}
break;
diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c
index 08222de..817c9c9 100644
--- a/src/conf/nwfilter_conf.c
+++ b/src/conf/nwfilter_conf.c
@@ -349,7 +349,7 @@ void
virNWFilterObjListFree(virNWFilterObjListPtr nwfilters)
{
unsigned int i;
- for (i = 0 ; i < nwfilters->count ; i++)
+ for (i = 0; i < nwfilters->count; i++)
virNWFilterObjFree(nwfilters->objs[i]);
VIR_FREE(nwfilters->objs);
nwfilters->count = 0;
@@ -421,7 +421,7 @@ virNWFilterObjRemove(virNWFilterObjListPtr nwfilters,
virNWFilterObjUnlock(nwfilter);
- for (i = 0 ; i < nwfilters->count ; i++) {
+ for (i = 0; i < nwfilters->count; i++) {
virNWFilterObjLock(nwfilters->objs[i]);
if (nwfilters->objs[i] == nwfilter) {
virNWFilterObjUnlock(nwfilters->objs[i]);
@@ -2688,7 +2688,7 @@ virNWFilterObjFindByUUID(virNWFilterObjListPtr nwfilters,
{
unsigned int i;
- for (i = 0 ; i < nwfilters->count ; i++) {
+ for (i = 0; i < nwfilters->count; i++) {
virNWFilterObjLock(nwfilters->objs[i]);
if (!memcmp(nwfilters->objs[i]->def->uuid, uuid, VIR_UUID_BUFLEN))
return nwfilters->objs[i];
@@ -2704,7 +2704,7 @@ virNWFilterObjFindByName(virNWFilterObjListPtr nwfilters, const char
*name)
{
unsigned int i;
- for (i = 0 ; i < nwfilters->count ; i++) {
+ for (i = 0; i < nwfilters->count; i++) {
virNWFilterObjLock(nwfilters->objs[i]);
if (STREQ(nwfilters->objs[i]->def->name, name))
return nwfilters->objs[i];
diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index 8fa805b..6cb98bf 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -404,7 +404,7 @@ void
virStoragePoolObjListFree(virStoragePoolObjListPtr pools)
{
unsigned int i;
- for (i = 0 ; i < pools->count ; i++)
+ for (i = 0; i < pools->count; i++)
virStoragePoolObjFree(pools->objs[i]);
VIR_FREE(pools->objs);
pools->count = 0;
@@ -591,7 +591,7 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt,
goto cleanup;
}
- for (i = 0 ; i < nsource ; i++) {
+ for (i = 0; i < nsource; i++) {
char *path = virXMLPropString(nodeset[i], "path");
if (path == NULL) {
VIR_FREE(nodeset);
@@ -1558,7 +1558,7 @@ virStoragePoolObjFindByName(virStoragePoolObjListPtr pools,
{
unsigned int i;
- for (i = 0 ; i < pools->count ; i++) {
+ for (i = 0; i < pools->count; i++) {
virStoragePoolObjLock(pools->objs[i]);
if (STREQ(pools->objs[i]->def->name, name))
return pools->objs[i];
@@ -1614,7 +1614,7 @@ virStorageVolDefFindByPath(virStoragePoolObjPtr pool,
{
unsigned int i;
- for (i = 0 ; i < pool->volumes.count ; i++)
+ for (i = 0; i < pool->volumes.count; i++)
if (STREQ(pool->volumes.objs[i]->target.path, path))
return pool->volumes.objs[i];
--
1.8.1.4
10:14 a.m.
New subject: [libvirt] [PATCH 03/31] src/conf: Remove the whitespace before '; '
On 05/21/2013 04:00 AM, Osier Yang wrote:
---
src/conf/capabilities.c | 50 +++++-----
src/conf/cpu_conf.c | 14 +--
src/conf/domain_audit.c | 10 +-
src/conf/domain_conf.c | 230 ++++++++++++++++++++++----------------------
src/conf/domain_event.c | 32 +++---
src/conf/interface_conf.c | 8 +-
src/conf/network_conf.c | 28 +++---
src/conf/node_device_conf.c | 12 +--
src/conf/nwfilter_conf.c | 8 +-
src/conf/storage_conf.c | 8 +-
10 files changed, 200 insertions(+), 200 deletions(-)
Longer, but still mechanical :)
ACK.
This is getting long; I'll do a bulk reply after reading through the
next few patches.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
5 a.m.
New subject: [libvirt] [PATCH 04/31] src/test: Remove the whitespace before '; '
---
src/test/test_driver.c | 80 +++++++++++++++++++++++++-------------------------
1 file changed, 40 insertions(+), 40 deletions(-)
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index d0d7832..f1cdd92 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -192,7 +192,7 @@ testBuildCapabilities(virConnectPtr conn) {
goto no_memory;
}
- for (i = 0; i < ARRAY_CARDINALITY(guest_types) ; i++) {
+ for (i = 0; i < ARRAY_CARDINALITY(guest_types); i++) {
if ((guest = virCapabilitiesAddGuest(caps,
guest_types[i],
VIR_ARCH_I686,
@@ -343,7 +343,7 @@ testDomainGenerateIfname(virDomainDefPtr domdef) {
}
/* Generate network interface names */
- for (i = 0 ; i < domdef->nnets ; i++) {
+ for (i = 0; i < domdef->nnets; i++) {
if (domdef->nets[i]->ifname &&
STREQ(domdef->nets[i]->ifname, ifname)) {
found = 1;
@@ -559,7 +559,7 @@ static int testOpenDefault(virConnectPtr conn) {
privconn->cells[u].numCpus = 8;
privconn->cells[u].mem = (u + 1) * 2048 * 1024;
}
- for (u = 0 ; u < 16 ; u++) {
+ for (u = 0; u < 16; u++) {
virBitmapPtr siblings = virBitmapNew(16);
if (!siblings) {
virReportOOMError();
@@ -721,7 +721,7 @@ static int testOpenVolumesForPool(xmlDocPtr xml,
goto error;
}
- for (i = 0 ; i < ret ; i++) {
+ for (i = 0; i < ret; i++) {
char *relFile = virXMLPropString(vols[i], "file");
if (relFile != NULL) {
char *absFile = testBuildFilename(file, relFile);
@@ -911,7 +911,7 @@ static int testOpenFromFile(virConnectPtr conn,
goto error;
}
- for (i = 0 ; i < ret ; i++) {
+ for (i = 0; i < ret; i++) {
virDomainDefPtr def;
char *relFile = virXMLPropString(domains[i], "file");
if (relFile != NULL) {
@@ -960,7 +960,7 @@ static int testOpenFromFile(virConnectPtr conn,
if (ret < 0) {
goto error;
}
- for (i = 0 ; i < ret ; i++) {
+ for (i = 0; i < ret; i++) {
virNetworkDefPtr def;
char *relFile = virXMLPropString(networks[i], "file");
if (relFile != NULL) {
@@ -995,7 +995,7 @@ static int testOpenFromFile(virConnectPtr conn,
if (ret < 0) {
goto error;
}
- for (i = 0 ; i < ret ; i++) {
+ for (i = 0; i < ret; i++) {
virInterfaceDefPtr def;
char *relFile = virXMLPropString(ifaces[i], "file");
if (relFile != NULL) {
@@ -1031,7 +1031,7 @@ static int testOpenFromFile(virConnectPtr conn,
if (ret < 0) {
goto error;
}
- for (i = 0 ; i < ret ; i++) {
+ for (i = 0; i < ret; i++) {
virStoragePoolDefPtr def;
virStoragePoolObjPtr pool;
char *relFile = virXMLPropString(pools[i], "file");
@@ -1081,7 +1081,7 @@ static int testOpenFromFile(virConnectPtr conn,
if (ret < 0) {
goto error;
}
- for (i = 0 ; i < ret ; i++) {
+ for (i = 0; i < ret; i++) {
virNodeDeviceDefPtr def;
virNodeDeviceObjPtr dev;
char *relFile = virXMLPropString(devs[i], "file");
@@ -1408,7 +1408,7 @@ static virDomainPtr testDomainLookupByUUID(virConnectPtr conn,
{
testConnPtr privconn = conn->privateData;
virDomainPtr ret = NULL;
- virDomainObjPtr dom ;
+ virDomainObjPtr dom;
testDriverLock(privconn);
dom = virDomainObjListFindByUUID(privconn->domains, uuid);
@@ -2347,7 +2347,7 @@ static int testDomainGetVcpus(virDomainPtr domain,
if (info != NULL) {
memset(info, 0, sizeof(*info) * maxinfo);
- for (i = 0 ; i < maxinfo ; i++) {
+ for (i = 0; i < maxinfo; i++) {
virVcpuInfo privinfo = privdomdata->vcpu_infos[i];
info[i].number = privinfo.number;
@@ -2364,10 +2364,10 @@ static int testDomainGetVcpus(virDomainPtr domain,
int privmaplen = VIR_CPU_MAPLEN(hostcpus);
memset(cpumaps, 0, maplen * maxinfo);
- for (v = 0 ; v < maxinfo ; v++) {
+ for (v = 0; v < maxinfo; v++) {
unsigned char *cpumap = VIR_GET_CPUMAP(cpumaps, maplen, v);
- for (i = 0 ; i < maxcpu ; i++) {
+ for (i = 0; i < maxcpu; i++) {
if (VIR_CPU_USABLE(privdomdata->cpumaps, privmaplen, v, i)) {
VIR_USE_CPU(cpumap, i);
}
@@ -2426,7 +2426,7 @@ static int testDomainPinVcpu(virDomainPtr domain,
privcpumap = VIR_GET_CPUMAP(privdomdata->cpumaps, privmaplen, vcpu);
memset(privcpumap, 0, privmaplen);
- for (i = 0 ; i < maxcpu ; i++) {
+ for (i = 0; i < maxcpu; i++) {
if (VIR_CPU_USABLE(cpumap, maplen, 0, i)) {
VIR_USE_CPU(privcpumap, i);
}
@@ -2558,7 +2558,7 @@ static int testNodeGetCellsFreeMemory(virConnectPtr conn,
}
for (i = startCell, j = 0;
- (i < privconn->numCells && j < maxCells) ;
+ (i < privconn->numCells && j < maxCells);
++i, ++j) {
freemems[j] = privconn->cells[i].mem;
}
@@ -2890,7 +2890,7 @@ static int testDomainInterfaceStats(virDomainPtr domain,
goto error;
}
- for (i = 0 ; i < privdom->def->nnets ; i++) {
+ for (i = 0; i < privdom->def->nnets; i++) {
if (privdom->def->nets[i]->ifname &&
STREQ(privdom->def->nets[i]->ifname, path)) {
found = 1;
@@ -3001,7 +3001,7 @@ static int testConnectNumOfNetworks(virConnectPtr conn) {
int numActive = 0, i;
testDriverLock(privconn);
- for (i = 0 ; i < privconn->networks.count ; i++) {
+ for (i = 0; i < privconn->networks.count; i++) {
virNetworkObjLock(privconn->networks.objs[i]);
if (virNetworkObjIsActive(privconn->networks.objs[i]))
numActive++;
@@ -3018,7 +3018,7 @@ static int testConnectListNetworks(virConnectPtr conn, char **const
names, int n
testDriverLock(privconn);
memset(names, 0, sizeof(*names)*nnames);
- for (i = 0 ; i < privconn->networks.count && n < nnames ; i++) {
+ for (i = 0; i < privconn->networks.count && n < nnames; i++) {
virNetworkObjLock(privconn->networks.objs[i]);
if (virNetworkObjIsActive(privconn->networks.objs[i]) &&
VIR_STRDUP(names[n++], privconn->networks.objs[i]->def->name) <
0) {
@@ -3032,7 +3032,7 @@ static int testConnectListNetworks(virConnectPtr conn, char **const
names, int n
return n;
error:
- for (n = 0 ; n < nnames ; n++)
+ for (n = 0; n < nnames; n++)
VIR_FREE(names[n]);
testDriverUnlock(privconn);
return -1;
@@ -3043,7 +3043,7 @@ static int testConnectNumOfDefinedNetworks(virConnectPtr conn) {
int numInactive = 0, i;
testDriverLock(privconn);
- for (i = 0 ; i < privconn->networks.count ; i++) {
+ for (i = 0; i < privconn->networks.count; i++) {
virNetworkObjLock(privconn->networks.objs[i]);
if (!virNetworkObjIsActive(privconn->networks.objs[i]))
numInactive++;
@@ -3060,7 +3060,7 @@ static int testConnectListDefinedNetworks(virConnectPtr conn, char
**const names
testDriverLock(privconn);
memset(names, 0, sizeof(*names)*nnames);
- for (i = 0 ; i < privconn->networks.count && n < nnames ; i++) {
+ for (i = 0; i < privconn->networks.count && n < nnames; i++) {
virNetworkObjLock(privconn->networks.objs[i]);
if (!virNetworkObjIsActive(privconn->networks.objs[i]) &&
VIR_STRDUP(names[n++], privconn->networks.objs[i]->def->name) <
0) {
@@ -3074,7 +3074,7 @@ static int testConnectListDefinedNetworks(virConnectPtr conn, char
**const names
return n;
error:
- for (n = 0 ; n < nnames ; n++)
+ for (n = 0; n < nnames; n++)
VIR_FREE(names[n]);
testDriverUnlock(privconn);
return -1;
@@ -3469,7 +3469,7 @@ static int testConnectNumOfInterfaces(virConnectPtr conn)
int i, count = 0;
testDriverLock(privconn);
- for (i = 0 ; (i < privconn->ifaces.count); i++) {
+ for (i = 0; (i < privconn->ifaces.count); i++) {
virInterfaceObjLock(privconn->ifaces.objs[i]);
if (virInterfaceObjIsActive(privconn->ifaces.objs[i])) {
count++;
@@ -3487,7 +3487,7 @@ static int testConnectListInterfaces(virConnectPtr conn, char
**const names, int
testDriverLock(privconn);
memset(names, 0, sizeof(*names)*nnames);
- for (i = 0 ; (i < privconn->ifaces.count) && (n < nnames); i++) {
+ for (i = 0; (i < privconn->ifaces.count) && (n < nnames); i++) {
virInterfaceObjLock(privconn->ifaces.objs[i]);
if (virInterfaceObjIsActive(privconn->ifaces.objs[i])) {
if (VIR_STRDUP(names[n++], privconn->ifaces.objs[i]->def->name) <
0) {
@@ -3502,7 +3502,7 @@ static int testConnectListInterfaces(virConnectPtr conn, char
**const names, int
return n;
error:
- for (n = 0 ; n < nnames ; n++)
+ for (n = 0; n < nnames; n++)
VIR_FREE(names[n]);
testDriverUnlock(privconn);
return -1;
@@ -3514,7 +3514,7 @@ static int testConnectNumOfDefinedInterfaces(virConnectPtr conn)
int i, count = 0;
testDriverLock(privconn);
- for (i = 0 ; i < privconn->ifaces.count; i++) {
+ for (i = 0; i < privconn->ifaces.count; i++) {
virInterfaceObjLock(privconn->ifaces.objs[i]);
if (!virInterfaceObjIsActive(privconn->ifaces.objs[i])) {
count++;
@@ -3532,7 +3532,7 @@ static int testConnectListDefinedInterfaces(virConnectPtr conn, char
**const nam
testDriverLock(privconn);
memset(names, 0, sizeof(*names)*nnames);
- for (i = 0 ; (i < privconn->ifaces.count) && (n < nnames); i++) {
+ for (i = 0; (i < privconn->ifaces.count) && (n < nnames); i++) {
virInterfaceObjLock(privconn->ifaces.objs[i]);
if (!virInterfaceObjIsActive(privconn->ifaces.objs[i])) {
if (VIR_STRDUP(names[n++], privconn->ifaces.objs[i]->def->name) <
0) {
@@ -3547,7 +3547,7 @@ static int testConnectListDefinedInterfaces(virConnectPtr conn, char
**const nam
return n;
error:
- for (n = 0 ; n < nnames ; n++)
+ for (n = 0; n < nnames; n++)
VIR_FREE(names[n]);
testDriverUnlock(privconn);
return -1;
@@ -3957,7 +3957,7 @@ testConnectNumOfStoragePools(virConnectPtr conn) {
int numActive = 0, i;
testDriverLock(privconn);
- for (i = 0 ; i < privconn->pools.count ; i++)
+ for (i = 0; i < privconn->pools.count; i++)
if (virStoragePoolObjIsActive(privconn->pools.objs[i]))
numActive++;
testDriverUnlock(privconn);
@@ -3974,7 +3974,7 @@ testConnectListStoragePools(virConnectPtr conn,
testDriverLock(privconn);
memset(names, 0, sizeof(*names)*nnames);
- for (i = 0 ; i < privconn->pools.count && n < nnames ; i++) {
+ for (i = 0; i < privconn->pools.count && n < nnames; i++) {
virStoragePoolObjLock(privconn->pools.objs[i]);
if (virStoragePoolObjIsActive(privconn->pools.objs[i]) &&
VIR_STRDUP(names[n++], privconn->pools.objs[i]->def->name) < 0)
{
@@ -3988,7 +3988,7 @@ testConnectListStoragePools(virConnectPtr conn,
return n;
error:
- for (n = 0 ; n < nnames ; n++)
+ for (n = 0; n < nnames; n++)
VIR_FREE(names[n]);
testDriverUnlock(privconn);
return -1;
@@ -4000,7 +4000,7 @@ testConnectNumOfDefinedStoragePools(virConnectPtr conn) {
int numInactive = 0, i;
testDriverLock(privconn);
- for (i = 0 ; i < privconn->pools.count ; i++) {
+ for (i = 0; i < privconn->pools.count; i++) {
virStoragePoolObjLock(privconn->pools.objs[i]);
if (!virStoragePoolObjIsActive(privconn->pools.objs[i]))
numInactive++;
@@ -4020,7 +4020,7 @@ testConnectListDefinedStoragePools(virConnectPtr conn,
testDriverLock(privconn);
memset(names, 0, sizeof(*names)*nnames);
- for (i = 0 ; i < privconn->pools.count && n < nnames ; i++) {
+ for (i = 0; i < privconn->pools.count && n < nnames; i++) {
virStoragePoolObjLock(privconn->pools.objs[i]);
if (!virStoragePoolObjIsActive(privconn->pools.objs[i]) &&
VIR_STRDUP(names[n++], privconn->pools.objs[i]->def->name) < 0)
{
@@ -4034,7 +4034,7 @@ testConnectListDefinedStoragePools(virConnectPtr conn,
return n;
error:
- for (n = 0 ; n < nnames ; n++)
+ for (n = 0; n < nnames; n++)
VIR_FREE(names[n]);
testDriverUnlock(privconn);
return -1;
@@ -4631,7 +4631,7 @@ testStoragePoolListVolumes(virStoragePoolPtr pool,
goto cleanup;
}
- for (i = 0 ; i < privpool->volumes.count && n < maxnames ; i++) {
+ for (i = 0; i < privpool->volumes.count && n < maxnames; i++) {
if (VIR_STRDUP(names[n++], privpool->volumes.objs[i]->name) < 0)
goto cleanup;
}
@@ -4640,7 +4640,7 @@ testStoragePoolListVolumes(virStoragePoolPtr pool,
return n;
cleanup:
- for (n = 0 ; n < maxnames ; n++)
+ for (n = 0; n < maxnames; n++)
VIR_FREE(names[i]);
memset(names, 0, maxnames * sizeof(*names));
@@ -4690,7 +4690,7 @@ testStoragePoolListAllVolumes(virStoragePoolPtr obj,
goto cleanup;
}
- for (i = 0 ; i < pool->volumes.count; i++) {
+ for (i = 0; i < pool->volumes.count; i++) {
if (!(vol = virGetStorageVol(obj->conn, pool->def->name,
pool->volumes.objs[i]->name,
pool->volumes.objs[i]->key,
@@ -4770,7 +4770,7 @@ testStorageVolLookupByKey(virConnectPtr conn,
virStorageVolPtr ret = NULL;
testDriverLock(privconn);
- for (i = 0 ; i < privconn->pools.count ; i++) {
+ for (i = 0; i < privconn->pools.count; i++) {
virStoragePoolObjLock(privconn->pools.objs[i]);
if (virStoragePoolObjIsActive(privconn->pools.objs[i])) {
virStorageVolDefPtr privvol =
@@ -4805,7 +4805,7 @@ testStorageVolLookupByPath(virConnectPtr conn,
virStorageVolPtr ret = NULL;
testDriverLock(privconn);
- for (i = 0 ; i < privconn->pools.count ; i++) {
+ for (i = 0; i < privconn->pools.count; i++) {
virStoragePoolObjLock(privconn->pools.objs[i]);
if (virStoragePoolObjIsActive(privconn->pools.objs[i])) {
virStorageVolDefPtr privvol =
@@ -5048,7 +5048,7 @@ testStorageVolDelete(virStorageVolPtr vol,
privpool->def->available = (privpool->def->capacity -
privpool->def->allocation);
- for (i = 0 ; i < privpool->volumes.count ; i++) {
+ for (i = 0; i < privpool->volumes.count; i++) {
if (privpool->volumes.objs[i] == privvol) {
virStorageVolDefFree(privvol);
--
1.8.1.4
5 a.m.
New subject: [libvirt] [PATCH 05/31] src/vbox: Remove the whitespace before '; '
---
src/vbox/vbox_tmpl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index 5a5b429..36d1e7f 100644
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -3478,7 +3478,7 @@ static int vboxConnectListDefinedDomains(virConnectPtr conn, char **
const names
if (VIR_STRDUP(names[j], machineName) < 0) {
VBOX_UTF16_FREE(machineNameUtf16);
VBOX_UTF8_FREE(machineName);
- for (; j >= 0 ; j--)
+ for (; j >= 0; j--)
VIR_FREE(names[j]);
ret = -1;
goto cleanup;
--
1.8.1.4
5 a.m.
New subject: [libvirt] [PATCH 06/31] src/xenxs: Remove the whitespace before '; '
---
src/xenxs/xen_sxpr.c | 20 ++++++++++----------
src/xenxs/xen_xm.c | 16 ++++++++--------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c
index 9a76d04..16737a0 100644
--- a/src/xenxs/xen_sxpr.c
+++ b/src/xenxs/xen_sxpr.c
@@ -676,7 +676,7 @@ xenParseSxprSound(virDomainDefPtr def,
goto no_memory;
- for (i = 0 ; i < (VIR_DOMAIN_SOUND_MODEL_ES1370 + 1) ; i++) {
+ for (i = 0; i < (VIR_DOMAIN_SOUND_MODEL_ES1370 + 1); i++) {
virDomainSoundDefPtr sound;
if (VIR_ALLOC(sound) < 0)
goto no_memory;
@@ -1387,7 +1387,7 @@ xenParseSxpr(const struct sexpr *root,
if (hvm) {
const char *const fds[] = { "fda", "fdb" };
int i;
- for (i = 0 ; i < ARRAY_CARDINALITY(fds) ; 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)) {
virDomainDiskDefPtr disk;
@@ -2101,7 +2101,7 @@ xenFormatSxprAllPCI(virDomainDefPtr def,
int hasPCI = 0;
int i;
- for (i = 0 ; i < def->nhostdevs ; i++)
+ for (i = 0; i < def->nhostdevs; i++)
if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
def->hostdevs[i]->source.subsys.type ==
VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
hasPCI = 1;
@@ -2124,7 +2124,7 @@ xenFormatSxprAllPCI(virDomainDefPtr def,
*/
virBufferAddLit(buf, "(device (pci ");
- for (i = 0 ; i < def->nhostdevs ; i++) {
+ for (i = 0; i < def->nhostdevs; i++) {
if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
def->hostdevs[i]->source.subsys.type ==
VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) {
if (def->hostdevs[i]->managed) {
@@ -2158,7 +2158,7 @@ xenFormatSxprSound(virDomainDefPtr def,
const char *str;
int i;
- for (i = 0 ; i < def->nsounds ; i++) {
+ for (i = 0; i < def->nsounds; i++) {
if (!(str = virDomainSoundModelTypeToString(def->sounds[i]->model))) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("unexpected sound model %d"),
@@ -2333,7 +2333,7 @@ xenFormatSxpr(virConnectPtr conn,
virBufferAsprintf(&buf, "(vcpu_avail %lu)",
(1UL << def->vcpus) - 1);
- for (i = 0 ; i < def->os.nBootDevs ; i++) {
+ for (i = 0; i < def->os.nBootDevs; i++) {
switch (def->os.bootDevs[i]) {
case VIR_DOMAIN_BOOT_FLOPPY:
bootorder[i] = 'a';
@@ -2359,7 +2359,7 @@ xenFormatSxpr(virConnectPtr conn,
virBufferAsprintf(&buf, "(boot %s)", bootorder);
/* some disk devices are defined here */
- for (i = 0 ; i < def->ndisks ; i++) {
+ for (i = 0; i < def->ndisks; i++) {
switch (def->disks[i]->device) {
case VIR_DOMAIN_DISK_DEVICE_CDROM:
/* Only xend <= 3.0.2 wants cdrom config here */
@@ -2397,7 +2397,7 @@ xenFormatSxpr(virConnectPtr conn,
virBufferAddLit(&buf, "(usb 1)");
- for (i = 0 ; i < def->ninputs ; i++)
+ for (i = 0; i < def->ninputs; i++)
if (xenFormatSxprInput(def->inputs[i], &buf) < 0)
goto error;
@@ -2571,12 +2571,12 @@ xenFormatSxpr(virConnectPtr conn,
virBufferAsprintf(&buf, "(localtime %d)", vmlocaltime);
- for (i = 0 ; i < def->ndisks ; i++)
+ for (i = 0; i < def->ndisks; i++)
if (xenFormatSxprDisk(def->disks[i],
&buf, hvm, xendConfigVersion, 0) < 0)
goto error;
- for (i = 0 ; i < def->nnets ; i++)
+ for (i = 0; i < def->nnets; i++)
if (xenFormatSxprNet(conn, def->nets[i],
&buf, hvm, xendConfigVersion, 0) < 0)
goto error;
diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c
index 57ce2e7..11c02c1 100644
--- a/src/xenxs/xen_xm.c
+++ b/src/xenxs/xen_xm.c
@@ -319,7 +319,7 @@ xenParseXM(virConfPtr conf, int xendConfigVersion,
if (xenXMConfigGetString(conf, "boot", &boot, "c") <
0)
goto cleanup;
- for (i = 0 ; i < VIR_DOMAIN_BOOT_LAST && boot[i] ; i++) {
+ for (i = 0; i < VIR_DOMAIN_BOOT_LAST && boot[i]; i++) {
switch (*boot) {
case 'a':
def->os.bootDevs[i] = VIR_DOMAIN_BOOT_FLOPPY;
@@ -1448,7 +1448,7 @@ xenFormatXMPCI(virConfPtr conf,
int hasPCI = 0;
int i;
- for (i = 0 ; i < def->nhostdevs ; i++)
+ for (i = 0; i < def->nhostdevs; i++)
if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
def->hostdevs[i]->source.subsys.type ==
VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
hasPCI = 1;
@@ -1464,7 +1464,7 @@ xenFormatXMPCI(virConfPtr conf,
pciVal->type = VIR_CONF_LIST;
pciVal->list = NULL;
- for (i = 0 ; i < def->nhostdevs ; i++) {
+ for (i = 0; i < def->nhostdevs; i++) {
if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
def->hostdevs[i]->source.subsys.type ==
VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) {
virConfValuePtr val, tmp;
@@ -1575,7 +1575,7 @@ virConfPtr xenFormatXM(virConnectPtr conn,
xenXMConfigSetString(conf, "kernel", def->os.loader) < 0)
goto no_memory;
- for (i = 0 ; i < def->os.nBootDevs ; i++) {
+ for (i = 0; i < def->os.nBootDevs; i++) {
switch (def->os.bootDevs[i]) {
case VIR_DOMAIN_BOOT_FLOPPY:
boot[i] = 'a';
@@ -1637,7 +1637,7 @@ virConfPtr xenFormatXM(virConnectPtr conn,
}
if (xendConfigVersion == XEND_CONFIG_VERSION_3_0_2) {
- for (i = 0 ; i < def->ndisks ; i++) {
+ for (i = 0; i < def->ndisks; i++) {
if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_CDROM
&&
def->disks[i]->dst &&
STREQ(def->disks[i]->dst, "hdc") &&
@@ -1774,7 +1774,7 @@ virConfPtr xenFormatXM(virConnectPtr conn,
xenXMConfigSetString(conf, "device_model", def->emulator) <
0)
goto no_memory;
- for (i = 0 ; i < def->ninputs ; i++) {
+ for (i = 0; i < def->ninputs; i++) {
if (def->inputs[i]->bus == VIR_DOMAIN_INPUT_BUS_USB) {
if (xenXMConfigSetInt(conf, "usb", 1) < 0)
goto no_memory;
@@ -1894,7 +1894,7 @@ virConfPtr xenFormatXM(virConnectPtr conn,
diskVal->type = VIR_CONF_LIST;
diskVal->list = NULL;
- for (i = 0 ; i < def->ndisks ; i++) {
+ for (i = 0; i < def->ndisks; i++) {
if (xendConfigVersion == XEND_CONFIG_VERSION_3_0_2 &&
def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_CDROM &&
def->disks[i]->dst &&
@@ -1921,7 +1921,7 @@ virConfPtr xenFormatXM(virConnectPtr conn,
netVal->type = VIR_CONF_LIST;
netVal->list = NULL;
- for (i = 0 ; i < def->nnets ; i++) {
+ for (i = 0; i < def->nnets; i++) {
if (xenFormatXMNet(conn, netVal,def->nets[i],
hvm, xendConfigVersion) < 0)
goto cleanup;
--
1.8.1.4
5 a.m.
New subject: [libvirt] [PATCH 07/31] src/nwfilter: Remove the whitespace before '; '
---
src/nwfilter/nwfilter_dhcpsnoop.c | 6 +++---
src/nwfilter/nwfilter_driver.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c
index 328f90e..b9921e5 100644
--- a/src/nwfilter/nwfilter_dhcpsnoop.c
+++ b/src/nwfilter/nwfilter_dhcpsnoop.c
@@ -29,13 +29,13 @@
/*
* Note about testing:
* On the host run in a shell:
- * while :; do kill -SIGHUP `pidof libvirtd` ; echo "HUP $RANDOM"; sleep
20; done
+ * while :; do kill -SIGHUP `pidof libvirtd`; echo "HUP $RANDOM"; sleep
20; done
*
* Inside a couple of VMs that for example use the 'clean-traffic' filter:
- * while :; do kill -SIGTERM `pidof dhclient`; dhclient eth0 ; ifconfig eth0; done
+ * while :; do kill -SIGTERM `pidof dhclient`; dhclient eth0; ifconfig eth0; done
*
* On the host check the lease file and that it's periodically shortened:
- * cat /var/run/libvirt/network/nwfilter.leases ; date +%s
+ * cat /var/run/libvirt/network/nwfilter.leases; date +%s
*
* On the host also check that the ebtables rules 'look' ok:
* ebtables -t nat -L
diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index 64ea251..19febfc 100644
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -452,7 +452,7 @@ nwfilterConnectListNWFilters(virConnectPtr conn,
int got = 0, i;
nwfilterDriverLock(driver);
- for (i = 0 ; i < driver->nwfilters.count && got < nnames ; i++) {
+ for (i = 0; i < driver->nwfilters.count && got < nnames; i++) {
virNWFilterObjLock(driver->nwfilters.objs[i]);
if (VIR_STRDUP(names[got], driver->nwfilters.objs[i]->def->name) < 0)
{
virNWFilterObjUnlock(driver->nwfilters.objs[i]);
@@ -466,7 +466,7 @@ nwfilterConnectListNWFilters(virConnectPtr conn,
cleanup:
nwfilterDriverUnlock(driver);
- for (i = 0 ; i < got ; i++)
+ for (i = 0; i < got; i++)
VIR_FREE(names[i]);
memset(names, 0, nnames * sizeof(*names));
return -1;
@@ -499,7 +499,7 @@ nwfilterConnectListAllNWFilters(virConnectPtr conn,
goto cleanup;
}
- for (i = 0 ; i < driver->nwfilters.count; i++) {
+ for (i = 0; i < driver->nwfilters.count; i++) {
obj = driver->nwfilters.objs[i];
virNWFilterObjLock(obj);
if (!(filter = virGetNWFilter(conn, obj->def->name,
--
1.8.1.4
5 a.m.
New subject: [libvirt] [PATCH 08/31] src/phyp: Remove the whitespace before '; '
---
src/phyp/phyp_driver.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index 4594cbf..70d3adb 100644
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -1008,7 +1008,7 @@ connected:
libssh2_session_set_blocking(session, 0);
while ((rc = libssh2_session_startup(session, sock)) ==
- LIBSSH2_ERROR_EAGAIN) ;
+ LIBSSH2_ERROR_EAGAIN);
if (rc) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("Failure establishing SSH
session."));
@@ -1026,7 +1026,7 @@ connected:
pubkey,
pvtkey,
NULL)) ==
- LIBSSH2_ERROR_EAGAIN) ;
+ LIBSSH2_ERROR_EAGAIN);
keyboard_interactive:
if (rc == LIBSSH2_ERROR_SOCKET_NONE
@@ -1049,7 +1049,7 @@ keyboard_interactive:
while ((rc =
libssh2_userauth_password(session, username,
password)) ==
- LIBSSH2_ERROR_EAGAIN) ;
+ LIBSSH2_ERROR_EAGAIN);
if (rc) {
virReportError(VIR_ERR_AUTH_FAILED,
--
1.8.1.4
10:37 a.m.
New subject: [libvirt] [PATCH 08/31] src/phyp: Remove the whitespace before '; '
On 05/21/2013 04:00 AM, Osier Yang wrote:
---
src/phyp/phyp_driver.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
ACK for being mechanical. However...
diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index 4594cbf..70d3adb 100644
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -1008,7 +1008,7 @@ connected:
libssh2_session_set_blocking(session, 0);
while ((rc = libssh2_session_startup(session, sock)) ==
- LIBSSH2_ERROR_EAGAIN) ;
+ LIBSSH2_ERROR_EAGAIN);
My review of patch 30/31 made me revisit this patch. It has an empty
while loop. Should we enforce a particular style where all empty-bodied
loops should use a more obvious style to prove that we knew what we were
doing? For example:
while ((rc = libssh2_session_startup(session, sock)) ==
LIBSSH2_ERROR_EAGAIN)
; /* empty */
or
while ((rc = libssh2_session_startup(session, sock)) ==
LIBSSH2_ERROR_EAGAIN) {
/* empty */
}
If so, how would we enforce such a style?
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
10:50 a.m.
New subject: [libvirt] [PATCH 08/31] src/phyp: Remove the whitespace before '; '
On 21/05/13 23:37, Eric Blake wrote:
On 05/21/2013 04:00 AM, Osier Yang wrote:
> ---
> src/phyp/phyp_driver.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
ACK for being mechanical. However...
> diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
> index 4594cbf..70d3adb 100644
> --- a/src/phyp/phyp_driver.c
> +++ b/src/phyp/phyp_driver.c
> @@ -1008,7 +1008,7 @@ connected:
> libssh2_session_set_blocking(session, 0);
>
> while ((rc = libssh2_session_startup(session, sock)) ==
> - LIBSSH2_ERROR_EAGAIN) ;
> + LIBSSH2_ERROR_EAGAIN);
My review of patch 30/31 made me revisit this patch. It has an empty
while loop. Should we enforce a particular style where all empty-bodied
loops should use a more obvious style to prove that we knew what we were
doing? For example:
while ((rc = libssh2_session_startup(session, sock)) ==
LIBSSH2_ERROR_EAGAIN)
; /* empty */
or
while ((rc = libssh2_session_startup(session, sock)) ==
LIBSSH2_ERROR_EAGAIN) {
/* empty */
}
Either of above 2 is better than the original one. It's more clear to know
the loop has an empty body. But not sure if it's overladen forcing.
Osier
5 a.m.
New subject: [libvirt] [PATCH 09/31] src/node_device: Remove the whitespace before '; '
---
src/node_device/node_device_udev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index 4aeaed5..620cd58 100644
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -338,7 +338,7 @@ static int udevGenerateDeviceName(struct udev_device *device,
def->name = virBufferContentAndReset(&buf);
- for (i = 0; i < strlen(def->name) ; i++) {
+ for (i = 0; i < strlen(def->name); i++) {
if (!(c_isalnum(*(def->name + i)))) {
*(def->name + i) = '_';
}
--
1.8.1.4
5 a.m.
New subject: [libvirt] [PATCH 10/31] src/openvz: Remove the whitespace before '; '
---
src/openvz/openvz_driver.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index 33ba624..1d404e7 100644
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -918,7 +918,7 @@ openvzDomainSetNetworkConfig(virConnectPtr conn,
int first = 1;
struct openvz_driver *driver = conn->privateData;
- for (i = 0 ; i < def->nnets ; i++) {
+ for (i = 0; i < def->nnets; i++) {
if (driver->version < VZCTL_BRIDGE_MIN_VERSION &&
def->nets[i]->type == VIR_DOMAIN_NET_TYPE_BRIDGE) {
if (first)
@@ -1621,7 +1621,7 @@ out:
VIR_FORCE_CLOSE(outfd);
virCommandFree(cmd);
if (rc < 0) {
- for (; got >= 0 ; got--)
+ for (; got >= 0; got--)
VIR_FREE(names[got]);
}
return rc;
@@ -1990,7 +1990,7 @@ openvzDomainInterfaceStats(virDomainPtr dom,
}
/* Check the path is one of the domain's network interfaces. */
- for (i = 0 ; i < vm->def->nnets ; i++) {
+ for (i = 0; i < vm->def->nnets; i++) {
if (vm->def->nets[i]->ifname &&
STREQ(vm->def->nets[i]->ifname, path)) {
ret = 0;
--
1.8.1.4
5 a.m.
New subject: [libvirt] [PATCH 11/31] src/uml: Remove the whitespace before ';'
---
src/uml/uml_conf.c | 12 ++++++------
src/uml/uml_driver.c | 14 +++++++-------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c
index 52b705c..6e0725c 100644
--- a/src/uml/uml_conf.c
+++ b/src/uml/uml_conf.c
@@ -407,7 +407,7 @@ virCommandPtr umlBuildCommandLine(virConnectPtr conn,
if (vm->def->os.root)
virCommandAddArgPair(cmd, "root", vm->def->os.root);
- for (i = 0 ; i < vm->def->ndisks ; i++) {
+ for (i = 0; i < vm->def->ndisks; i++) {
virDomainDiskDefPtr disk = vm->def->disks[i];
if (!STRPREFIX(disk->dst, "ubd")) {
@@ -419,7 +419,7 @@ virCommandPtr umlBuildCommandLine(virConnectPtr conn,
virCommandAddArgPair(cmd, disk->dst, disk->src);
}
- for (i = 0 ; i < vm->def->nnets ; i++) {
+ for (i = 0; i < vm->def->nnets; i++) {
char *ret = umlBuildCommandLineNet(conn, vm->def, vm->def->nets[i], i);
if (!ret)
goto error;
@@ -427,10 +427,10 @@ virCommandPtr umlBuildCommandLine(virConnectPtr conn,
VIR_FREE(ret);
}
- for (i = 0 ; i < UML_MAX_CHAR_DEVICE ; i++) {
+ for (i = 0; i < UML_MAX_CHAR_DEVICE; i++) {
virDomainChrDefPtr chr = NULL;
char *ret = NULL;
- for (j = 0 ; j < vm->def->nconsoles ; j++)
+ for (j = 0; j < vm->def->nconsoles; j++)
if (vm->def->consoles[j]->target.port == i)
chr = vm->def->consoles[j];
if (chr)
@@ -442,10 +442,10 @@ virCommandPtr umlBuildCommandLine(virConnectPtr conn,
VIR_FREE(ret);
}
- for (i = 0 ; i < UML_MAX_CHAR_DEVICE ; i++) {
+ for (i = 0; i < UML_MAX_CHAR_DEVICE; i++) {
virDomainChrDefPtr chr = NULL;
char *ret = NULL;
- for (j = 0 ; j < vm->def->nserials ; j++)
+ for (j = 0; j < vm->def->nserials; j++)
if (vm->def->serials[j]->target.port == i)
chr = vm->def->serials[j];
if (chr)
diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index 321be0f..b238b0f 100644
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -276,13 +276,13 @@ umlIdentifyChrPTY(struct uml_driver *driver,
{
int i;
- for (i = 0 ; i < dom->def->nconsoles; i++)
+ for (i = 0; i < dom->def->nconsoles; i++)
if (dom->def->consoles[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY)
if (umlIdentifyOneChrPTY(driver, dom,
dom->def->consoles[i], "con") < 0)
return -1;
- for (i = 0 ; i < dom->def->nserials; i++)
+ for (i = 0; i < dom->def->nserials; i++)
if (dom->def->serials[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY
&&
umlIdentifyOneChrPTY(driver, dom,
dom->def->serials[i], "ssl") < 0)
@@ -1004,7 +1004,7 @@ error:
static void umlCleanupTapDevices(virDomainObjPtr vm) {
int i;
- for (i = 0 ; i < vm->def->nnets ; i++) {
+ for (i = 0; i < vm->def->nnets; i++) {
virDomainNetDefPtr def = vm->def->nets[i];
if (def->type != VIR_DOMAIN_NET_TYPE_BRIDGE &&
@@ -1092,7 +1092,7 @@ static int umlStartVMDaemon(virConnectPtr conn,
if (!(cmd = umlBuildCommandLine(conn, driver, vm)))
goto cleanup;
- for (i = 0 ; i < vm->def->nconsoles ; i++) {
+ for (i = 0; i < vm->def->nconsoles; i++) {
VIR_FREE(vm->def->consoles[i]->info.alias);
if (virAsprintf(&vm->def->consoles[i]->info.alias,
"console%zu", i) < 0) {
virReportOOMError();
@@ -2037,7 +2037,7 @@ static int umlDomainAttachUmlDisk(struct uml_driver *driver,
char *cmd = NULL;
char *reply = NULL;
- for (i = 0 ; i < vm->def->ndisks ; i++) {
+ for (i = 0; i < vm->def->ndisks; i++) {
if (STREQ(vm->def->disks[i]->dst, disk->dst)) {
virReportError(VIR_ERR_OPERATION_FAILED,
_("target %s already exists"), disk->dst);
@@ -2163,7 +2163,7 @@ static int umlDomainDetachUmlDisk(struct uml_driver *driver,
char *cmd;
char *reply;
- for (i = 0 ; i < vm->def->ndisks ; i++) {
+ for (i = 0; i < vm->def->ndisks; i++) {
if (STREQ(vm->def->disks[i]->dst, dev->data.disk->dst)) {
break;
}
@@ -2456,7 +2456,7 @@ umlDomainOpenConsole(virDomainPtr dom,
}
if (dev_name) {
- for (i = 0 ; i < vm->def->nconsoles ; i++) {
+ for (i = 0; i < vm->def->nconsoles; i++) {
if (vm->def->consoles[i]->info.alias &&
STREQ(vm->def->consoles[i]->info.alias, dev_name)) {
chr = vm->def->consoles[i];
--
1.8.1.4
5 a.m.
New subject: [libvirt] [PATCH 12/31] src/parallels: Remove the whitespace before '; '
---
src/parallels/parallels_network.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/parallels/parallels_network.c b/src/parallels/parallels_network.c
index 8990609..c126e31 100644
--- a/src/parallels/parallels_network.c
+++ b/src/parallels/parallels_network.c
@@ -366,7 +366,7 @@ static int parallelsConnectNumOfNetworks(virConnectPtr conn)
parallelsConnPtr privconn = conn->privateData;
parallelsDriverLock(privconn);
- for (i = 0 ; i < privconn->networks.count ; i++) {
+ for (i = 0; i < privconn->networks.count; i++) {
virNetworkObjLock(privconn->networks.objs[i]);
if (virNetworkObjIsActive(privconn->networks.objs[i]))
nactive++;
@@ -385,7 +385,7 @@ static int parallelsConnectListNetworks(virConnectPtr conn,
int got = 0, i;
parallelsDriverLock(privconn);
- for (i = 0 ; i < privconn->networks.count && got < nnames ; i++) {
+ for (i = 0; i < privconn->networks.count && got < nnames; i++) {
virNetworkObjLock(privconn->networks.objs[i]);
if (virNetworkObjIsActive(privconn->networks.objs[i])) {
if (VIR_STRDUP(names[got], privconn->networks.objs[i]->def->name)
< 0) {
@@ -402,7 +402,7 @@ static int parallelsConnectListNetworks(virConnectPtr conn,
cleanup:
parallelsDriverUnlock(privconn);
- for (i = 0 ; i < got ; i++)
+ for (i = 0; i < got; i++)
VIR_FREE(names[i]);
return -1;
}
@@ -413,7 +413,7 @@ static int parallelsConnectNumOfDefinedNetworks(virConnectPtr conn)
parallelsConnPtr privconn = conn->privateData;
parallelsDriverLock(privconn);
- for (i = 0 ; i < privconn->networks.count ; i++) {
+ for (i = 0; i < privconn->networks.count; i++) {
virNetworkObjLock(privconn->networks.objs[i]);
if (!virNetworkObjIsActive(privconn->networks.objs[i]))
ninactive++;
@@ -432,7 +432,7 @@ static int parallelsConnectListDefinedNetworks(virConnectPtr conn,
int got = 0, i;
parallelsDriverLock(privconn);
- for (i = 0 ; i < privconn->networks.count && got < nnames ; i++) {
+ for (i = 0; i < privconn->networks.count && got < nnames; i++) {
virNetworkObjLock(privconn->networks.objs[i]);
if (!virNetworkObjIsActive(privconn->networks.objs[i])) {
if (VIR_STRDUP(names[got], privconn->networks.objs[i]->def->name)
< 0) {
@@ -448,7 +448,7 @@ static int parallelsConnectListDefinedNetworks(virConnectPtr conn,
cleanup:
parallelsDriverUnlock(privconn);
- for (i = 0 ; i < got ; i++)
+ for (i = 0; i < got; i++)
VIR_FREE(names[i]);
return -1;
}
--
1.8.1.4
5 a.m.
New subject: [libvirt] [PATCH 13/31] src/interface: Remove the whitespace before '; '
---
src/interface/interface_backend_udev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/interface/interface_backend_udev.c
b/src/interface/interface_backend_udev.c
index 1fd7d46..6e27e83 100644
--- a/src/interface/interface_backend_udev.c
+++ b/src/interface/interface_backend_udev.c
@@ -42,7 +42,7 @@ typedef enum {
VIR_UDEV_IFACE_ACTIVE,
VIR_UDEV_IFACE_INACTIVE,
VIR_UDEV_IFACE_ALL
-} virUdevStatus ;
+} virUdevStatus;
static virInterfaceDef *udevGetIfaceDef(struct udev *udev, const char *name);
--
1.8.1.4
5 a.m.
New subject: [libvirt] [PATCH 14/31] src/qemu: Remove the whitespace before '; '
---
src/qemu/qemu_agent.c | 4 +-
src/qemu/qemu_capabilities.c | 32 ++++----
src/qemu/qemu_cgroup.c | 4 +-
src/qemu/qemu_command.c | 170 +++++++++++++++++++++----------------------
src/qemu/qemu_conf.c | 4 +-
src/qemu/qemu_domain.c | 12 +--
src/qemu/qemu_driver.c | 30 ++++----
src/qemu/qemu_hostdev.c | 8 +-
src/qemu/qemu_hotplug.c | 14 ++--
src/qemu/qemu_migration.c | 6 +-
src/qemu/qemu_monitor.c | 2 +-
src/qemu/qemu_monitor_json.c | 34 ++++-----
src/qemu/qemu_monitor_text.c | 2 +-
src/qemu/qemu_process.c | 44 +++++------
14 files changed, 183 insertions(+), 183 deletions(-)
diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index d116b23..c7a9681 100644
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -139,7 +139,7 @@ qemuAgentEscapeNonPrintable(const char *text)
{
int i;
virBuffer buf = VIR_BUFFER_INITIALIZER;
- for (i = 0 ; text[i] != '\0' ; i++) {
+ for (i = 0; text[i] != '\0'; i++) {
if (text[i] == '\\')
virBufferAddLit(&buf, "\\\\");
else if (c_isprint(text[i]) || text[i] == '\n' ||
@@ -281,7 +281,7 @@ qemuAgentIOProcessEvent(qemuAgentPtr mon,
}
/*
- for (i = 0 ; i < ARRAY_CARDINALITY(eventHandlers) ; i++) {
+ for (i = 0; i < ARRAY_CARDINALITY(eventHandlers); i++) {
if (STREQ(eventHandlers[i].type, type)) {
virJSONValuePtr data = virJSONValueObjectGet(obj, "data");
VIR_DEBUG("handle %s handler=%p data=%p", type,
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 82129a2..d7798e4 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -905,7 +905,7 @@ virCapsPtr virQEMUCapsInit(virQEMUCapsCachePtr cache)
* so just probe for them all - we gracefully fail
* if a qemu-system-$ARCH binary can't be found
*/
- for (i = 0 ; i < VIR_ARCH_LAST ; i++)
+ for (i = 0; i < VIR_ARCH_LAST; i++)
if (virQEMUCapsInitGuest(caps, cache,
hostarch,
i) < 0)
@@ -1463,8 +1463,8 @@ virQEMUCapsProcessStringFlags(virQEMUCapsPtr qemuCaps,
char *const*values)
{
size_t i, j;
- for (i = 0 ; i < nflags ; i++) {
- for (j = 0 ; j < nvalues ; j++) {
+ for (i = 0; i < nflags; i++) {
+ for (j = 0; j < nvalues; j++) {
if (STREQ(values[j], flags[i].value)) {
virQEMUCapsSet(qemuCaps, flags[i].flag);
break;
@@ -1479,7 +1479,7 @@ virQEMUCapsFreeStringList(size_t len,
char **values)
{
size_t i;
- for (i = 0 ; i < len ; i++)
+ for (i = 0; i < len; i++)
VIR_FREE(values[i]);
VIR_FREE(values);
}
@@ -1600,7 +1600,7 @@ virQEMUCapsParseDeviceStr(virQEMUCapsPtr qemuCaps, const char *str)
nvalues, values);
virQEMUCapsFreeStringList(nvalues, values);
- for (i = 0 ; i < ARRAY_CARDINALITY(virQEMUCapsObjectProps); i++) {
+ for (i = 0; i < ARRAY_CARDINALITY(virQEMUCapsObjectProps); i++) {
const char *type = virQEMUCapsObjectProps[i].type;
if ((nvalues = virQEMUCapsParseDeviceStrObjectProps(str,
type,
@@ -1740,7 +1740,7 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps)
if (VIR_ALLOC_N(ret->cpuDefinitions, qemuCaps->ncpuDefinitions) < 0)
goto no_memory;
ret->ncpuDefinitions = qemuCaps->ncpuDefinitions;
- for (i = 0 ; i < qemuCaps->ncpuDefinitions ; i++) {
+ for (i = 0; i < qemuCaps->ncpuDefinitions; i++) {
if (!(ret->cpuDefinitions[i] = strdup(qemuCaps->cpuDefinitions[i])))
goto no_memory;
}
@@ -1750,7 +1750,7 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps)
if (VIR_ALLOC_N(ret->machineAliases, qemuCaps->nmachineTypes) < 0)
goto no_memory;
ret->nmachineTypes = qemuCaps->nmachineTypes;
- for (i = 0 ; i < qemuCaps->nmachineTypes ; i++) {
+ for (i = 0; i < qemuCaps->nmachineTypes; i++) {
if (!(ret->machineTypes[i] = strdup(qemuCaps->machineTypes[i])))
goto no_memory;
if (qemuCaps->machineAliases[i] &&
@@ -1772,14 +1772,14 @@ void virQEMUCapsDispose(void *obj)
virQEMUCapsPtr qemuCaps = obj;
size_t i;
- for (i = 0 ; i < qemuCaps->nmachineTypes ; i++) {
+ for (i = 0; i < qemuCaps->nmachineTypes; i++) {
VIR_FREE(qemuCaps->machineTypes[i]);
VIR_FREE(qemuCaps->machineAliases[i]);
}
VIR_FREE(qemuCaps->machineTypes);
VIR_FREE(qemuCaps->machineAliases);
- for (i = 0 ; i < qemuCaps->ncpuDefinitions ; i++) {
+ for (i = 0; i < qemuCaps->ncpuDefinitions; i++) {
VIR_FREE(qemuCaps->cpuDefinitions[i]);
}
VIR_FREE(qemuCaps->cpuDefinitions);
@@ -1907,7 +1907,7 @@ int virQEMUCapsGetMachineTypesCaps(virQEMUCapsPtr qemuCaps,
goto no_memory;
*nmachines = qemuCaps->nmachineTypes;
- for (i = 0 ; i < qemuCaps->nmachineTypes ; i++) {
+ for (i = 0; i < qemuCaps->nmachineTypes; i++) {
virCapsGuestMachinePtr mach;
if (VIR_ALLOC(mach) < 0)
goto no_memory;
@@ -1943,7 +1943,7 @@ const char *virQEMUCapsGetCanonicalMachine(virQEMUCapsPtr qemuCaps,
if (!name)
return NULL;
- for (i = 0 ; i < qemuCaps->nmachineTypes ; i++) {
+ for (i = 0; i < qemuCaps->nmachineTypes; i++) {
if (!qemuCaps->machineAliases[i])
continue;
if (STREQ(qemuCaps->machineAliases[i], name))
@@ -1965,7 +1965,7 @@ virQEMUCapsProbeQMPCommands(virQEMUCapsPtr qemuCaps,
if ((ncommands = qemuMonitorGetCommands(mon, &commands)) < 0)
return -1;
- for (i = 0 ; i < ncommands ; i++) {
+ for (i = 0; i < ncommands; i++) {
char *name = commands[i];
if (STREQ(name, "system_wakeup"))
virQEMUCapsSet(qemuCaps, QEMU_CAPS_WAKEUP);
@@ -2028,7 +2028,7 @@ virQEMUCapsProbeQMPEvents(virQEMUCapsPtr qemuCaps,
if ((nevents = qemuMonitorGetEvents(mon, &events)) < 0)
return -1;
- for (i = 0 ; i < nevents ; i++) {
+ for (i = 0; i < nevents; i++) {
char *name = events[i];
if (STREQ(name, "BALLOON_CHANGE"))
@@ -2059,7 +2059,7 @@ virQEMUCapsProbeQMPObjects(virQEMUCapsPtr qemuCaps,
nvalues, values);
virQEMUCapsFreeStringList(nvalues, values);
- for (i = 0 ; i < ARRAY_CARDINALITY(virQEMUCapsObjectProps); i++) {
+ for (i = 0; i < ARRAY_CARDINALITY(virQEMUCapsObjectProps); i++) {
const char *type = virQEMUCapsObjectProps[i].type;
if ((nvalues = qemuMonitorGetObjectProps(mon,
type,
@@ -2105,7 +2105,7 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps,
goto cleanup;
}
- for (i = 0 ; i < nmachines ; i++) {
+ for (i = 0; i < nmachines; i++) {
if (machines[i]->alias) {
if (!(qemuCaps->machineAliases[i] = strdup(machines[i]->alias))) {
virReportOOMError();
@@ -2127,7 +2127,7 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps,
ret = 0;
cleanup:
- for (i = 0 ; i < nmachines ; i++)
+ for (i = 0; i < nmachines; i++)
qemuMonitorMachineInfoFree(machines[i]);
VIR_FREE(machines);
return ret;
diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index ff9a075..dfe819e 100644
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -548,7 +548,7 @@ qemuSetupDevicesCgroup(virQEMUDriverPtr driver,
goto cleanup;
}
- for (i = 0; i < vm->def->ndisks ; i++) {
+ for (i = 0; i < vm->def->ndisks; i++) {
if (qemuSetupDiskCgroup(vm, vm->def->disks[i]) < 0)
goto cleanup;
}
@@ -584,7 +584,7 @@ qemuSetupDevicesCgroup(virQEMUDriverPtr driver,
}
}
- for (i = 0; deviceACL[i] != NULL ; i++) {
+ for (i = 0; deviceACL[i] != NULL; i++) {
if (access(deviceACL[i], F_OK) < 0) {
VIR_DEBUG("Ignoring non-existant device %s",
deviceACL[i]);
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 33a1910..77582e6 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -756,7 +756,7 @@ qemuAssignDeviceNetAlias(virDomainDefPtr def, virDomainNetDefPtr net,
int idx)
if (idx == -1) {
int i;
idx = 0;
- for (i = 0 ; i < def->nnets ; i++) {
+ for (i = 0; i < def->nnets; i++) {
int thisidx;
if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) {
@@ -788,7 +788,7 @@ qemuAssignDeviceHostdevAlias(virDomainDefPtr def,
virDomainHostdevDefPtr hostdev
if (idx == -1) {
int i;
idx = 0;
- for (i = 0 ; i < def->nhostdevs ; i++) {
+ for (i = 0; i < def->nhostdevs; i++) {
int thisidx;
if ((thisidx = qemuDomainDeviceAliasIndex(def->hostdevs[i]->info,
"hostdev")) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@@ -824,7 +824,7 @@ qemuAssignDeviceRedirdevAlias(virDomainDefPtr def,
virDomainRedirdevDefPtr redir
if (idx == -1) {
int i;
idx = 0;
- for (i = 0 ; i < def->nredirdevs ; i++) {
+ for (i = 0; i < def->nredirdevs; i++) {
int thisidx;
if ((thisidx = qemuDomainDeviceAliasIndex(&def->redirdevs[i]->info,
"redir")) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@@ -865,13 +865,13 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr
qemuCaps)
{
int i;
- for (i = 0; i < def->ndisks ; i++) {
+ for (i = 0; i < def->ndisks; i++) {
if (qemuAssignDeviceDiskAlias(def, def->disks[i], qemuCaps) < 0)
return -1;
}
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NET_NAME) ||
virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) {
- for (i = 0; i < def->nnets ; i++) {
+ for (i = 0; i < def->nnets; i++) {
/* type='hostdev' interfaces are also on the hostdevs list,
* and will have their alias assigned with other hostdevs.
*/
@@ -885,55 +885,55 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr
qemuCaps)
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE))
return 0;
- for (i = 0; i < def->nfss ; i++) {
+ for (i = 0; i < def->nfss; i++) {
if (virAsprintf(&def->fss[i]->info.alias, "fs%d", i) < 0)
goto no_memory;
}
- for (i = 0; i < def->nsounds ; i++) {
+ for (i = 0; i < def->nsounds; i++) {
if (virAsprintf(&def->sounds[i]->info.alias, "sound%d", i)
< 0)
goto no_memory;
}
- for (i = 0; i < def->nhostdevs ; i++) {
+ for (i = 0; i < def->nhostdevs; i++) {
if (qemuAssignDeviceHostdevAlias(def, def->hostdevs[i], i) < 0)
return -1;
}
- for (i = 0; i < def->nredirdevs ; i++) {
+ for (i = 0; i < def->nredirdevs; i++) {
if (qemuAssignDeviceRedirdevAlias(def, def->redirdevs[i], i) < 0)
return -1;
}
- for (i = 0; i < def->nvideos ; i++) {
+ for (i = 0; i < def->nvideos; i++) {
if (virAsprintf(&def->videos[i]->info.alias, "video%d", i)
< 0)
goto no_memory;
}
- for (i = 0; i < def->ncontrollers ; i++) {
+ for (i = 0; i < def->ncontrollers; i++) {
if (qemuAssignDeviceControllerAlias(def->controllers[i]) < 0)
return -1;
}
- for (i = 0; i < def->ninputs ; i++) {
+ for (i = 0; i < def->ninputs; i++) {
if (virAsprintf(&def->inputs[i]->info.alias, "input%d", i)
< 0)
goto no_memory;
}
- for (i = 0; i < def->nparallels ; i++) {
+ for (i = 0; i < def->nparallels; i++) {
if (virAsprintf(&def->parallels[i]->info.alias, "parallel%d",
i) < 0)
goto no_memory;
}
- for (i = 0; i < def->nserials ; i++) {
+ for (i = 0; i < def->nserials; i++) {
if (virAsprintf(&def->serials[i]->info.alias, "serial%d", i)
< 0)
goto no_memory;
}
- for (i = 0; i < def->nchannels ; i++) {
+ for (i = 0; i < def->nchannels; i++) {
if (virAsprintf(&def->channels[i]->info.alias, "channel%d",
i) < 0)
goto no_memory;
}
- for (i = 0; i < def->nconsoles ; i++) {
+ for (i = 0; i < def->nconsoles; i++) {
if (virAsprintf(&def->consoles[i]->info.alias, "console%d",
i) < 0)
goto no_memory;
}
- for (i = 0; i < def->nhubs ; i++) {
+ for (i = 0; i < def->nhubs; i++) {
if (virAsprintf(&def->hubs[i]->info.alias, "hub%d", i) <
0)
goto no_memory;
}
- for (i = 0; i < def->nsmartcards ; i++) {
+ for (i = 0; i < def->nsmartcards; i++) {
if (virAsprintf(&def->smartcards[i]->info.alias,
"smartcard%d", i) < 0)
goto no_memory;
}
@@ -1066,20 +1066,20 @@ qemuDomainPrimeS390VirtioDevices(virDomainDefPtr def,
*/
int i;
- for (i = 0; i < def->ndisks ; i++) {
+ for (i = 0; i < def->ndisks; i++) {
if (def->disks[i]->bus == VIR_DOMAIN_DISK_BUS_VIRTIO &&
def->disks[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE)
def->disks[i]->info.type = type;
}
- for (i = 0; i < def->nnets ; i++) {
+ for (i = 0; i < def->nnets; i++) {
if (STREQ(def->nets[i]->model,"virtio") &&
def->nets[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
def->nets[i]->info.type = type;
}
}
- for (i = 0; i < def->ncontrollers ; i++) {
+ for (i = 0; i < def->ncontrollers; i++) {
if ((def->controllers[i]->type ==
VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL ||
def->controllers[i]->type ==
@@ -1292,7 +1292,7 @@ int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def,
/* Default values match QEMU. See spapr_(llan|vscsi|vty).c */
- for (i = 0 ; i < def->nnets; i++) {
+ for (i = 0; i < def->nnets; i++) {
if (def->nets[i]->model &&
STREQ(def->nets[i]->model, "spapr-vlan"))
def->nets[i]->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO;
@@ -1301,7 +1301,7 @@ int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def,
goto cleanup;
}
- for (i = 0 ; i < def->ncontrollers; i++) {
+ for (i = 0; i < def->ncontrollers; i++) {
model = def->controllers[i]->model;
if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI) {
if (qemuSetScsiControllerModel(def, qemuCaps, &model) < 0)
@@ -1316,7 +1316,7 @@ int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def,
goto cleanup;
}
- for (i = 0 ; i < def->nserials; i++) {
+ for (i = 0; i < def->nserials; i++) {
if (def->serials[i]->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL
&&
(def->os.arch == VIR_ARCH_PPC64) &&
STREQ(def->os.machine, "pseries"))
@@ -1909,7 +1909,7 @@ qemuAssignDevicePCISlots(virDomainDefPtr def,
virDevicePCIAddressPtr addrptr;
/* Verify that first IDE and USB controllers (if any) is on the PIIX3, fn 1 */
- for (i = 0; i < def->ncontrollers ; i++) {
+ for (i = 0; i < def->ncontrollers; i++) {
/* First IDE controller lives on the PIIX3 at slot=1, function=1 */
if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE &&
def->controllers[i]->idx == 0) {
@@ -2027,7 +2027,7 @@ qemuAssignDevicePCISlots(virDomainDefPtr def,
}
}
- for (i = 0; i < def->nfss ; i++) {
+ for (i = 0; i < def->nfss; i++) {
if (def->fss[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE)
continue;
@@ -2038,7 +2038,7 @@ qemuAssignDevicePCISlots(virDomainDefPtr def,
}
/* Network interfaces */
- for (i = 0; i < def->nnets ; i++) {
+ for (i = 0; i < def->nnets; i++) {
/* type='hostdev' network devices might be USB, and are also
* in hostdevs list anyway, so handle them with other hostdevs
* instead of here.
@@ -2052,7 +2052,7 @@ qemuAssignDevicePCISlots(virDomainDefPtr def,
}
/* Sound cards */
- for (i = 0; i < def->nsounds ; i++) {
+ for (i = 0; i < def->nsounds; i++) {
if (def->sounds[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE)
continue;
/* Skip ISA sound card, and PCSPK */
@@ -2065,7 +2065,7 @@ qemuAssignDevicePCISlots(virDomainDefPtr def,
}
/* Device controllers (SCSI, USB, but not IDE, FDC or CCID) */
- for (i = 0; i < def->ncontrollers ; i++) {
+ for (i = 0; i < def->ncontrollers; i++) {
/* PCI controllers have been dealt with earlier */
if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI)
continue;
@@ -2095,7 +2095,7 @@ qemuAssignDevicePCISlots(virDomainDefPtr def,
if (IS_USB2_CONTROLLER(def->controllers[i])) {
virDevicePCIAddress addr = { 0, 0, 0, 0, false };
memset(&tmp_addr, 0, sizeof(tmp_addr));
- for (j = 0 ; j < i ; j++) {
+ for (j = 0; j < i; j++) {
if (IS_USB2_CONTROLLER(def->controllers[j]) &&
def->controllers[j]->idx == def->controllers[i]->idx) {
addr = def->controllers[j]->info.addr.pci;
@@ -2141,7 +2141,7 @@ qemuAssignDevicePCISlots(virDomainDefPtr def,
}
/* Disks (VirtIO only for now) */
- for (i = 0; i < def->ndisks ; i++) {
+ for (i = 0; i < def->ndisks; i++) {
/* Only VirtIO disks use PCI addrs */
if (def->disks[i]->bus != VIR_DOMAIN_DISK_BUS_VIRTIO)
continue;
@@ -2165,7 +2165,7 @@ qemuAssignDevicePCISlots(virDomainDefPtr def,
}
/* Host PCI devices */
- for (i = 0; i < def->nhostdevs ; i++) {
+ for (i = 0; i < def->nhostdevs; i++) {
if (def->hostdevs[i]->info->type !=
VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE)
continue;
if (def->hostdevs[i]->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS ||
@@ -2201,7 +2201,7 @@ qemuAssignDevicePCISlots(virDomainDefPtr def,
}
/* Further non-primary video cards which have to be qxl type */
- for (i = 1; i < def->nvideos ; i++) {
+ for (i = 1; i < def->nvideos; i++) {
if (def->videos[i]->type != VIR_DOMAIN_VIDEO_TYPE_QXL) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("non-primary video device must be type of
'qxl'"));
@@ -2212,19 +2212,19 @@ qemuAssignDevicePCISlots(virDomainDefPtr def,
if (qemuDomainPCIAddressSetNextAddr(addrs, &def->videos[i]->info) <
0)
goto error;
}
- for (i = 0; i < def->ninputs ; i++) {
+ for (i = 0; i < def->ninputs; i++) {
/* Nada - none are PCI based (yet) */
}
- for (i = 0; i < def->nparallels ; i++) {
+ for (i = 0; i < def->nparallels; i++) {
/* Nada - none are PCI based (yet) */
}
- for (i = 0; i < def->nserials ; i++) {
+ for (i = 0; i < def->nserials; i++) {
/* Nada - none are PCI based (yet) */
}
- for (i = 0; i < def->nchannels ; i++) {
+ for (i = 0; i < def->nchannels; i++) {
/* Nada - none are PCI based (yet) */
}
- for (i = 0; i < def->nhubs ; i++) {
+ for (i = 0; i < def->nhubs; i++) {
/* Nada - none are PCI based (yet) */
}
@@ -6255,7 +6255,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg,
break;
}
- for (i = 0 ; i < VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST ; i++) {
+ for (i = 0; i < VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST; i++) {
switch (graphics->data.spice.channels[i]) {
case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE:
if (tlsPort <= 0) {
@@ -6910,7 +6910,7 @@ qemuBuildCommandLine(virConnectPtr conn,
if (!emitBootindex) {
char boot[VIR_DOMAIN_BOOT_LAST+1];
- for (i = 0 ; i < def->os.nBootDevs ; i++) {
+ for (i = 0; i < def->os.nBootDevs; i++) {
switch (def->os.bootDevs[i]) {
case VIR_DOMAIN_BOOT_CDROM:
boot[i] = 'd';
@@ -7003,7 +7003,7 @@ qemuBuildCommandLine(virConnectPtr conn,
virCommandAddArgList(cmd, "-bootloader", def->os.bootloader, NULL);
}
- for (i = 0 ; i < def->ndisks ; i++) {
+ for (i = 0; i < def->ndisks; i++) {
virDomainDiskDefPtr disk = def->disks[i];
if (disk->driverName != NULL &&
@@ -7083,7 +7083,7 @@ qemuBuildCommandLine(virConnectPtr conn,
if (usbcontroller == 0)
virCommandAddArg(cmd, "-usb");
- for (i = 0 ; i < def->nhubs ; i++) {
+ for (i = 0; i < def->nhubs; i++) {
virDomainHubDefPtr hub = def->hubs[i];
char *optstr;
@@ -7101,7 +7101,7 @@ qemuBuildCommandLine(virConnectPtr conn,
if ((virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_BOOT) || emitBootindex)) {
/* bootDevs will get translated into either bootindex=N or boot=on
* depending on what qemu supports */
- for (i = 0 ; i < def->os.nBootDevs ; i++) {
+ for (i = 0; i < def->os.nBootDevs; i++) {
switch (def->os.bootDevs[i]) {
case VIR_DOMAIN_BOOT_CDROM:
bootCD = i + 1;
@@ -7116,7 +7116,7 @@ qemuBuildCommandLine(virConnectPtr conn,
}
}
- for (i = 0 ; i < def->ndisks ; i++) {
+ for (i = 0; i < def->ndisks; i++) {
char *optstr;
int bootindex = 0;
virDomainDiskDefPtr disk = def->disks[i];
@@ -7212,7 +7212,7 @@ qemuBuildCommandLine(virConnectPtr conn,
}
}
} else {
- for (i = 0 ; i < def->ndisks ; i++) {
+ for (i = 0; i < def->ndisks; i++) {
char dev[NAME_MAX];
char *file;
const char *fmt;
@@ -7299,7 +7299,7 @@ qemuBuildCommandLine(virConnectPtr conn,
}
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_FSDEV)) {
- for (i = 0 ; i < def->nfss ; i++) {
+ for (i = 0; i < def->nfss; i++) {
char *optstr;
virDomainFSDefPtr fs = def->fss[i];
@@ -7334,7 +7334,7 @@ qemuBuildCommandLine(virConnectPtr conn,
/* convert <boot dev='network'/> to bootindex since we
didn't emit
* -boot n
*/
- for (i = 0 ; i < def->os.nBootDevs ; i++) {
+ for (i = 0; i < def->os.nBootDevs; i++) {
if (def->os.bootDevs[i] == VIR_DOMAIN_BOOT_NET) {
bootNet = i + 1;
break;
@@ -7342,7 +7342,7 @@ qemuBuildCommandLine(virConnectPtr conn,
}
}
- for (i = 0 ; i < def->nnets ; i++) {
+ for (i = 0; i < def->nnets; i++) {
virDomainNetDefPtr net = def->nets[i];
char *nic, *host;
char tapfd_name[50] = "";
@@ -7567,7 +7567,7 @@ qemuBuildCommandLine(virConnectPtr conn,
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE))
virCommandAddArgList(cmd, "-serial", "none", NULL);
} else {
- for (i = 0 ; i < def->nserials ; i++) {
+ for (i = 0; i < def->nserials; i++) {
virDomainChrDefPtr serial = def->serials[i];
char *devstr;
@@ -7604,7 +7604,7 @@ qemuBuildCommandLine(virConnectPtr conn,
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE))
virCommandAddArgList(cmd, "-parallel", "none", NULL);
} else {
- for (i = 0 ; i < def->nparallels ; i++) {
+ for (i = 0; i < def->nparallels; i++) {
virDomainChrDefPtr parallel = def->parallels[i];
char *devstr;
@@ -7633,7 +7633,7 @@ qemuBuildCommandLine(virConnectPtr conn,
}
}
- for (i = 0 ; i < def->nchannels ; i++) {
+ for (i = 0; i < def->nchannels; i++) {
virDomainChrDefPtr channel = def->channels[i];
char *devstr;
char *addr;
@@ -7703,7 +7703,7 @@ qemuBuildCommandLine(virConnectPtr conn,
}
/* Explicit console devices */
- for (i = 0 ; i < def->nconsoles ; i++) {
+ for (i = 0; i < def->nconsoles; i++) {
virDomainChrDefPtr console = def->consoles[i];
char *devstr;
@@ -7786,7 +7786,7 @@ qemuBuildCommandLine(virConnectPtr conn,
VIR_FREE(optstr);
}
- for (i = 0 ; i < def->ninputs ; i++) {
+ for (i = 0; i < def->ninputs; i++) {
virDomainInputDefPtr input = def->inputs[i];
if (input->bus == VIR_DOMAIN_INPUT_BUS_USB) {
@@ -7805,7 +7805,7 @@ qemuBuildCommandLine(virConnectPtr conn,
}
}
- for (i = 0 ; i < def->ngraphics ; ++i) {
+ for (i = 0; i < def->ngraphics; ++i) {
switch (def->graphics[i]->type) {
case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
++sdl;
@@ -7830,7 +7830,7 @@ qemuBuildCommandLine(virConnectPtr conn,
goto error;
}
- for (i = 0 ; i < def->ngraphics ; ++i) {
+ for (i = 0; i < def->ngraphics; ++i) {
if (qemuBuildGraphicsCommandLine(cfg, cmd, def, qemuCaps,
def->graphics[i]) < 0)
goto error;
@@ -7847,7 +7847,7 @@ qemuBuildCommandLine(virConnectPtr conn,
(primaryVideoType == VIR_DOMAIN_VIDEO_TYPE_QXL &&
virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_QXL_VGA)))
) {
- for (i = 0 ; i < def->nvideos ; i++) {
+ for (i = 0; i < def->nvideos; i++) {
char *str;
virCommandAddArg(cmd, "-device");
if (!(str = qemuBuildDeviceVideoStr(def->videos[i], qemuCaps, !i)))
@@ -7913,7 +7913,7 @@ qemuBuildCommandLine(virConnectPtr conn,
if (def->nvideos > 1) {
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) {
- for (i = 1 ; i < def->nvideos ; i++) {
+ for (i = 1; i < def->nvideos; i++) {
char *str;
if (def->videos[i]->type != VIR_DOMAIN_VIDEO_TYPE_QXL) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@@ -7977,7 +7977,7 @@ qemuBuildCommandLine(virConnectPtr conn,
/* Add sound hardware */
if (def->nsounds) {
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) {
- for (i = 0 ; i < def->nsounds ; i++) {
+ for (i = 0; i < def->nsounds; i++) {
virDomainSoundDefPtr sound = def->sounds[i];
char *str = NULL;
@@ -7997,7 +7997,7 @@ qemuBuildCommandLine(virConnectPtr conn,
char *codecstr = NULL;
int ii;
- for (ii = 0 ; ii < sound->ncodecs ; ii++) {
+ for (ii = 0; ii < sound->ncodecs; ii++) {
virCommandAddArg(cmd, "-device");
if (!(codecstr = qemuBuildSoundCodecStr(sound,
sound->codecs[ii], qemuCaps))) {
goto error;
@@ -8030,7 +8030,7 @@ qemuBuildCommandLine(virConnectPtr conn,
if (VIR_ALLOC_N(modstr, size+1) < 0)
goto no_memory;
- for (i = 0 ; i < def->nsounds && size > 0 ; i++) {
+ for (i = 0; i < def->nsounds && size > 0; i++) {
virDomainSoundDefPtr sound = def->sounds[i];
const char *model = virDomainSoundModelTypeToString(sound->model);
if (!model) {
@@ -8097,7 +8097,7 @@ qemuBuildCommandLine(virConnectPtr conn,
}
/* Add redirected devices */
- for (i = 0 ; i < def->nredirdevs ; i++) {
+ for (i = 0; i < def->nredirdevs; i++) {
virDomainRedirdevDefPtr redirdev = def->redirdevs[i];
char *devstr;
@@ -8123,7 +8123,7 @@ qemuBuildCommandLine(virConnectPtr conn,
/* Add host passthrough hardware */
- for (i = 0 ; i < def->nhostdevs ; i++) {
+ for (i = 0; i < def->nhostdevs; i++) {
virDomainHostdevDefPtr hostdev = def->hostdevs[i];
char *devstr;
@@ -8578,7 +8578,7 @@ static int qemuStringToArgvEnv(const char *args,
/* Iterate over list of args, finding first arg not containing
* the '=' character (eg, skip over env vars FOO=bar) */
- for (envend = 0 ; ((envend < argcount) &&
+ for (envend = 0; ((envend < argcount) &&
(strchr(arglist[envend], '=') != NULL));
envend++)
; /* nada */
@@ -8587,7 +8587,7 @@ static int qemuStringToArgvEnv(const char *args,
if (envend > 0) {
if (VIR_REALLOC_N(progenv, envend+1) < 0)
goto no_memory;
- for (i = 0 ; i < envend ; i++) {
+ for (i = 0; i < envend; i++) {
progenv[i] = arglist[i];
arglist[i] = NULL;
}
@@ -8597,7 +8597,7 @@ static int qemuStringToArgvEnv(const char *args,
/* Copy the list of argv */
if (VIR_REALLOC_N(progargv, argcount-envend + 1) < 0)
goto no_memory;
- for (i = envend ; i < argcount ; i++)
+ for (i = envend; i < argcount; i++)
progargv[i-envend] = arglist[i];
progargv[i-envend] = NULL;
@@ -8609,10 +8609,10 @@ static int qemuStringToArgvEnv(const char *args,
return 0;
no_memory:
- for (i = 0 ; progenv && progenv[i] ; i++)
+ for (i = 0; progenv && progenv[i]; i++)
VIR_FREE(progenv[i]);
VIR_FREE(progenv);
- for (i = 0 ; i < argcount ; i++)
+ for (i = 0; i < argcount; i++)
VIR_FREE(arglist[i]);
VIR_FREE(arglist);
virReportOOMError();
@@ -8629,7 +8629,7 @@ static const char *qemuFindEnv(const char **progenv,
int i;
int len = strlen(name);
- for (i = 0 ; progenv && progenv[i] ; i++) {
+ for (i = 0; progenv && progenv[i]; i++) {
if (STREQLEN(progenv[i], name, len) &&
progenv[i][len] == '=')
return progenv[i] + len + 1;
@@ -8735,7 +8735,7 @@ qemuParseKeywords(const char *str,
no_memory:
virReportOOMError();
error:
- for (i = 0 ; i < keywordCount ; i++) {
+ for (i = 0; i < keywordCount; i++) {
VIR_FREE(keywords[i]);
VIR_FREE(values[i]);
}
@@ -8781,7 +8781,7 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt,
def->device = VIR_DOMAIN_DISK_DEVICE_DISK;
def->type = VIR_DOMAIN_DISK_TYPE_FILE;
- for (i = 0 ; i < nkeywords ; i++) {
+ for (i = 0; i < nkeywords; i++) {
if (STREQ(keywords[i], "file")) {
if (values[i] && STRNEQ(values[i], "")) {
def->src = values[i];
@@ -9061,7 +9061,7 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt,
}
cleanup:
- for (i = 0 ; i < nkeywords ; i++) {
+ for (i = 0; i < nkeywords; i++) {
VIR_FREE(keywords[i]);
VIR_FREE(values[i]);
}
@@ -9084,7 +9084,7 @@ qemuFindNICForVLAN(int nnics,
int wantvlan)
{
int i;
- for (i = 0 ; i < nnics ; i++) {
+ for (i = 0; i < nnics; i++) {
int gotvlan;
const char *tmp = strstr(nics[i], "vlan=");
char *end;
@@ -9160,7 +9160,7 @@ qemuParseCommandLineNet(virDomainXMLOptionPtr xmlopt,
else
def->type = VIR_DOMAIN_NET_TYPE_ETHERNET;
- for (i = 0 ; i < nkeywords ; i++) {
+ for (i = 0; i < nkeywords; i++) {
if (STREQ(keywords[i], "vlan")) {
if (virStrToLong_i(values[i], NULL, 10, &wantvlan) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
@@ -9200,7 +9200,7 @@ qemuParseCommandLineNet(virDomainXMLOptionPtr xmlopt,
goto cleanup;
}
- for (i = 0 ; i < nkeywords ; i++) {
+ for (i = 0; i < nkeywords; i++) {
VIR_FREE(keywords[i]);
VIR_FREE(values[i]);
}
@@ -9219,7 +9219,7 @@ qemuParseCommandLineNet(virDomainXMLOptionPtr xmlopt,
nkeywords = 0;
}
- for (i = 0 ; i < nkeywords ; i++) {
+ for (i = 0; i < nkeywords; i++) {
if (STREQ(keywords[i], "macaddr")) {
genmac = 0;
if (virMacAddrParse(values[i], &def->mac) < 0) {
@@ -9255,7 +9255,7 @@ qemuParseCommandLineNet(virDomainXMLOptionPtr xmlopt,
virDomainNetGenerateMAC(xmlopt, &def->mac);
cleanup:
- for (i = 0 ; i < nkeywords ; i++) {
+ for (i = 0; i < nkeywords; i++) {
VIR_FREE(keywords[i]);
VIR_FREE(values[i]);
}
@@ -9794,7 +9794,7 @@ static void
qemuParseCommandLineBootDevs(virDomainDefPtr def, const char *str) {
int n, b = 0;
- for (n = 0 ; str[n] && b < VIR_DOMAIN_BOOT_LAST ; n++) {
+ for (n = 0; str[n] && b < VIR_DOMAIN_BOOT_LAST; n++) {
if (str[n] == 'a')
def->os.bootDevs[b++] = VIR_DOMAIN_BOOT_FLOPPY;
else if (str[n] == 'c')
@@ -9916,7 +9916,7 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps,
/* One initial loop to get list of NICs, so we
* can correlate them later */
- for (i = 1 ; progargv[i] ; i++) {
+ for (i = 1; progargv[i]; i++) {
const char *arg = progargv[i];
/* Make sure we have a single - for all options to
simplify next logic */
@@ -9934,7 +9934,7 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps,
}
/* Now the real processing loop */
- for (i = 1 ; progargv[i] ; i++) {
+ for (i = 1; progargv[i]; i++) {
const char *arg = progargv[i];
/* Make sure we have a single - for all options to
simplify next logic */
@@ -10603,7 +10603,7 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps,
if (def->ndisks > 0 && ceph_args) {
char *hosts, *port, *saveptr = NULL, *token;
virDomainDiskDefPtr first_rbd_disk = NULL;
- for (i = 0 ; i < def->ndisks ; i++) {
+ for (i = 0; i < def->ndisks; i++) {
if (def->disks[i]->type == VIR_DOMAIN_DISK_TYPE_NETWORK &&
def->disks[i]->protocol == VIR_DOMAIN_DISK_PROTOCOL_RBD) {
first_rbd_disk = def->disks[i];
@@ -10785,11 +10785,11 @@ virDomainDefPtr qemuParseCommandLineString(virCapsPtr qemuCaps,
pidfile, monConfig, monJSON);
cleanup:
- for (i = 0 ; progargv && progargv[i] ; i++)
+ for (i = 0; progargv && progargv[i]; i++)
VIR_FREE(progargv[i]);
VIR_FREE(progargv);
- for (i = 0 ; progenv && progenv[i] ; i++)
+ for (i = 0; progenv && progenv[i]; i++)
VIR_FREE(progenv[i]);
VIR_FREE(progenv);
@@ -10847,7 +10847,7 @@ static int qemuParseProcFileStrings(int pid_value,
cleanup:
if (ret < 0) {
- for (i = 0 ; str && str[i] ; i++)
+ for (i = 0; str && str[i]; i++)
VIR_FREE(str[i]);
VIR_FREE(str);
}
@@ -10897,10 +10897,10 @@ virDomainDefPtr qemuParseCommandLinePid(virCapsPtr qemuCaps,
cleanup:
VIR_FREE(exepath);
- for (i = 0 ; progargv && progargv[i] ; i++)
+ for (i = 0; progargv && progargv[i]; i++)
VIR_FREE(progargv[i]);
VIR_FREE(progargv);
- for (i = 0 ; progenv && progenv[i] ; i++)
+ for (i = 0; progenv && progenv[i]; i++)
VIR_FREE(progenv[i]);
VIR_FREE(progenv);
return def;
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 41fe0b9..06ae29b 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -922,13 +922,13 @@ virQEMUCloseCallbacksRun(virQEMUCloseCallbacksPtr closeCallbacks,
if (!list)
return;
- for (i = 0 ; i < list->nentries ; i++) {
+ for (i = 0; i < list->nentries; i++) {
virHashRemoveEntry(closeCallbacks->list,
list->entries[i].uuid);
}
virObjectUnlock(closeCallbacks);
- for (i = 0 ; i < list->nentries ; i++) {
+ for (i = 0; i < list->nentries; i++) {
virDomainObjPtr vm;
if (!(vm = virDomainObjListFindByUUID(driver->domains,
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index d7c2975..11c1c2c 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -291,7 +291,7 @@ qemuDomainObjPrivateXMLFormat(virBufferPtr buf, void *data)
if (priv->nvcpupids) {
int i;
virBufferAddLit(buf, " <vcpus>\n");
- for (i = 0 ; i < priv->nvcpupids ; i++) {
+ for (i = 0; i < priv->nvcpupids; i++) {
virBufferAsprintf(buf, " <vcpu pid='%d'/>\n",
priv->vcpupids[i]);
}
virBufferAddLit(buf, " </vcpus>\n");
@@ -300,7 +300,7 @@ qemuDomainObjPrivateXMLFormat(virBufferPtr buf, void *data)
if (priv->qemuCaps) {
int i;
virBufferAddLit(buf, " <qemuCaps>\n");
- for (i = 0 ; i < QEMU_CAPS_LAST ; i++) {
+ for (i = 0; i < QEMU_CAPS_LAST; i++) {
if (virQEMUCapsGet(priv->qemuCaps, i)) {
virBufferAsprintf(buf, " <flag
name='%s'/>\n",
virQEMUCapsTypeToString(i));
@@ -392,7 +392,7 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, void *data)
goto error;
}
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
char *pidstr = virXMLPropString(nodes[i], "pid");
if (!pidstr)
goto error;
@@ -415,7 +415,7 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, void *data)
if (!(qemuCaps = virQEMUCapsNew()))
goto error;
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
char *str = virXMLPropString(nodes[i], "name");
if (str) {
int flag = virQEMUCapsTypeFromString(str);
@@ -1502,10 +1502,10 @@ void qemuDomainObjCheckTaint(virQEMUDriverPtr driver,
if (obj->def->cpu && obj->def->cpu->mode ==
VIR_CPU_MODE_HOST_PASSTHROUGH)
qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_HOST_CPU, logFD);
- for (i = 0 ; i < obj->def->ndisks ; i++)
+ for (i = 0; i < obj->def->ndisks; i++)
qemuDomainObjCheckDiskTaint(driver, obj, obj->def->disks[i], logFD);
- for (i = 0 ; i < obj->def->nnets ; i++)
+ for (i = 0; i < obj->def->nnets; i++)
qemuDomainObjCheckNetTaint(driver, obj, obj->def->nets[i], logFD);
virObjectUnref(cfg);
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 0665131..d64c5a0 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -911,7 +911,7 @@ qemuStateStop(void) {
/* First we pause all VMs to make them stop dirtying
pages, etc. We remember if any VMs were paused so
we can restore that on resume. */
- for (i = 0 ; i < numDomains ; i++) {
+ for (i = 0; i < numDomains; i++) {
flags[i] = VIR_DOMAIN_SAVE_RUNNING;
if (virDomainGetState(domains[i], &state, NULL, 0) == 0) {
if (state == VIR_DOMAIN_PAUSED) {
@@ -923,12 +923,12 @@ qemuStateStop(void) {
ret = 0;
/* Then we save the VMs to disk */
- for (i = 0 ; i < numDomains ; i++)
+ for (i = 0; i < numDomains; i++)
if (virDomainManagedSave(domains[i], flags[i]) < 0)
ret = -1;
cleanup:
- for (i = 0 ; i < numDomains ; i++)
+ for (i = 0; i < numDomains; i++)
virDomainFree(domains[i]);
VIR_FREE(domains);
VIR_FREE(flags);
@@ -3535,7 +3535,7 @@ static int qemuDomainHotplugVcpus(virQEMUDriverPtr driver,
* in reverse order to onlining, so any partial fail leaves us in a
* reasonably sensible state */
if (nvcpus > vcpus) {
- for (i = vcpus ; i < nvcpus ; i++) {
+ for (i = vcpus; i < nvcpus; i++) {
/* Online new CPU */
rc = qemuMonitorSetCPU(priv->mon, i, 1);
if (rc == 0)
@@ -3546,7 +3546,7 @@ static int qemuDomainHotplugVcpus(virQEMUDriverPtr driver,
vcpus++;
}
} else {
- for (i = vcpus - 1 ; i >= nvcpus ; i--) {
+ for (i = vcpus - 1; i >= nvcpus; i--) {
/* Offline old CPU */
rc = qemuMonitorSetCPU(priv->mon, i, 0);
if (rc == 0)
@@ -4345,7 +4345,7 @@ qemuDomainGetVcpus(virDomainPtr dom,
if (maxinfo >= 1) {
if (info != NULL) {
memset(info, 0, sizeof(*info) * maxinfo);
- for (i = 0 ; i < maxinfo ; i++) {
+ for (i = 0; i < maxinfo; i++) {
info[i].number = i;
info[i].state = VIR_VCPU_RUNNING;
@@ -4365,7 +4365,7 @@ qemuDomainGetVcpus(virDomainPtr dom,
if (cpumaps != NULL) {
memset(cpumaps, 0, maplen * maxinfo);
if (priv->vcpupids != NULL) {
- for (v = 0 ; v < maxinfo ; v++) {
+ for (v = 0; v < maxinfo; v++) {
unsigned char *cpumap = VIR_GET_CPUMAP(cpumaps, maplen, v);
virBitmapPtr map = NULL;
unsigned char *tmpmap = NULL;
@@ -5230,7 +5230,7 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn,
* directly. We convert those configs into generic 'ethernet'
* config and assume the user has suitable 'ifup-qemu' scripts
*/
- for (i = 0 ; i < def->nnets ; i++) {
+ for (i = 0; i < def->nnets; i++) {
virDomainNetDefPtr net = def->nets[i];
int bootIndex = net->info.bootIndex;
char *model = net->model;
@@ -5309,7 +5309,7 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn,
goto cleanup;
/* do fake auto-alloc of graphics ports, if such config is used */
- for (i = 0 ; i < def->ngraphics; ++i) {
+ for (i = 0; i < def->ngraphics; ++i) {
virDomainGraphicsDefPtr graphics = def->graphics[i];
if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC &&
!graphics->data.vnc.socket && graphics->data.vnc.autoport) {
@@ -5322,7 +5322,7 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn,
if (graphics->data.spice.autoport) {
/* check if tlsPort or port need allocation */
- for (j = 0 ; j < VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST ; j++) {
+ for (j = 0; j < VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST; j++) {
switch (graphics->data.spice.channels[j]) {
case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE:
needTLSPort = true;
@@ -8766,7 +8766,7 @@ qemuDomainInterfaceStats(virDomainPtr dom,
}
/* Check the path is one of the domain's network interfaces. */
- for (i = 0 ; i < vm->def->nnets ; i++) {
+ for (i = 0; i < vm->def->nnets; i++) {
if (vm->def->nets[i]->ifname &&
STREQ(vm->def->nets[i]->ifname, path)) {
ret = 0;
@@ -13019,16 +13019,16 @@ qemuDomainOpenConsole(virDomainPtr dom,
priv = vm->privateData;
if (dev_name) {
- for (i = 0 ; !chr && i < vm->def->nconsoles ; i++) {
+ for (i = 0; !chr && i < vm->def->nconsoles; i++) {
if (vm->def->consoles[i]->info.alias &&
STREQ(dev_name, vm->def->consoles[i]->info.alias))
chr = vm->def->consoles[i];
}
- for (i = 0 ; !chr && i < vm->def->nserials ; i++) {
+ for (i = 0; !chr && i < vm->def->nserials; i++) {
if (STREQ(dev_name, vm->def->serials[i]->info.alias))
chr = vm->def->serials[i];
}
- for (i = 0 ; !chr && i < vm->def->nparallels ; i++) {
+ for (i = 0; !chr && i < vm->def->nparallels; i++) {
if (STREQ(dev_name, vm->def->parallels[i]->info.alias))
chr = vm->def->parallels[i];
}
@@ -13097,7 +13097,7 @@ qemuDomainOpenChannel(virDomainPtr dom,
priv = vm->privateData;
if (name) {
- for (i = 0 ; !chr && i < vm->def->nchannels ; i++) {
+ for (i = 0; !chr && i < vm->def->nchannels; i++) {
if (STREQ(name, vm->def->channels[i]->info.alias))
chr = vm->def->channels[i];
diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c
index 67cb491..48750c3 100644
--- a/src/qemu/qemu_hostdev.c
+++ b/src/qemu/qemu_hostdev.c
@@ -43,7 +43,7 @@ qemuGetPciHostDeviceList(virDomainHostdevDefPtr *hostdevs, int
nhostdevs)
if (!(list = virPCIDeviceListNew()))
return NULL;
- for (i = 0 ; i < nhostdevs ; i++) {
+ for (i = 0; i < nhostdevs; i++) {
virDomainHostdevDefPtr hostdev = hostdevs[i];
virPCIDevicePtr dev;
@@ -93,7 +93,7 @@ qemuGetActivePciHostDeviceList(virQEMUDriverPtr driver,
if (!(list = virPCIDeviceListNew()))
return NULL;
- for (i = 0 ; i < nhostdevs ; i++) {
+ for (i = 0; i < nhostdevs; i++) {
virDomainHostdevDefPtr hostdev = hostdevs[i];
virPCIDevicePtr dev;
virPCIDevicePtr activeDev;
@@ -822,7 +822,7 @@ qemuPrepareHostUSBDevices(virQEMUDriverPtr driver,
/* Loop 1: build temporary list
*/
- for (i = 0 ; i < nhostdevs ; i++) {
+ for (i = 0; i < nhostdevs; i++) {
virDomainHostdevDefPtr hostdev = hostdevs[i];
bool required = true;
virUSBDevicePtr usb;
@@ -904,7 +904,7 @@ qemuPrepareHostdevSCSIDevices(virQEMUDriverPtr driver,
goto cleanup;
/* Loop 2: build temporary list */
- for (i = 0 ; i < nhostdevs ; i++) {
+ for (i = 0; i < nhostdevs; i++) {
virDomainHostdevDefPtr hostdev = hostdevs[i];
virSCSIDevicePtr scsi;
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 77d9f4f..b68c7e7 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -230,7 +230,7 @@ int qemuDomainAttachVirtioDiskDevice(virConnectPtr conn,
disk->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390;
}
- for (i = 0 ; i < vm->def->ndisks ; i++) {
+ for (i = 0; i < vm->def->ndisks; i++) {
if (STREQ(vm->def->disks[i]->dst, disk->dst)) {
virReportError(VIR_ERR_OPERATION_FAILED,
_("target %s already exists"), disk->dst);
@@ -421,7 +421,7 @@ qemuDomainFindOrCreateSCSIDiskController(virQEMUDriverPtr driver,
int i;
virDomainControllerDefPtr cont;
- for (i = 0 ; i < vm->def->ncontrollers ; i++) {
+ for (i = 0; i < vm->def->ncontrollers; i++) {
cont = vm->def->controllers[i];
if (cont->type != VIR_DOMAIN_CONTROLLER_TYPE_SCSI)
@@ -473,7 +473,7 @@ int qemuDomainAttachSCSIDisk(virConnectPtr conn,
int ret = -1;
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
- for (i = 0 ; i < vm->def->ndisks ; i++) {
+ for (i = 0; i < vm->def->ndisks; i++) {
if (STREQ(vm->def->disks[i]->dst, disk->dst)) {
virReportError(VIR_ERR_OPERATION_FAILED,
_("target %s already exists"), disk->dst);
@@ -510,7 +510,7 @@ int qemuDomainAttachSCSIDisk(virConnectPtr conn,
if (!(drivestr = qemuBuildDriveStr(conn, disk, false, priv->qemuCaps)))
goto error;
- for (i = 0 ; i <= disk->info.addr.drive.controller ; i++) {
+ for (i = 0; i <= disk->info.addr.drive.controller; i++) {
cont = qemuDomainFindOrCreateSCSIDiskController(driver, vm, i);
if (!cont)
goto error;
@@ -596,7 +596,7 @@ int qemuDomainAttachUsbMassstorageDevice(virConnectPtr conn,
char *devstr = NULL;
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
- for (i = 0 ; i < vm->def->ndisks ; i++) {
+ for (i = 0; i < vm->def->ndisks; i++) {
if (STREQ(vm->def->disks[i]->dst, disk->dst)) {
virReportError(VIR_ERR_OPERATION_FAILED,
_("target %s already exists"), disk->dst);
@@ -1892,7 +1892,7 @@ static virDomainGraphicsDefPtr
qemuDomainFindGraphics(virDomainObjPtr vm,
{
int i;
- for (i = 0 ; i < vm->def->ngraphics ; i++) {
+ for (i = 0; i < vm->def->ngraphics; i++) {
if (vm->def->graphics[i]->type == dev->type)
return vm->def->graphics[i];
}
@@ -2056,7 +2056,7 @@ static inline int qemuFindDisk(virDomainDefPtr def, const char
*dst)
{
int i;
- for (i = 0 ; i < def->ndisks ; i++) {
+ for (i = 0; i < def->ndisks; i++) {
if (STREQ(def->disks[i]->dst, dst)) {
return i;
}
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index e10127d..68ce478 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -610,7 +610,7 @@ qemuMigrationCookieXMLFormat(virQEMUDriverPtr driver,
virBufferEscapeString(buf, " <hostname>%s</hostname>\n",
mig->localHostname);
virBufferAsprintf(buf, " <hostuuid>%s</hostuuid>\n",
hostuuidstr);
- for (i = 0 ; i < QEMU_MIGRATION_COOKIE_FLAG_LAST ; i++) {
+ for (i = 0; i < QEMU_MIGRATION_COOKIE_FLAG_LAST; i++) {
if (mig->flagsMandatory & (1 << i))
virBufferAsprintf(buf, " <feature name='%s'/>\n",
qemuMigrationCookieFlagTypeToString(i));
@@ -866,7 +866,7 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig,
if ((n = virXPathNodeSet("./feature", ctxt, &nodes)) < 0)
goto error;
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
int val;
char *str = virXMLPropString(nodes[i], "name");
if (!str) {
@@ -1467,7 +1467,7 @@ qemuMigrationIsSafe(virDomainDefPtr def)
{
int i;
- for (i = 0 ; i < def->ndisks ; i++) {
+ for (i = 0; i < def->ndisks; i++) {
virDomainDiskDefPtr disk = def->disks[i];
/* Our code elsewhere guarantees shared disks are either readonly (in
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index f6d8ef4..3897e63 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -225,7 +225,7 @@ static char * qemuMonitorEscapeNonPrintable(const char *text)
{
int i;
virBuffer buf = VIR_BUFFER_INITIALIZER;
- for (i = 0 ; text[i] != '\0' ; i++) {
+ for (i = 0; text[i] != '\0'; i++) {
if (c_isprint(text[i]) ||
text[i] == '\n' ||
(text[i] == '\r' && text[i+1] == '\n'))
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index d95198b..1719e0e 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -515,7 +515,7 @@ static void
qemuFreeKeywords(int nkeywords, char **keywords, char **values)
{
int i;
- for (i = 0 ; i < nkeywords ; i++) {
+ for (i = 0; i < nkeywords; i++) {
VIR_FREE(keywords[i]);
VIR_FREE(values[i]);
}
@@ -540,7 +540,7 @@ qemuMonitorJSONKeywordStringToJSON(const char *str, const char
*firstkeyword)
if (nkeywords < 0)
goto error;
- for (i = 0 ; i < nkeywords ; i++) {
+ for (i = 0; i < nkeywords; i++) {
if (values[i] == NULL) {
if (i != 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
@@ -1208,7 +1208,7 @@ qemuMonitorJSONExtractCPUInfo(virJSONValuePtr reply,
goto cleanup;
}
- for (i = 0 ; i < ncpus ; i++) {
+ for (i = 0; i < ncpus; i++) {
virJSONValuePtr entry = virJSONValueArrayGet(data, i);
int thread;
if (!entry) {
@@ -1643,7 +1643,7 @@ int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon,
goto cleanup;
}
- for (i = 0 ; i < virJSONValueArraySize(devices) ; i++) {
+ for (i = 0; i < virJSONValueArraySize(devices); i++) {
virJSONValuePtr dev = virJSONValueArrayGet(devices, i);
virJSONValuePtr stats;
const char *thisdev;
@@ -1797,7 +1797,7 @@ int qemuMonitorJSONGetBlockStatsParamsNumber(qemuMonitorPtr mon,
goto cleanup;
}
- for (i = 0 ; i < stats->data.object.npairs; i++) {
+ for (i = 0; i < stats->data.object.npairs; i++) {
const char *key = stats->data.object.pairs[i].key;
if (STREQ(key, "rd_bytes") ||
@@ -1857,7 +1857,7 @@ int qemuMonitorJSONGetBlockExtent(qemuMonitorPtr mon,
goto cleanup;
}
- for (i = 0 ; i < virJSONValueArraySize(devices) ; i++) {
+ for (i = 0; i < virJSONValueArraySize(devices); i++) {
virJSONValuePtr dev = virJSONValueArrayGet(devices, i);
virJSONValuePtr stats;
virJSONValuePtr parent;
@@ -2923,7 +2923,7 @@ static int qemuMonitorJSONExtractPtyPaths(virJSONValuePtr reply,
goto cleanup;
}
- for (i = 0 ; i < virJSONValueArraySize(data) ; i++) {
+ for (i = 0; i < virJSONValueArraySize(data); i++) {
virJSONValuePtr entry = virJSONValueArrayGet(data, i);
const char *type;
const char *id;
@@ -3984,7 +3984,7 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon,
goto cleanup;
}
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virJSONValuePtr child = virJSONValueArrayGet(data, i);
const char *tmp;
qemuMonitorMachineInfoPtr info;
@@ -4032,7 +4032,7 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon,
cleanup:
if (ret < 0 && infolist) {
- for (i = 0 ; i < n ; i++)
+ for (i = 0; i < n; i++)
qemuMonitorMachineInfoFree(infolist[i]);
VIR_FREE(infolist);
}
@@ -4098,7 +4098,7 @@ int qemuMonitorJSONGetCPUDefinitions(qemuMonitorPtr mon,
goto cleanup;
}
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virJSONValuePtr child = virJSONValueArrayGet(data, i);
const char *tmp;
@@ -4170,7 +4170,7 @@ int qemuMonitorJSONGetCommands(qemuMonitorPtr mon,
goto cleanup;
}
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virJSONValuePtr child = virJSONValueArrayGet(data, i);
const char *tmp;
@@ -4247,7 +4247,7 @@ int qemuMonitorJSONGetEvents(qemuMonitorPtr mon,
goto cleanup;
}
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virJSONValuePtr child = virJSONValueArrayGet(data, i);
const char *tmp;
@@ -4328,7 +4328,7 @@ qemuMonitorJSONGetCommandLineOptionParameters(qemuMonitorPtr mon,
goto cleanup;
}
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virJSONValuePtr child = virJSONValueArrayGet(array, i);
const char *tmp;
@@ -4363,7 +4363,7 @@ qemuMonitorJSONGetCommandLineOptionParameters(qemuMonitorPtr mon,
goto cleanup;
}
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virJSONValuePtr child = virJSONValueArrayGet(data, i);
const char *tmp;
@@ -4490,7 +4490,7 @@ int qemuMonitorJSONGetObjectTypes(qemuMonitorPtr mon,
goto cleanup;
}
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virJSONValuePtr child = virJSONValueArrayGet(data, i);
const char *tmp;
@@ -4570,7 +4570,7 @@ int qemuMonitorJSONGetObjectProps(qemuMonitorPtr mon,
goto cleanup;
}
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virJSONValuePtr child = virJSONValueArrayGet(data, i);
const char *tmp;
@@ -4917,7 +4917,7 @@ qemuMonitorJSONGetStringArray(qemuMonitorPtr mon, const char
*qmpCmd,
goto cleanup;
}
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virJSONValuePtr child = virJSONValueArrayGet(data, i);
const char *tmp;
diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
index 696961b..88e3aaf 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -168,7 +168,7 @@ int qemuMonitorTextIOProcess(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
/* Blank out the password prompt so we don't re-trigger
* if we have to go back to sleep for more I/O */
- for (i = 0 ; i < strlen(PASSWORD_PROMPT) ; i++)
+ for (i = 0; i < strlen(PASSWORD_PROMPT); i++)
start[i] = ' ';
/* Handled, so skip forward over password prompt */
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index a68601b..048105f 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -199,7 +199,7 @@ qemuFindAgentConfig(virDomainDefPtr def)
virDomainChrSourceDefPtr config = NULL;
int i;
- for (i = 0 ; i < def->nchannels ; i++) {
+ for (i = 0; i < def->nchannels; i++) {
virDomainChrDefPtr channel = def->channels[i];
if (channel->targetType != VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO)
@@ -1052,7 +1052,7 @@ no_memory:
VIR_FREE(remoteAddr);
}
if (subject) {
- for (i = 0 ; i < subject->nidentity ; i++) {
+ for (i = 0; i < subject->nidentity; i++) {
VIR_FREE(subject->identities[i].type);
VIR_FREE(subject->identities[i].name);
}
@@ -1511,7 +1511,7 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices,
int i;
const char *prefix = chardevfmt ? "char" : "";
- for (i = 0 ; i < count ; i++) {
+ for (i = 0; i < count; i++) {
virDomainChrDefPtr chr = devices[i];
if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) {
char id[32];
@@ -1606,7 +1606,7 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm,
device args. This code must match that ordering.... */
/* first comes the serial devices */
- for (i = 0 ; i < vm->def->nserials ; i++) {
+ for (i = 0; i < vm->def->nserials; i++) {
virDomainChrDefPtr chr = vm->def->serials[i];
if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) {
if ((ret = qemuProcessExtractTTYPath(output, &offset,
@@ -1616,7 +1616,7 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm,
}
/* then the parallel devices */
- for (i = 0 ; i < vm->def->nparallels ; i++) {
+ for (i = 0; i < vm->def->nparallels; i++) {
virDomainChrDefPtr chr = vm->def->parallels[i];
if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) {
if ((ret = qemuProcessExtractTTYPath(output, &offset,
@@ -1626,7 +1626,7 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm,
}
/* then the channel devices */
- for (i = 0 ; i < vm->def->nchannels ; i++) {
+ for (i = 0; i < vm->def->nchannels; i++) {
virDomainChrDefPtr chr = vm->def->channels[i];
if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) {
if ((ret = qemuProcessExtractTTYPath(output, &offset,
@@ -1635,7 +1635,7 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm,
}
}
- for (i = 0 ; i < vm->def->nconsoles ; i++) {
+ for (i = 0; i < vm->def->nconsoles; i++) {
virDomainChrDefPtr chr = vm->def->consoles[i];
/* For historical reasons, console[0] can be just an alias
* for serial[0]; That's why we need to update it as well */
@@ -1989,7 +1989,7 @@ qemuProcessInitPasswords(virConnectPtr conn,
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
int i;
- for (i = 0 ; i < vm->def->ngraphics; ++i) {
+ for (i = 0; i < vm->def->ngraphics; ++i) {
virDomainGraphicsDefPtr graphics = vm->def->graphics[i];
if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
ret = qemuDomainChangeGraphicsPasswords(driver, vm,
@@ -2008,7 +2008,7 @@ qemuProcessInitPasswords(virConnectPtr conn,
goto cleanup;
if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) {
- for (i = 0 ; i < vm->def->ndisks ; i++) {
+ for (i = 0; i < vm->def->ndisks; i++) {
char *secret;
size_t secretLen;
const char *alias;
@@ -2082,7 +2082,7 @@ qemuProcessAssignNextPCIAddress(virDomainDeviceInfo *info,
VIR_DEBUG("Look for %x:%x out of %d", vendor, product, naddrs);
- for (i = 0 ; (i < naddrs) && !found; i++) {
+ for (i = 0; (i < naddrs) && !found; i++) {
VIR_DEBUG("Maybe %x:%x", addrs[i].vendor, addrs[i].product);
if (addrs[i].vendor == vendor &&
addrs[i].product == product) {
@@ -2299,7 +2299,7 @@ qemuProcessDetectPCIAddresses(virDomainObjPtr vm,
* actual device data structure instead ?
*/
- for (i = 0 ; i < vm->def->ndisks ; i++) {
+ for (i = 0; i < vm->def->ndisks; i++) {
if (qemuProcessGetPCIDiskVendorProduct(vm->def->disks[i], &vendor,
&product) < 0)
continue;
@@ -2313,7 +2313,7 @@ qemuProcessDetectPCIAddresses(virDomainObjPtr vm,
}
}
- for (i = 0 ; i < vm->def->nnets ; i++) {
+ for (i = 0; i < vm->def->nnets; i++) {
if (qemuProcessGetPCINetVendorProduct(vm->def->nets[i], &vendor,
&product) < 0)
continue;
@@ -2327,7 +2327,7 @@ qemuProcessDetectPCIAddresses(virDomainObjPtr vm,
}
}
- for (i = 0 ; i < vm->def->ncontrollers ; i++) {
+ for (i = 0; i < vm->def->ncontrollers; i++) {
if (qemuProcessGetPCIControllerVendorProduct(vm->def->controllers[i],
&vendor, &product) < 0)
continue;
@@ -2341,7 +2341,7 @@ qemuProcessDetectPCIAddresses(virDomainObjPtr vm,
}
}
- for (i = 0 ; i < vm->def->nvideos ; i++) {
+ for (i = 0; i < vm->def->nvideos; i++) {
if (qemuProcessGetPCIVideoVendorProduct(vm->def->videos[i], &vendor,
&product) < 0)
continue;
@@ -2355,7 +2355,7 @@ qemuProcessDetectPCIAddresses(virDomainObjPtr vm,
}
}
- for (i = 0 ; i < vm->def->nsounds ; i++) {
+ for (i = 0; i < vm->def->nsounds; i++) {
if (qemuProcessGetPCISoundVendorProduct(vm->def->sounds[i], &vendor,
&product) < 0)
continue;
@@ -2611,7 +2611,7 @@ qemuProcessNotifyNets(virDomainDefPtr def)
{
int ii;
- for (ii = 0 ; ii < def->nnets ; ii++) {
+ for (ii = 0; ii < def->nnets; ii++) {
virDomainNetDefPtr net = def->nets[ii];
if (networkNotifyActualDevice(net) < 0)
return -1;
@@ -2629,7 +2629,7 @@ qemuProcessFiltersInstantiate(virConnectPtr conn,
if (!conn)
return 1;
- for (i = 0 ; i < def->nnets ; i++) {
+ for (i = 0; i < def->nnets; i++) {
virDomainNetDefPtr net = def->nets[i];
if ((net->filter) && (net->ifname)) {
if (virDomainConfNWFilterInstantiate(conn, def->uuid, net) < 0) {
@@ -3242,7 +3242,7 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driver,
if (graphics->data.spice.autoport) {
/* check if tlsPort or port need allocation */
- for (i = 0 ; i < VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST ; i++) {
+ for (i = 0; i < VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST; i++) {
switch (graphics->data.spice.channels[i]) {
case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE:
needTLSPort = true;
@@ -3458,7 +3458,7 @@ int qemuProcessStart(virConnectPtr conn,
VIR_DEBUG("Ensuring no historical cgroup is lying around");
qemuRemoveCgroup(vm);
- for (i = 0 ; i < vm->def->ngraphics; ++i) {
+ for (i = 0; i < vm->def->ngraphics; ++i) {
virDomainGraphicsDefPtr graphics = vm->def->graphics[i];
if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
if (qemuProcessVNCAllocatePorts(driver, graphics) < 0)
@@ -3525,7 +3525,7 @@ int qemuProcessStart(virConnectPtr conn,
flags & VIR_QEMU_PROCESS_START_COLD) < 0)
goto cleanup;
- for (i = 0; i < vm->def->ndisks ; i++) {
+ for (i = 0; i < vm->def->ndisks; i++) {
if (qemuDomainDetermineDiskChain(driver, vm->def->disks[i],
false) < 0)
goto cleanup;
@@ -4013,7 +4013,7 @@ void qemuProcessStop(virQEMUDriverPtr driver,
if (cfg->macFilter) {
def = vm->def;
- for (i = 0 ; i < def->nnets ; i++) {
+ for (i = 0; i < def->nnets; i++) {
virDomainNetDefPtr net = def->nets[i];
if (net->ifname == NULL)
continue;
@@ -4146,7 +4146,7 @@ retry:
/* Remove VNC and Spice ports from port reservation bitmap, but only if
they were reserved by the driver (autoport=yes)
*/
- for (i = 0 ; i < vm->def->ngraphics; ++i) {
+ for (i = 0; i < vm->def->ngraphics; ++i) {
virDomainGraphicsDefPtr graphics = vm->def->graphics[i];
if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
if (graphics->data.vnc.autoport) {
--
1.8.1.4
5 a.m.
New subject: [libvirt] [PATCH 15/31] src/vmware: Remove the whitespace before '; '
---
src/vmware/vmware_conf.c | 2 +-
src/vmware/vmware_driver.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c
index 6c24187..9d3d37e 100644
--- a/src/vmware/vmware_conf.c
+++ b/src/vmware/vmware_conf.c
@@ -153,7 +153,7 @@ vmwareLoadDomains(struct vmware_driver *driver)
if (virCommandRun(cmd, NULL) < 0)
goto cleanup;
- for (str = outbuf ; (vmxPath = strtok_r(str, "\n", &saveptr)) != NULL;
+ for (str = outbuf; (vmxPath = strtok_r(str, "\n", &saveptr)) != NULL;
str = NULL) {
if (vmxPath[0] != '/')
diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c
index 91a271f..8a3fc99 100644
--- a/src/vmware/vmware_driver.c
+++ b/src/vmware/vmware_driver.c
@@ -214,7 +214,7 @@ vmwareUpdateVMStatus(struct vmware_driver *driver, virDomainObjPtr
vm)
&vmxAbsolutePath) < 0)
goto cleanup;
- for (str = outbuf ; (parsedVmxPath = strtok_r(str, "\n", &saveptr)) !=
NULL;
+ for (str = outbuf; (parsedVmxPath = strtok_r(str, "\n", &saveptr)) !=
NULL;
str = NULL) {
if (parsedVmxPath[0] != '/')
--
1.8.1.4
5 a.m.
New subject: [libvirt] [PATCH 16/31] src/xen: Remove the whitespace before ';'
---
src/xen/xen_driver.c | 6 +++---
src/xen/xen_driver.h | 2 +-
src/xen/xen_hypervisor.c | 4 ++--
src/xen/xen_inotify.c | 4 ++--
src/xen/xm_internal.c | 4 ++--
src/xen/xs_internal.c | 12 ++++++------
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index cc54f7a..d9d8cd0 100644
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -162,8 +162,8 @@ xenDomainUsedCpus(virDomainPtr dom)
if ((ncpus = xenUnifiedDomainGetVcpus(dom, cpuinfo, nb_vcpu,
cpumap, cpumaplen)) >= 0) {
- for (n = 0 ; n < ncpus ; n++) {
- for (m = 0 ; m < priv->nbNodeCpus; m++) {
+ for (n = 0; n < ncpus; n++) {
+ for (m = 0; m < priv->nbNodeCpus; m++) {
bool used;
ignore_value(virBitmapGetBit(cpulist, m, &used));
if ((!used) &&
@@ -2201,7 +2201,7 @@ xenUnifiedRemoveDomainInfo(xenUnifiedDomainInfoListPtr list,
unsigned char *uuid)
{
int i;
- for (i = 0 ; i < list->count ; i++) {
+ for (i = 0; i < list->count; i++) {
if (list->doms[i]->id == id &&
STREQ(list->doms[i]->name, name) &&
!memcmp(list->doms[i]->uuid, uuid, VIR_UUID_BUFLEN)) {
diff --git a/src/xen/xen_driver.h b/src/xen/xen_driver.h
index e33610d..3c7a8cd 100644
--- a/src/xen/xen_driver.h
+++ b/src/xen/xen_driver.h
@@ -172,7 +172,7 @@ struct _xenUnifiedPrivate {
int inotifyFD;
int inotifyWatch;
- int useXenConfigCache ;
+ int useXenConfigCache;
xenUnifiedDomainInfoListPtr configInfoList;
# endif
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index 68a3ef4..1df0945 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -2384,7 +2384,7 @@ xenHypervisorMakeCapabilitiesInternal(virConnectPtr conn,
}
/* Search for existing matching (model,hvm) tuple */
- for (i = 0 ; i < nr_guest_archs ; i++) {
+ for (i = 0; i < nr_guest_archs; i++) {
if (guest_archs[i].arch == arch &&
guest_archs[i].hvm == hvm) {
break;
@@ -2631,7 +2631,7 @@ xenHypervisorLookupDomainByUUID(virConnectPtr conn, const unsigned
char *uuid)
}
id = -1;
- for (i = 0 ; i < nids ; i++) {
+ for (i = 0; i < nids; i++) {
if (memcmp(XEN_GETDOMAININFOLIST_UUID(dominfos, i), uuid, VIR_UUID_BUFLEN) == 0)
{
id = XEN_GETDOMAININFOLIST_DOMAIN(dominfos, i);
break;
diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c
index e13c572..caed574 100644
--- a/src/xen/xen_inotify.c
+++ b/src/xen/xen_inotify.c
@@ -101,7 +101,7 @@ xenInotifyXendDomainsDirLookup(virConnectPtr conn,
/* If we are here, the domain has gone away.
search for, and create a domain from the stored
list info */
- for (i = 0 ; i < priv->configInfoList->count ; i++) {
+ for (i = 0; i < priv->configInfoList->count; i++) {
if (!memcmp(rawuuid, priv->configInfoList->doms[i]->uuid,
VIR_UUID_BUFLEN)) {
*name = strdup(priv->configInfoList->doms[i]->name);
if (!*name) {
@@ -175,7 +175,7 @@ xenInotifyXendDomainsDirRemoveEntry(virConnectPtr conn, const char
*fname)
}
/* match and remove on uuid */
- for (i = 0 ; i < priv->configInfoList->count ; i++) {
+ for (i = 0; i < priv->configInfoList->count; i++) {
if (!memcmp(uuid, priv->configInfoList->doms[i]->uuid, VIR_UUID_BUFLEN))
{
VIR_FREE(priv->configInfoList->doms[i]->name);
VIR_FREE(priv->configInfoList->doms[i]);
diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
index 66a6c4c..964be81 100644
--- a/src/xen/xm_internal.c
+++ b/src/xen/xm_internal.c
@@ -1357,7 +1357,7 @@ xenXMDomainDetachDeviceFlags(virDomainPtr domain,
switch (dev->type) {
case VIR_DOMAIN_DEVICE_DISK:
{
- for (i = 0 ; i < def->ndisks ; i++) {
+ for (i = 0; i < def->ndisks; i++) {
if (def->disks[i]->dst &&
dev->data.disk->dst &&
STREQ(def->disks[i]->dst, dev->data.disk->dst)) {
@@ -1376,7 +1376,7 @@ xenXMDomainDetachDeviceFlags(virDomainPtr domain,
case VIR_DOMAIN_DEVICE_NET:
{
- for (i = 0 ; i < def->nnets ; i++) {
+ for (i = 0; i < def->nnets; i++) {
if (!virMacAddrCmp(&def->nets[i]->mac,
&dev->data.net->mac)) {
virDomainNetDefFree(def->nets[i]);
if (i < (def->nnets - 1))
diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c
index 496c30b..712ee82 100644
--- a/src/xen/xs_internal.c
+++ b/src/xen/xs_internal.c
@@ -718,7 +718,7 @@ xenStoreRemoveWatch(virConnectPtr conn, const char *path, const char
*token)
if (!list)
return -1;
- for (i = 0 ; i < list->count ; i++) {
+ for (i = 0; i < list->count; i++) {
if (STREQ(list->watches[i]->path, path) &&
STREQ(list->watches[i]->token, token)) {
@@ -757,7 +757,7 @@ xenStoreFindWatch(xenStoreWatchListPtr list,
const char *token)
{
int i;
- for (i = 0 ; i < list->count ; i++)
+ for (i = 0; i < list->count; i++)
if (STREQ(path, list->watches[i]->path) &&
STREQ(token, list->watches[i]->token))
return list->watches[i];
@@ -841,9 +841,9 @@ retry:
}
missing = 0;
- for (i=0 ; i < new_domain_cnt ; i++) {
+ for (i=0; i < new_domain_cnt; i++) {
found = 0;
- for (j = 0 ; j < priv->activeDomainList->count ; j++) {
+ for (j = 0; j < priv->activeDomainList->count; j++) {
if (priv->activeDomainList->doms[j]->id == new_domids[i]) {
found = 1;
break;
@@ -925,9 +925,9 @@ retry:
}
removed = 0;
- for (j=0 ; j < priv->activeDomainList->count ; j++) {
+ for (j=0; j < priv->activeDomainList->count; j++) {
found = 0;
- for (i=0 ; i < new_domain_cnt ; i++) {
+ for (i=0; i < new_domain_cnt; i++) {
if (priv->activeDomainList->doms[j]->id == new_domids[i]) {
found = 1;
break;
--
1.8.1.4
5 a.m.
New subject: [libvirt] [PATCH 17/31] src/security: Remove the whitespace before '; '
---
src/security/security_dac.c | 8 ++++----
src/security/security_driver.c | 2 +-
src/security/security_selinux.c | 8 ++++----
src/security/virt-aa-helper.c | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 6e6fcad..d922ad2 100644
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -847,14 +847,14 @@ virSecurityDACRestoreSecurityAllLabel(virSecurityManagerPtr mgr,
VIR_DEBUG("Restoring security label on %s migrated=%d",
def->name, migrated);
- for (i = 0 ; i < def->nhostdevs ; i++) {
+ for (i = 0; i < def->nhostdevs; i++) {
if (virSecurityDACRestoreSecurityHostdevLabel(mgr,
def,
def->hostdevs[i],
NULL) < 0)
rc = -1;
}
- for (i = 0 ; i < def->ndisks ; i++) {
+ for (i = 0; i < def->ndisks; i++) {
if (virSecurityDACRestoreSecurityImageLabelInt(mgr,
def,
def->disks[i],
@@ -914,7 +914,7 @@ virSecurityDACSetSecurityAllLabel(virSecurityManagerPtr mgr,
if (!priv->dynamicOwnership)
return 0;
- for (i = 0 ; i < def->ndisks ; i++) {
+ for (i = 0; i < def->ndisks; i++) {
/* XXX fixme - we need to recursively label the entire tree :-( */
if (def->disks[i]->type == VIR_DOMAIN_DISK_TYPE_DIR)
continue;
@@ -923,7 +923,7 @@ virSecurityDACSetSecurityAllLabel(virSecurityManagerPtr mgr,
def->disks[i]) < 0)
return -1;
}
- for (i = 0 ; i < def->nhostdevs ; i++) {
+ for (i = 0; i < def->nhostdevs; i++) {
if (virSecurityDACSetSecurityHostdevLabel(mgr,
def,
def->hostdevs[i],
diff --git a/src/security/security_driver.c b/src/security/security_driver.c
index 319b86f..7920b93 100644
--- a/src/security/security_driver.c
+++ b/src/security/security_driver.c
@@ -57,7 +57,7 @@ virSecurityDriverPtr virSecurityDriverLookup(const char *name,
VIR_DEBUG("name=%s", NULLSTR(name));
- for (i = 0; i < ARRAY_CARDINALITY(security_drivers) && !drv ; i++) {
+ for (i = 0; i < ARRAY_CARDINALITY(security_drivers) && !drv; i++) {
virSecurityDriverPtr tmp = security_drivers[i];
if (name &&
diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 5d108b9..1781c86 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -1887,14 +1887,14 @@ virSecuritySELinuxRestoreSecurityAllLabel(virSecurityManagerPtr
mgr,
rc = -1;
}
- for (i = 0 ; i < def->nhostdevs ; i++) {
+ for (i = 0; i < def->nhostdevs; i++) {
if (virSecuritySELinuxRestoreSecurityHostdevLabel(mgr,
def,
def->hostdevs[i],
NULL) < 0)
rc = -1;
}
- for (i = 0 ; i < def->ndisks ; i++) {
+ for (i = 0; i < def->ndisks; i++) {
if (virSecuritySELinuxRestoreSecurityImageLabelInt(mgr,
def,
def->disks[i],
@@ -2281,7 +2281,7 @@ virSecuritySELinuxSetSecurityAllLabel(virSecurityManagerPtr mgr,
if (secdef->norelabel || data->skipAllLabel)
return 0;
- for (i = 0 ; i < def->ndisks ; i++) {
+ for (i = 0; i < def->ndisks; i++) {
/* XXX fixme - we need to recursively label the entire tree :-( */
if (def->disks[i]->type == VIR_DOMAIN_DISK_TYPE_DIR) {
VIR_WARN("Unable to relabel directory tree %s for disk %s",
@@ -2294,7 +2294,7 @@ virSecuritySELinuxSetSecurityAllLabel(virSecurityManagerPtr mgr,
}
/* XXX fixme process def->fss if relabel == true */
- for (i = 0 ; i < def->nhostdevs ; i++) {
+ for (i = 0; i < def->nhostdevs; i++) {
if (virSecuritySELinuxSetSecurityHostdevLabel(mgr,
def,
def->hostdevs[i],
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 5d48850..6f63c37 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -952,7 +952,7 @@ get_files(vahControl * ctl)
ctl->def->consoles[i]->source.data.file.path,
"rw") != 0)
goto cleanup;
- for (i = 0 ; i < ctl->def->nparallels; i++)
+ for (i = 0; i < ctl->def->nparallels; i++)
if (ctl->def->parallels[i] &&
(ctl->def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY ||
ctl->def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_DEV ||
@@ -965,7 +965,7 @@ get_files(vahControl * ctl)
ctl->def->parallels[i]->source.type) != 0)
goto cleanup;
- for (i = 0 ; i < ctl->def->nchannels; i++)
+ for (i = 0; i < ctl->def->nchannels; i++)
if (ctl->def->channels[i] &&
(ctl->def->channels[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY ||
ctl->def->channels[i]->source.type == VIR_DOMAIN_CHR_TYPE_DEV ||
--
1.8.1.4
5 a.m.
New subject: [libvirt] [PATCH 18/31] src/storage: Remove the whitespace before '; '
---
src/storage/storage_backend.c | 14 +++++++-------
src/storage/storage_backend_disk.c | 2 +-
src/storage/storage_backend_iscsi.c | 10 +++++-----
src/storage/storage_backend_logical.c | 6 +++---
src/storage/storage_driver.c | 26 +++++++++++++-------------
5 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index 01a404e..66b3ff7 100644
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -1485,14 +1485,14 @@ virStorageBackendRunProgRegex(virStoragePoolObjPtr pool,
return -1;
}
- for (i = 0 ; i < nregex ; i++) {
+ for (i = 0; i < nregex; i++) {
err = regcomp(®[i], regex[i], REG_EXTENDED);
if (err != 0) {
char error[100];
regerror(err, ®[i], error, sizeof(error));
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Failed to compile regex %s"), error);
- for (j = 0 ; j <= i ; j++)
+ for (j = 0; j <= i; j++)
regfree(®[j]);
VIR_FREE(reg);
return -1;
@@ -1538,7 +1538,7 @@ virStorageBackendRunProgRegex(virStoragePoolObjPtr pool,
if (!p)
p = line;
- for (i = 0 ; i <= maxReg && i < nregex ; i++) {
+ for (i = 0; i <= maxReg && i < nregex; i++) {
if (regexec(®[i], p, nvars[i]+1, vars, 0) == 0) {
maxReg++;
@@ -1546,7 +1546,7 @@ virStorageBackendRunProgRegex(virStoragePoolObjPtr pool,
ngroup = 0;
/* NULL terminate each captured group in the line */
- for (j = 0 ; j < nvars[i] ; j++) {
+ for (j = 0; j < nvars[i]; j++) {
/* NB vars[0] is the full pattern, so we offset j by 1 */
p[vars[j+1].rm_eo] = '\0';
if (VIR_STRDUP(groups[ngroup++], p + vars[j+1].rm_so) < 0)
@@ -1559,7 +1559,7 @@ virStorageBackendRunProgRegex(virStoragePoolObjPtr pool,
goto cleanup;
/* Release matches & restart to matching the first regex */
- for (j = 0 ; j < totgroups ; j++)
+ for (j = 0; j < totgroups; j++)
VIR_FREE(groups[j]);
maxReg = 0;
ngroup = 0;
@@ -1571,13 +1571,13 @@ virStorageBackendRunProgRegex(virStoragePoolObjPtr pool,
ret = virCommandWait(cmd, NULL);
cleanup:
if (groups) {
- for (j = 0 ; j < totgroups ; j++)
+ for (j = 0; j < totgroups; j++)
VIR_FREE(groups[j]);
VIR_FREE(groups);
}
VIR_FREE(vars);
- for (i = 0 ; i < nregex ; i++)
+ for (i = 0; i < nregex; i++)
regfree(®[i]);
VIR_FREE(reg);
diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c
index 09c2d2c..d0b91f9 100644
--- a/src/storage/storage_backend_disk.c
+++ b/src/storage/storage_backend_disk.c
@@ -553,7 +553,7 @@ virStorageBackendDiskPartBoundries(virStoragePoolObjPtr pool,
aligned to the cylinder boundary */
extraBytes = cylinderSize - (allocation % cylinderSize);
- for (i = 0 ; i < dev->nfreeExtent ; i++) {
+ for (i = 0; i < dev->nfreeExtent; i++) {
unsigned long long size =
dev->freeExtents[i].end -
dev->freeExtents[i].start;
diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c
index a74f343..ad38ab2 100644
--- a/src/storage/storage_backend_iscsi.c
+++ b/src/storage/storage_backend_iscsi.c
@@ -562,7 +562,7 @@ virStorageBackendISCSIScanTargets(const char *portal,
&list, NULL) < 0)
goto cleanup;
- for (i = 0 ; i < list.ntargets ; i++) {
+ for (i = 0; i < list.ntargets; i++) {
/* We have to ignore failure, because we can't undo
* the results of 'sendtargets', unless we go scrubbing
* around in the dirt in /var/lib/iscsi.
@@ -578,7 +578,7 @@ virStorageBackendISCSIScanTargets(const char *portal,
*ntargetsret = list.ntargets;
*targetsret = list.targets;
} else {
- for (i = 0 ; i < list.ntargets ; i++) {
+ for (i = 0; i < list.ntargets; i++) {
VIR_FREE(list.targets[i]);
}
VIR_FREE(list.targets);
@@ -640,7 +640,7 @@ virStorageBackendISCSIFindPoolSources(virConnectPtr conn
ATTRIBUTE_UNUSED,
goto cleanup;
}
- for (i = 0 ; i < ntargets ; i++) {
+ for (i = 0; i < ntargets; i++) {
if (VIR_ALLOC_N(list.sources[i].devices, 1) < 0 ||
VIR_ALLOC_N(list.sources[i].hosts, 1) < 0) {
virReportOOMError();
@@ -661,13 +661,13 @@ virStorageBackendISCSIFindPoolSources(virConnectPtr conn
ATTRIBUTE_UNUSED,
cleanup:
if (list.sources) {
- for (i = 0 ; i < ntargets ; i++) {
+ for (i = 0; i < ntargets; i++) {
VIR_FREE(list.sources[i].hosts);
VIR_FREE(list.sources[i].devices);
}
VIR_FREE(list.sources);
}
- for (i = 0 ; i < ntargets ; i++)
+ for (i = 0; i < ntargets; i++)
VIR_FREE(targets[i]);
VIR_FREE(targets);
VIR_FREE(portal);
diff --git a/src/storage/storage_backend_logical.c
b/src/storage/storage_backend_logical.c
index 140d188..944aa0e 100644
--- a/src/storage/storage_backend_logical.c
+++ b/src/storage/storage_backend_logical.c
@@ -364,7 +364,7 @@ virStorageBackendLogicalFindPoolSourcesFunc(virStoragePoolObjPtr pool
ATTRIBUTE_
goto error;
thisSource = NULL;
- for (i = 0 ; i < sourceList->nsources; i++) {
+ for (i = 0; i < sourceList->nsources; i++) {
if (STREQ(sourceList->sources[i].name, vgname)) {
thisSource = &sourceList->sources[i];
break;
@@ -514,7 +514,7 @@ virStorageBackendLogicalBuildPool(virConnectPtr conn
ATTRIBUTE_UNUSED,
vgcmd = virCommandNewArgList(VGCREATE, pool->def->source.name, NULL);
- for (i = 0 ; i < pool->def->source.ndevice ; i++) {
+ for (i = 0; i < pool->def->source.ndevice; i++) {
virCommandPtr pvcmd;
/*
* LVM requires that the first sector is blanked if using
@@ -669,7 +669,7 @@ virStorageBackendLogicalDeletePool(virConnectPtr conn
ATTRIBUTE_UNUSED,
/* now remove the pv devices and clear them out */
ret = 0;
- for (i = 0 ; i < pool->def->source.ndevice ; i++) {
+ for (i = 0; i < pool->def->source.ndevice; i++) {
cmd = virCommandNewArgList(PVREMOVE,
pool->def->source.devices[i].path,
NULL);
diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index 7cf8193..a2b0c21 100644
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -68,7 +68,7 @@ static void
storageDriverAutostart(virStorageDriverStatePtr driver) {
unsigned int i;
- for (i = 0 ; i < driver->pools.count ; i++) {
+ for (i = 0; i < driver->pools.count; i++) {
virStoragePoolObjPtr pool = driver->pools.objs[i];
virStorageBackendPtr backend;
bool started = false;
@@ -314,7 +314,7 @@ storageConnectNumOfStoragePools(virConnectPtr conn) {
unsigned int i, nactive = 0;
storageDriverLock(driver);
- for (i = 0 ; i < driver->pools.count ; i++) {
+ for (i = 0; i < driver->pools.count; i++) {
virStoragePoolObjLock(driver->pools.objs[i]);
if (virStoragePoolObjIsActive(driver->pools.objs[i]))
nactive++;
@@ -333,7 +333,7 @@ storageConnectListStoragePools(virConnectPtr conn,
int got = 0, i;
storageDriverLock(driver);
- for (i = 0 ; i < driver->pools.count && got < nnames ; i++) {
+ for (i = 0; i < driver->pools.count && got < nnames; i++) {
virStoragePoolObjLock(driver->pools.objs[i]);
if (virStoragePoolObjIsActive(driver->pools.objs[i])) {
if (VIR_STRDUP(names[got], driver->pools.objs[i]->def->name) < 0)
{
@@ -349,7 +349,7 @@ storageConnectListStoragePools(virConnectPtr conn,
cleanup:
storageDriverUnlock(driver);
- for (i = 0 ; i < got ; i++)
+ for (i = 0; i < got; i++)
VIR_FREE(names[i]);
memset(names, 0, nnames * sizeof(*names));
return -1;
@@ -361,7 +361,7 @@ storageConnectNumOfDefinedStoragePools(virConnectPtr conn) {
unsigned int i, nactive = 0;
storageDriverLock(driver);
- for (i = 0 ; i < driver->pools.count ; i++) {
+ for (i = 0; i < driver->pools.count; i++) {
virStoragePoolObjLock(driver->pools.objs[i]);
if (!virStoragePoolObjIsActive(driver->pools.objs[i]))
nactive++;
@@ -380,7 +380,7 @@ storageConnectListDefinedStoragePools(virConnectPtr conn,
int got = 0, i;
storageDriverLock(driver);
- for (i = 0 ; i < driver->pools.count && got < nnames ; i++) {
+ for (i = 0; i < driver->pools.count && got < nnames; i++) {
virStoragePoolObjLock(driver->pools.objs[i]);
if (!virStoragePoolObjIsActive(driver->pools.objs[i])) {
if (VIR_STRDUP(names[got], driver->pools.objs[i]->def->name) < 0)
{
@@ -396,7 +396,7 @@ storageConnectListDefinedStoragePools(virConnectPtr conn,
cleanup:
storageDriverUnlock(driver);
- for (i = 0 ; i < got ; i++) {
+ for (i = 0; i < got; i++) {
VIR_FREE(names[i]);
}
memset(names, 0, nnames * sizeof(*names));
@@ -1114,7 +1114,7 @@ storagePoolListVolumes(virStoragePoolPtr obj,
goto cleanup;
}
- for (i = 0 ; i < pool->volumes.count && n < maxnames ; i++) {
+ for (i = 0; i < pool->volumes.count && n < maxnames; i++) {
if (VIR_STRDUP(names[n++], pool->volumes.objs[i]->name) < 0)
goto cleanup;
}
@@ -1125,7 +1125,7 @@ storagePoolListVolumes(virStoragePoolPtr obj,
cleanup:
if (pool)
virStoragePoolObjUnlock(pool);
- for (n = 0 ; n < maxnames ; n++)
+ for (n = 0; n < maxnames; n++)
VIR_FREE(names[n]);
memset(names, 0, maxnames * sizeof(*names));
@@ -1174,7 +1174,7 @@ storagePoolListAllVolumes(virStoragePoolPtr pool,
goto cleanup;
}
- for (i = 0 ; i < obj->volumes.count; i++) {
+ for (i = 0; i < obj->volumes.count; i++) {
if (!(vol = virGetStorageVol(pool->conn, obj->def->name,
obj->volumes.objs[i]->name,
obj->volumes.objs[i]->key,
@@ -1253,7 +1253,7 @@ storageVolLookupByKey(virConnectPtr conn,
virStorageVolPtr ret = NULL;
storageDriverLock(driver);
- for (i = 0 ; i < driver->pools.count && !ret ; i++) {
+ for (i = 0; i < driver->pools.count && !ret; i++) {
virStoragePoolObjLock(driver->pools.objs[i]);
if (virStoragePoolObjIsActive(driver->pools.objs[i])) {
virStorageVolDefPtr vol =
@@ -1290,7 +1290,7 @@ storageVolLookupByPath(virConnectPtr conn,
return NULL;
storageDriverLock(driver);
- for (i = 0 ; i < driver->pools.count && !ret ; i++) {
+ for (i = 0; i < driver->pools.count && !ret; i++) {
virStoragePoolObjLock(driver->pools.objs[i]);
if (virStoragePoolObjIsActive(driver->pools.objs[i])) {
virStorageVolDefPtr vol;
@@ -2169,7 +2169,7 @@ storageVolDelete(virStorageVolPtr obj,
if (backend->deleteVol(obj->conn, pool, vol, flags) < 0)
goto cleanup;
- for (i = 0 ; i < pool->volumes.count ; i++) {
+ for (i = 0; i < pool->volumes.count; i++) {
if (pool->volumes.objs[i] == vol) {
VIR_INFO("Deleting volume '%s' from storage pool
'%s'",
vol->name, pool->def->name);
--
1.8.1.4
5 a.m.
New subject: [libvirt] [PATCH 19/31] tools: Remove the whitespace before ";"
---
tools/virsh-domain.c | 6 +++---
tools/virsh-nodedev.c | 6 +++---
tools/virsh-nwfilter.c | 2 +-
tools/virsh-secret.c | 2 +-
tools/virsh.c | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index bb94ac1..bc42408 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -5295,7 +5295,7 @@ cmdVcpuinfo(vshControl *ctl, const vshCmd *cmd)
if ((ncpus = virDomainGetVcpus(dom,
cpuinfo, info.nrVirtCpu,
cpumaps, cpumaplen)) >= 0) {
- for (n = 0 ; n < ncpus ; n++) {
+ for (n = 0; n < ncpus; n++) {
vshPrint(ctl, "%-15s %d\n", _("VCPU:"), n);
vshPrint(ctl, "%-15s %d\n", _("CPU:"), cpuinfo[n].cpu);
vshPrint(ctl, "%-15s %s\n", _("State:"),
@@ -6819,7 +6819,7 @@ static int getSignalNumber(vshControl *ctl, const char *signame)
char *lower = vshStrdup(ctl, signame);
char *tmp = lower;
- for (i = 0 ; signame[i] ; i++)
+ for (i = 0; signame[i]; i++)
lower[i] = c_tolower(signame[i]);
if (virStrToLong_i(lower, NULL, 10, &signum) >= 0)
@@ -7808,7 +7808,7 @@ cmdLxcEnterNamespace(vshControl *ctl, const vshCmd *cmd)
}
_exit(0);
} else {
- for (i = 0 ; i < nfdlist ; i++)
+ for (i = 0; i < nfdlist; i++)
VIR_FORCE_CLOSE(fdlist[i]);
VIR_FREE(fdlist);
if (virProcessWait(pid, NULL) < 0)
diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c
index 592fa44..3657c5f 100644
--- a/tools/virsh-nodedev.c
+++ b/tools/virsh-nodedev.c
@@ -277,7 +277,7 @@ fallback:
list->ndevices = 0;
/* get the node devices */
- for (i = 0; i < ndevices ; i++) {
+ for (i = 0; i < ndevices; i++) {
if (!(device = virNodeDeviceLookupByName(ctl->conn, names[i])))
continue;
list->devices[list->ndevices++] = device;
@@ -481,14 +481,14 @@ cmdNodeListDevices(vshControl *ctl, const vshCmd *cmd
ATTRIBUTE_UNUSED)
}
}
- for (i = 0 ; i < list->ndevices; i++) {
+ for (i = 0; i < list->ndevices; i++) {
if (parents[i] == NULL &&
vshTreePrint(ctl, vshNodeListLookup, &arrays,
list->ndevices, i) < 0)
ret = false;
}
- for (i = 0 ; i < list->ndevices; i++)
+ for (i = 0; i < list->ndevices; i++)
VIR_FREE(parents[i]);
VIR_FREE(parents);
for (i = 0; i < list->ndevices; i++)
diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c
index 5a360c2..c7a259a 100644
--- a/tools/virsh-nwfilter.c
+++ b/tools/virsh-nwfilter.c
@@ -309,7 +309,7 @@ fallback:
list->nfilters = 0;
/* get the network filters */
- for (i = 0; i < nfilters ; i++) {
+ for (i = 0; i < nfilters; i++) {
if (!(filter = virNWFilterLookupByName(ctl->conn, names[i])))
continue;
list->filters[list->nfilters++] = filter;
diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c
index 044629d..fb10119 100644
--- a/tools/virsh-secret.c
+++ b/tools/virsh-secret.c
@@ -439,7 +439,7 @@ fallback:
list->nsecrets = 0;
/* get the secrets */
- for (i = 0; i < nsecrets ; i++) {
+ for (i = 0; i < nsecrets; i++) {
if (!(secret = virSecretLookupByUUIDString(ctl->conn, uuids[i])))
continue;
list->secrets[list->nsecrets++] = secret;
diff --git a/tools/virsh.c b/tools/virsh.c
index bb79245..ecb7bd4 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -610,7 +610,7 @@ vshTreePrintInternal(vshControl *ctl,
}
/* Determine the index of the last child device */
- for (i = 0 ; i < num_devices ; i++) {
+ for (i = 0; i < num_devices; i++) {
const char *parent = (lookup)(i, true, opaque);
if (parent && STREQ(parent, dev))
@@ -625,7 +625,7 @@ vshTreePrintInternal(vshControl *ctl,
virBufferAddLit(indent, " ");
if (virBufferError(indent))
goto cleanup;
- for (i = 0 ; i < num_devices ; i++) {
+ for (i = 0; i < num_devices; i++) {
const char *parent = (lookup)(i, true, opaque);
if (parent && STREQ(parent, dev) &&
--
1.8.1.4
5 a.m.
New subject: [libvirt] [PATCH 20/31] daemon: Remove the whitespace before ";"
---
daemon/libvirtd-config.c | 2 +-
daemon/remote.c | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c
index 1c57475..66dfb4a 100644
--- a/daemon/libvirtd-config.c
+++ b/daemon/libvirtd-config.c
@@ -88,7 +88,7 @@ remoteConfigGetStringList(virConfPtr conf, const char *key, char
***list_arg,
}
if (VIR_STRDUP(list[i], pp->str) < 0) {
int j;
- for (j = 0 ; j < i ; j++)
+ for (j = 0; j < i; j++)
VIR_FREE(list[j]);
VIR_FREE(list);
return -1;
diff --git a/daemon/remote.c b/daemon/remote.c
index af89e60..0e253bf 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -315,7 +315,7 @@ static int remoteRelayDomainEventGraphics(virConnectPtr conn
ATTRIBUTE_UNUSED,
authScheme);
VIR_DEBUG("Subject %d", subject->nidentity);
- for (i = 0 ; i < subject->nidentity ; i++) {
+ for (i = 0; i < subject->nidentity; i++) {
VIR_DEBUG(" %s=%s", subject->identities[i].type,
subject->identities[i].name);
}
@@ -337,7 +337,7 @@ static int remoteRelayDomainEventGraphics(virConnectPtr conn
ATTRIBUTE_UNUSED,
goto error;
}
- for (i = 0 ; i < data.subject.subject_len ; i++) {
+ for (i = 0; i < data.subject.subject_len; i++) {
if (VIR_STRDUP(data.subject.subject_val[i].type, subject->identities[i].type)
< 0 ||
VIR_STRDUP(data.subject.subject_val[i].name, subject->identities[i].name)
< 0)
goto error;
@@ -357,7 +357,7 @@ error:
VIR_FREE(data.remote.node);
VIR_FREE(data.remote.service);
if (data.subject.subject_val != NULL) {
- for (i = 0 ; i < data.subject.subject_len ; i++) {
+ for (i = 0; i < data.subject.subject_len; i++) {
VIR_FREE(data.subject.subject_val[i].type);
VIR_FREE(data.subject.subject_val[i].name);
}
@@ -640,7 +640,7 @@ void remoteClientFreeFunc(void *data)
if (priv->conn) {
int i;
- for (i = 0 ; i < VIR_DOMAIN_EVENT_ID_LAST ; 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);
virConnectDomainEventDeregisterAny(priv->conn,
@@ -681,7 +681,7 @@ void *remoteClientInitHook(virNetServerClientPtr client,
return NULL;
}
- for (i = 0 ; i < VIR_DOMAIN_EVENT_ID_LAST ; i++)
+ for (i = 0; i < VIR_DOMAIN_EVENT_ID_LAST; i++)
priv->domainEventCallbackID[i] = -1;
virNetServerClientSetCloseHook(client, remoteClientCloseFunc);
@@ -4616,7 +4616,7 @@ lxcDispatchDomainOpenNamespace(virNetServerPtr server
ATTRIBUTE_UNUSED,
* but in case they're playing games with us, prevent
* a resource leak
*/
- for (i = 0 ; i < msg->nfds ; i++)
+ for (i = 0; i < msg->nfds; i++)
VIR_FORCE_CLOSE(msg->fds[i]);
VIR_FREE(msg->fds);
msg->nfds = 0;
--
1.8.1.4
5 a.m.
New subject: [libvirt] [PATCH 21/31] tests/: Remove the whitespace before ";"
---
tests/commandhelper.c | 6 +++---
tests/eventtest.c | 18 +++++++++---------
tests/fdstreamtest.c | 14 +++++++-------
tests/libvirtdconftest.c | 2 +-
tests/nodeinfotest.c | 2 +-
tests/qemuhelptest.c | 2 +-
tests/qemumonitortestutils.c | 2 +-
tests/qemuxml2argvtest.c | 4 ++--
tests/securityselinuxlabeltest.c | 12 ++++++------
tests/ssh.c | 4 ++--
tests/testutils.c | 16 ++++++++--------
tests/vircgrouptest.c | 2 +-
tests/virnetsockettest.c | 10 +++++-----
tests/viruritest.c | 2 +-
14 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/tests/commandhelper.c b/tests/commandhelper.c
index d0b9718..e4cc5d2 100644
--- a/tests/commandhelper.c
+++ b/tests/commandhelper.c
@@ -65,7 +65,7 @@ int main(int argc, char **argv) {
if (!log)
goto error;
- for (i = 1 ; i < argc ; i++) {
+ for (i = 1; i < argc; i++) {
fprintf(log, "ARG:%s\n", argv[i]);
}
@@ -88,14 +88,14 @@ int main(int argc, char **argv) {
}
qsort(newenv, n, sizeof(newenv[0]), envsort);
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
/* Ignore the variables used to instruct the loader into
* behaving differently, as they could throw the tests off. */
if (!STRPREFIX(newenv[i], "LD_"))
fprintf(log, "ENV:%s\n", newenv[i]);
}
- for (i = 0 ; i < sysconf(_SC_OPEN_MAX) ; i++) {
+ for (i = 0; i < sysconf(_SC_OPEN_MAX); i++) {
int f;
int closed;
if (i == fileno(log))
diff --git a/tests/eventtest.c b/tests/eventtest.c
index 700ea08..97d805a 100644
--- a/tests/eventtest.c
+++ b/tests/eventtest.c
@@ -144,7 +144,7 @@ verifyFired(const char *name, int handle, int timer)
int handleFired = 0;
int timerFired = 0;
int i;
- for (i = 0 ; i < NUM_FDS ; i++) {
+ for (i = 0; i < NUM_FDS; i++) {
if (handles[i].fired) {
if (i != handle) {
virtTestResult(name, 1,
@@ -177,7 +177,7 @@ verifyFired(const char *name, int handle, int timer)
}
- for (i = 0 ; i < NUM_TIME ; i++) {
+ for (i = 0; i < NUM_TIME; i++) {
if (timers[i].fired) {
if (i != timer) {
virtTestResult(name, 1,
@@ -248,11 +248,11 @@ static void
resetAll(void)
{
int i;
- for (i = 0 ; i < NUM_FDS ; i++) {
+ for (i = 0; i < NUM_FDS; i++) {
handles[i].fired = 0;
handles[i].error = EV_ERROR_NONE;
}
- for (i = 0 ; i < NUM_TIME ; i++) {
+ for (i = 0; i < NUM_TIME; i++) {
timers[i].fired = 0;
timers[i].error = EV_ERROR_NONE;
}
@@ -265,7 +265,7 @@ mymain(void)
pthread_t eventThread;
char one = '1';
- for (i = 0 ; i < NUM_FDS ; i++) {
+ for (i = 0; i < NUM_FDS; i++) {
if (pipe(handles[i].pipeFD) < 0) {
fprintf(stderr, "Cannot create pipe: %d", errno);
return EXIT_FAILURE;
@@ -282,7 +282,7 @@ mymain(void)
virEventPollInit();
- for (i = 0 ; i < NUM_FDS ; i++) {
+ for (i = 0; i < NUM_FDS; i++) {
handles[i].delete = -1;
handles[i].watch =
virEventPollAddHandle(handles[i].pipeFD[0],
@@ -291,7 +291,7 @@ mymain(void)
&handles[i], NULL);
}
- for (i = 0 ; i < NUM_TIME ; i++) {
+ for (i = 0; i < NUM_TIME; i++) {
timers[i].delete = -1;
timers[i].timeout = -1;
timers[i].timer =
@@ -432,9 +432,9 @@ mymain(void)
if (finishJob("Deleted during dispatch", -1, 2) != EXIT_SUCCESS)
return EXIT_FAILURE;
- for (i = 0 ; i < NUM_FDS - 1 ; i++)
+ for (i = 0; i < NUM_FDS - 1; i++)
virEventPollRemoveHandle(handles[i].watch);
- for (i = 0 ; i < NUM_TIME - 1 ; i++)
+ for (i = 0; i < NUM_TIME - 1; i++)
virEventPollRemoveTimeout(timers[i].timer);
resetAll();
diff --git a/tests/fdstreamtest.c b/tests/fdstreamtest.c
index 9f780c9..a5aed14 100644
--- a/tests/fdstreamtest.c
+++ b/tests/fdstreamtest.c
@@ -60,7 +60,7 @@ static int testFDStreamReadCommon(const char *scratchdir, bool
blocking)
VIR_ALLOC_N(buf, PATTERN_LEN) < 0)
goto cleanup;
- for (i = 0 ; i < PATTERN_LEN ; i++)
+ for (i = 0; i < PATTERN_LEN; i++)
pattern[i] = i;
if (virAsprintf(&file, "%s/input.data", scratchdir) < 0)
@@ -69,7 +69,7 @@ static int testFDStreamReadCommon(const char *scratchdir, bool
blocking)
if ((fd = open(file, O_CREAT|O_WRONLY|O_EXCL, 0600)) < 0)
goto cleanup;
- for (i = 0 ; i < 10 ; i++) {
+ for (i = 0; i < 10; i++) {
if (safewrite(fd, pattern, PATTERN_LEN) != PATTERN_LEN)
goto cleanup;
}
@@ -88,7 +88,7 @@ static int testFDStreamReadCommon(const char *scratchdir, bool
blocking)
O_RDONLY) < 0)
goto cleanup;
- for (i = 0 ; i < 10 ; i++) {
+ for (i = 0; i < 10; i++) {
size_t offset = 0;
size_t want;
if (i == 0)
@@ -192,7 +192,7 @@ static int testFDStreamWriteCommon(const char *scratchdir, bool
blocking)
VIR_ALLOC_N(buf, PATTERN_LEN) < 0)
goto cleanup;
- for (i = 0 ; i < PATTERN_LEN ; i++)
+ for (i = 0; i < PATTERN_LEN; i++)
pattern[i] = i;
if (virAsprintf(&file, "%s/input.data", scratchdir) < 0)
@@ -209,7 +209,7 @@ static int testFDStreamWriteCommon(const char *scratchdir, bool
blocking)
O_WRONLY, 0600) < 0)
goto cleanup;
- for (i = 0 ; i < 10 ; i++) {
+ for (i = 0; i < 10; i++) {
size_t offset = 0;
size_t want;
if (i == 0)
@@ -247,7 +247,7 @@ static int testFDStreamWriteCommon(const char *scratchdir, bool
blocking)
if ((fd = open(file, O_RDONLY)) < 0)
goto cleanup;
- for (i = 0 ; i < 10 ; i++) {
+ for (i = 0; i < 10; i++) {
size_t want;
if (i == 9)
want = PATTERN_LEN / 2;
@@ -261,7 +261,7 @@ static int testFDStreamWriteCommon(const char *scratchdir, bool
blocking)
if (i == 0) {
size_t j;
- for (j = 0 ; j < (PATTERN_LEN / 2) ; j++) {
+ for (j = 0; j < (PATTERN_LEN / 2); j++) {
if (buf[j] != 0) {
fprintf(stderr, "Mismatched pattern data iteration %zu\n",
i);
goto cleanup;
diff --git a/tests/libvirtdconftest.c b/tests/libvirtdconftest.c
index e1dd82d..d45c31a 100644
--- a/tests/libvirtdconftest.c
+++ b/tests/libvirtdconftest.c
@@ -223,7 +223,7 @@ mymain(void)
goto cleanup;
}
VIR_DEBUG("Initial config [%s]", filedata);
- for (i = 0 ; params[i] != 0 ; i++) {
+ for (i = 0; params[i] != 0; i++) {
const struct testCorruptData data = { params, filedata, filename, i };
if (virtTestRun("Test corruption", 1, testCorrupt, &data) < 0)
ret = -1;
diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c
index 733d350..bce56f3 100644
--- a/tests/nodeinfotest.c
+++ b/tests/nodeinfotest.c
@@ -139,7 +139,7 @@ mymain(void)
if (virInitialize() < 0)
return EXIT_FAILURE;
- for (i = 0 ; i < ARRAY_CARDINALITY(nodeData); i++)
+ for (i = 0; i < ARRAY_CARDINALITY(nodeData); i++)
if (virtTestRun(nodeData[i], 1, linuxTestNodeInfo, nodeData[i]) != 0)
ret = -1;
diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index f7f88d0..43e6dce 100644
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -24,7 +24,7 @@ static void printMismatchedFlags(virQEMUCapsPtr got,
{
int i;
- for (i = 0 ; i < QEMU_CAPS_LAST ; i++) {
+ for (i = 0; i < QEMU_CAPS_LAST; i++) {
bool gotFlag = virQEMUCapsGet(got, i);
bool expectFlag = virQEMUCapsGet(expect, i);
if (gotFlag && !expectFlag)
diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
index 87f35d6..1a4bb88 100644
--- a/tests/qemumonitortestutils.c
+++ b/tests/qemumonitortestutils.c
@@ -381,7 +381,7 @@ void qemuMonitorTestFree(qemuMonitorTestPtr test)
VIR_FREE(test->incoming);
VIR_FREE(test->outgoing);
- for (i = 0 ; i < test->nitems ; i++)
+ for (i = 0; i < test->nitems; i++)
qemuMonitorTestItemFree(test->items[i]);
VIR_FREE(test->items);
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index fb61017..299eafd 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -263,13 +263,13 @@ testAddCPUModels(virQEMUCapsPtr caps, bool skipLegacy)
};
size_t i;
- for (i = 0 ; i < ARRAY_CARDINALITY(newModels) ; i++) {
+ for (i = 0; i < ARRAY_CARDINALITY(newModels); i++) {
if (virQEMUCapsAddCPUDefinition(caps, newModels[i]) < 0)
return -1;
}
if (skipLegacy)
return 0;
- for (i = 0 ; i < ARRAY_CARDINALITY(legacyModels) ; i++) {
+ for (i = 0; i < ARRAY_CARDINALITY(legacyModels); i++) {
if (virQEMUCapsAddCPUDefinition(caps, legacyModels[i]) < 0)
return -1;
}
diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c
index 275ca93..5ae4f57 100644
--- a/tests/securityselinuxlabeltest.c
+++ b/tests/securityselinuxlabeltest.c
@@ -169,7 +169,7 @@ testSELinuxLoadDef(const char *testname)
0)))
goto cleanup;
- for (i = 0 ; i < def->ndisks ; i++) {
+ for (i = 0; i < def->ndisks; i++) {
if (def->disks[i]->type != VIR_DOMAIN_DISK_TYPE_FILE &&
def->disks[i]->type != VIR_DOMAIN_DISK_TYPE_BLOCK)
continue;
@@ -178,7 +178,7 @@ testSELinuxLoadDef(const char *testname)
goto cleanup;
}
- for (i = 0 ; i < def->nserials ; i++) {
+ for (i = 0; i < def->nserials; i++) {
if (def->serials[i]->source.type != VIR_DOMAIN_CHR_TYPE_FILE &&
def->serials[i]->source.type != VIR_DOMAIN_CHR_TYPE_PIPE &&
def->serials[i]->source.type != VIR_DOMAIN_CHR_TYPE_DEV &&
@@ -216,7 +216,7 @@ testSELinuxCreateDisks(testSELinuxFile *files, size_t nfiles)
if (virFileMakePath(abs_builddir "/securityselinuxlabeldata") < 0)
return -1;
- for (i = 0 ; i < nfiles ; i++) {
+ for (i = 0; i < nfiles; i++) {
if (virFileTouch(files[i].file, 0600) < 0)
return -1;
}
@@ -228,7 +228,7 @@ testSELinuxDeleteDisks(testSELinuxFile *files, size_t nfiles)
{
size_t i;
- for (i = 0 ; i < nfiles ; i++) {
+ for (i = 0; i < nfiles; i++) {
if (unlink(files[i].file) < 0)
return -1;
}
@@ -241,7 +241,7 @@ testSELinuxCheckLabels(testSELinuxFile *files, size_t nfiles)
size_t i;
security_context_t ctx;
- for (i = 0 ; i < nfiles ; i++) {
+ for (i = 0; i < nfiles; i++) {
if (getfilecon(files[i].file, &ctx) < 0) {
if (errno == ENODATA) {
ctx = NULL;
@@ -294,7 +294,7 @@ cleanup:
goto cleanup;
virDomainDefFree(def);
- for (i = 0 ; i < nfiles; i++) {
+ for (i = 0; i < nfiles; i++) {
VIR_FREE(files[i].file);
VIR_FREE(files[i].context);
}
diff --git a/tests/ssh.c b/tests/ssh.c
index a688c28..48009a4 100644
--- a/tests/ssh.c
+++ b/tests/ssh.c
@@ -32,7 +32,7 @@ int main(int argc, char **argv)
int failConnect = 0; /* Exit -1, with no data on stdout, msg on stderr */
int dieEarly = 0; /* Exit -1, with partial data on stdout, msg on stderr */
- for (i = 1 ; i < argc ; i++) {
+ for (i = 1; i < argc; i++) {
if (STREQ(argv[i], "nosuchhost"))
failConnect = 1;
else if (STREQ(argv[i], "crashinghost"))
@@ -50,7 +50,7 @@ int main(int argc, char **argv)
return -1;
}
- for (i = 1 ; i < argc ; i++)
+ for (i = 1; i < argc; i++)
printf("%s%c", argv[i], i == (argc -1) ? '\n' : ' ');
return 0;
diff --git a/tests/testutils.c b/tests/testutils.c
index 222c016..528e432 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -420,7 +420,7 @@ int virtTestDifferenceBin(FILE *stream,
if (virTestGetDebug() < 2) {
/* Skip to first character where they differ */
- for (i = 0 ; i < length ; i++) {
+ for (i = 0; i < length; i++) {
if (expect[i] != actual[i]) {
start = i;
break;
@@ -428,7 +428,7 @@ int virtTestDifferenceBin(FILE *stream,
}
/* Work backwards to last character where they differ */
- for (i = (length -1) ; i >= 0 ; i--) {
+ for (i = (length -1); i >= 0; i--) {
if (expect[i] != actual[i]) {
end = i;
break;
@@ -443,14 +443,14 @@ int virtTestDifferenceBin(FILE *stream,
/* Show the trimmed differences */
fprintf(stream, "\nExpect [ Region %d-%d", (int)start, (int)end);
- for (i = start; i < end ; i++) {
+ for (i = start; i < end; i++) {
if ((i % 4) == 0)
fprintf(stream, "\n ");
fprintf(stream, "0x%02x, ", ((int)expect[i])&0xff);
}
fprintf(stream, "]\n");
fprintf(stream, "Actual [ Region %d-%d", (int)start, (int)end);
- for (i = start; i < end ; i++) {
+ for (i = start; i < end; i++) {
if ((i % 4) == 0)
fprintf(stream, "\n ");
fprintf(stream, "0x%02x, ", ((int)actual[i])&0xff);
@@ -530,7 +530,7 @@ virtTestErrorHook(int n, void *data ATTRIBUTE_UNUSED)
symbols = backtrace_symbols(trace, ntrace);
if (symbols) {
fprintf(stderr, "Failing allocation %d at:\n", n);
- for (i = 0 ; i < ntrace ; i++) {
+ for (i = 0; i < ntrace; i++) {
if (symbols[i])
fprintf(stderr, " TRACE: %s\n", symbols[i]);
}
@@ -666,7 +666,7 @@ int virtTestMain(int argc,
if (mp) {
int i;
- for (i = 0 ; i < mp ; i++) {
+ for (i = 0; i < mp; i++) {
workers[i] = fork();
if (workers[i] == 0) {
worker = i + 1;
@@ -677,7 +677,7 @@ int virtTestMain(int argc,
/* Run once for each alloc, failing a different one
and validating that the test case failed */
- for (n = 0; n < approxAlloc && (!mp || worker) ; n++) {
+ for (n = 0; n < approxAlloc && (!mp || worker); n++) {
if (mp &&
(n % mp) != (worker - 1))
continue;
@@ -701,7 +701,7 @@ int virtTestMain(int argc,
_exit(ret);
} else {
int i;
- for (i = 0 ; i < mp ; i++) {
+ for (i = 0; i < mp; i++) {
if (virProcessWait(workers[i], NULL) < 0)
ret = EXIT_FAILURE;
}
diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
index 75acfcb..b00a187 100644
--- a/tests/vircgrouptest.c
+++ b/tests/vircgrouptest.c
@@ -49,7 +49,7 @@ static int validateCgroup(virCgroupPtr cgroup,
return -1;
}
- for (i = 0 ; i < VIR_CGROUP_CONTROLLER_LAST ; i++) {
+ for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
if (STRNEQ_NULLABLE(expectMountPoint[i],
cgroup->controllers[i].mountPoint)) {
fprintf(stderr, "Wrong mount '%s', expected '%s' for
'%s'\n",
diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
index 5e2925d..4c5a0ea 100644
--- a/tests/virnetsockettest.c
+++ b/tests/virnetsockettest.c
@@ -86,7 +86,7 @@ checkProtocols(bool *hasIPv4, bool *hasIPv6,
freeifaddrs(ifaddr);
- for (i = 0 ; i < 50 ; i++) {
+ for (i = 0; i < 50; i++) {
int only = 1;
if ((s4 = socket(AF_INET, SOCK_STREAM, 0)) < 0)
goto cleanup;
@@ -165,7 +165,7 @@ static int testSocketTCPAccept(const void *opaque)
if (virNetSocketNewListenTCP(data->lnode, portstr, &lsock, &nlsock) <
0)
goto cleanup;
- for (i = 0 ; i < nlsock ; i++) {
+ for (i = 0; i < nlsock; i++) {
if (virNetSocketListen(lsock[i], 0) < 0)
goto cleanup;
}
@@ -175,7 +175,7 @@ static int testSocketTCPAccept(const void *opaque)
virObjectUnref(csock);
- for (i = 0 ; i < nlsock ; i++) {
+ for (i = 0; i < nlsock; i++) {
if (virNetSocketAccept(lsock[i], &ssock) != -1 && ssock) {
char c = 'a';
if (virNetSocketWrite(ssock, &c, 1) != -1 &&
@@ -192,7 +192,7 @@ static int testSocketTCPAccept(const void *opaque)
cleanup:
virObjectUnref(ssock);
- for (i = 0 ; i < nlsock ; i++)
+ for (i = 0; i < nlsock; i++)
virObjectUnref(lsock[i]);
VIR_FREE(lsock);
return ret;
@@ -346,7 +346,7 @@ static int testSocketCommandNormal(const void *data ATTRIBUTE_UNUSED)
if (virNetSocketRead(csock, buf, sizeof(buf)) < 0)
goto cleanup;
- for (i = 0 ; i < sizeof(buf) ; i++)
+ for (i = 0; i < sizeof(buf); i++)
if (buf[i] != '\0')
goto cleanup;
diff --git a/tests/viruritest.c b/tests/viruritest.c
index 6339d17..dab8129 100644
--- a/tests/viruritest.c
+++ b/tests/viruritest.c
@@ -92,7 +92,7 @@ static int testURIParse(const void *args)
goto cleanup;
}
- for (i = 0 ; data->params && data->params[i].name && i <
uri->paramsCount ; i++) {
+ for (i = 0; data->params && data->params[i].name && i <
uri->paramsCount; i++) {
if (!STREQ_NULLABLE(data->params[i].name, uri->params[i].name)) {
VIR_DEBUG("Expected param name %zu '%s', actual
'%s'",
i, data->params[i].name, uri->params[i].name);
--
1.8.1.4
5 a.m.
New subject: [libvirt] [PATCH 22/31] src/utils: Remove the whitespace before "; "
---
src/util/virarch.c | 2 +-
src/util/virauth.c | 2 +-
src/util/vircgroup.c | 38 +++++++++++++++++++-------------------
src/util/vircommand.c | 12 ++++++------
src/util/vireventpoll.c | 22 +++++++++++-----------
src/util/virhash.c | 6 +++---
src/util/viridentity.c | 4 ++--
src/util/virjson.c | 16 ++++++++--------
src/util/virlockspace.c | 10 +++++-----
src/util/virportallocator.c | 2 +-
src/util/virprocess.c | 14 +++++++-------
src/util/virstoragefile.c | 4 ++--
src/util/virstring.c | 2 +-
src/util/virthreadwin32.c | 4 ++--
src/util/viruri.c | 2 +-
src/util/virutil.c | 2 +-
16 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/src/util/virarch.c b/src/util/virarch.c
index 8585a78..81558e5 100644
--- a/src/util/virarch.c
+++ b/src/util/virarch.c
@@ -128,7 +128,7 @@ const char *virArchToString(virArch arch)
virArch virArchFromString(const char *archstr)
{
size_t i;
- for (i = 1 ; i < VIR_ARCH_LAST ; i++) {
+ for (i = 1; i < VIR_ARCH_LAST; i++) {
if (STREQ(virArchData[i].name, archstr))
return i;
}
diff --git a/src/util/virauth.c b/src/util/virauth.c
index fdcefe1..fd53097 100644
--- a/src/util/virauth.c
+++ b/src/util/virauth.c
@@ -57,7 +57,7 @@ int virAuthGetConfigFilePath(virConnectPtr conn,
}
if (conn && conn->uri) {
- for (i = 0 ; i < conn->uri->paramsCount ; i++) {
+ for (i = 0; i < conn->uri->paramsCount; i++) {
if (STREQ_NULLABLE(conn->uri->params[i].name, "authfile")
&&
conn->uri->params[i].value) {
VIR_DEBUG("Using path from URI '%s'",
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index 07ea2c3..329d84b 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -79,7 +79,7 @@ void virCgroupFree(virCgroupPtr *group)
if (*group == NULL)
return;
- for (i = 0 ; i < VIR_CGROUP_CONTROLLER_LAST ; i++) {
+ for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
VIR_FREE((*group)->controllers[i].mountPoint);
VIR_FREE((*group)->controllers[i].linkPoint);
VIR_FREE((*group)->controllers[i].placement);
@@ -112,7 +112,7 @@ static int virCgroupCopyMounts(virCgroupPtr group,
virCgroupPtr parent)
{
int i;
- for (i = 0 ; i < VIR_CGROUP_CONTROLLER_LAST ; i++) {
+ for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
if (!parent->controllers[i].mountPoint)
continue;
@@ -154,7 +154,7 @@ static int virCgroupDetectMounts(virCgroupPtr group)
if (STRNEQ(entry.mnt_type, "cgroup"))
continue;
- for (i = 0 ; i < VIR_CGROUP_CONTROLLER_LAST ; i++) {
+ for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
const char *typestr = virCgroupControllerTypeToString(i);
int typelen = strlen(typestr);
char *tmp = entry.mnt_opts;
@@ -234,7 +234,7 @@ static int virCgroupCopyPlacement(virCgroupPtr group,
virCgroupPtr parent)
{
int i;
- for (i = 0 ; i < VIR_CGROUP_CONTROLLER_LAST ; i++) {
+ for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
if (!group->controllers[i].mountPoint)
continue;
@@ -311,7 +311,7 @@ static int virCgroupDetectPlacement(virCgroupPtr group,
controllers++;
selfpath++;
- for (i = 0 ; i < VIR_CGROUP_CONTROLLER_LAST ; i++) {
+ for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
const char *typestr = virCgroupControllerTypeToString(i);
int typelen = strlen(typestr);
char *tmp = controllers;
@@ -376,7 +376,7 @@ static int virCgroupDetect(virCgroupPtr group,
if (controllers >= 0) {
VIR_DEBUG("Validating controllers %d", controllers);
- for (i = 0 ; i < VIR_CGROUP_CONTROLLER_LAST ; i++) {
+ for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
VIR_DEBUG("Controller '%s' wanted=%s, mount='%s'",
virCgroupControllerTypeToString(i),
(1 << i) & controllers ? "yes" :
"no",
@@ -391,7 +391,7 @@ static int virCgroupDetect(virCgroupPtr group,
} else {
/* Check whether a request to disable a controller
* clashes with co-mounting of controllers */
- for (j = 0 ; j < VIR_CGROUP_CONTROLLER_LAST ; j++) {
+ for (j = 0; j < VIR_CGROUP_CONTROLLER_LAST; j++) {
if (j == i)
continue;
if (!((1 << j) & controllers))
@@ -411,7 +411,7 @@ static int virCgroupDetect(virCgroupPtr group,
} else {
VIR_DEBUG("Auto-detecting controllers");
controllers = 0;
- for (i = 0 ; i < VIR_CGROUP_CONTROLLER_LAST ; i++) {
+ for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
VIR_DEBUG("Controller '%s' present=%s",
virCgroupControllerTypeToString(i),
group->controllers[i].mountPoint ? "yes" :
"no");
@@ -434,7 +434,7 @@ static int virCgroupDetect(virCgroupPtr group,
if (rc == 0) {
/* Check that for every mounted controller, we found our placement */
- for (i = 0 ; i < VIR_CGROUP_CONTROLLER_LAST ; i++) {
+ for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
if (!group->controllers[i].mountPoint)
continue;
@@ -467,7 +467,7 @@ int virCgroupPathOfController(virCgroupPtr group,
{
if (controller == -1) {
int i;
- for (i = 0 ; i < VIR_CGROUP_CONTROLLER_LAST ; i++) {
+ for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
if (group->controllers[i].mountPoint &&
group->controllers[i].placement) {
controller = i;
@@ -645,7 +645,7 @@ static int virCgroupCpuSetInherit(virCgroupPtr parent, virCgroupPtr
group)
};
VIR_DEBUG("Setting up inheritance %s -> %s", parent->path,
group->path);
- for (i = 0; i < ARRAY_CARDINALITY(inherit_values) ; i++) {
+ for (i = 0; i < ARRAY_CARDINALITY(inherit_values); i++) {
char *value;
rc = virCgroupGetValueStr(parent,
@@ -713,7 +713,7 @@ static int virCgroupMakeGroup(virCgroupPtr parent,
int rc = 0;
VIR_DEBUG("Make group %s", group->path);
- for (i = 0 ; i < VIR_CGROUP_CONTROLLER_LAST ; i++) {
+ for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
char *path = NULL;
/* Skip over controllers that aren't mounted */
@@ -949,7 +949,7 @@ int virCgroupRemove(virCgroupPtr group)
char *grppath = NULL;
VIR_DEBUG("Removing cgroup %s", group->path);
- for (i = 0 ; i < VIR_CGROUP_CONTROLLER_LAST ; i++) {
+ for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
/* Skip over controllers not mounted */
if (!group->controllers[i].mountPoint)
continue;
@@ -983,7 +983,7 @@ int virCgroupAddTask(virCgroupPtr group, pid_t pid)
int rc = 0;
int i;
- for (i = 0 ; i < VIR_CGROUP_CONTROLLER_LAST ; i++) {
+ for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
/* Skip over controllers not mounted */
if (!group->controllers[i].mountPoint)
continue;
@@ -1069,7 +1069,7 @@ int virCgroupMoveTask(virCgroupPtr src_group, virCgroupPtr
dest_group)
char *content = NULL;
int i;
- for (i = 0 ; i < VIR_CGROUP_CONTROLLER_LAST ; i++) {
+ for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
if (!src_group->controllers[i].mountPoint ||
!dest_group->controllers[i].mountPoint)
continue;
@@ -1182,7 +1182,7 @@ static int virCgroupSetPartitionSuffix(const char *path, char
**res)
if (!tokens)
return ret;
- for (i = 0 ; tokens[i] != NULL ; i++) {
+ for (i = 0; tokens[i] != NULL; i++) {
/* Whitelist the 3 top level fixed dirs
* NB i == 0 is "", since we have leading '/'
*/
@@ -2499,7 +2499,7 @@ int virCgroupKillPainfully(virCgroupPtr group)
int i;
int rc;
VIR_DEBUG("cgroup=%p path=%s", group, group->path);
- for (i = 0 ; i < 15 ; i++) {
+ for (i = 0; i < 15; i++) {
int signum;
if (i == 0)
signum = SIGTERM;
@@ -2544,7 +2544,7 @@ static char *virCgroupIdentifyRoot(virCgroupPtr group)
char *ret = NULL;
size_t i;
- for (i = 0 ; i < VIR_CGROUP_CONTROLLER_LAST ; i++) {
+ for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
char *tmp;
if (!group->controllers[i].mountPoint)
continue;
@@ -2604,7 +2604,7 @@ int virCgroupIsolateMount(virCgroupPtr group, const char *oldroot,
goto cleanup;
}
- for (i = 0 ; i < VIR_CGROUP_CONTROLLER_LAST ; i++) {
+ for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
if (!group->controllers[i].mountPoint)
continue;
diff --git a/src/util/vircommand.c b/src/util/vircommand.c
index f6f27d9..665f549 100644
--- a/src/util/vircommand.c
+++ b/src/util/vircommand.c
@@ -890,7 +890,7 @@ virCommandKeepFD(virCommandPtr cmd, int fd, bool transfer)
(transfer && (ret = virCommandFDSet(fd, &cmd->transfer,
&cmd->transfer_size)))) {
if (!cmd->has_error)
- cmd->has_error = ret ? ret : -1 ;
+ cmd->has_error = ret ? ret : -1;
VIR_DEBUG("cannot preserve %d", fd);
return fd > STDERR_FILENO;
}
@@ -1739,13 +1739,13 @@ virCommandWriteArgLog(virCommandPtr cmd, int logfd)
if (!cmd || cmd->has_error)
return;
- for (i = 0 ; i < cmd->nenv ; i++) {
+ for (i = 0; i < cmd->nenv; i++) {
if (safewrite(logfd, cmd->env[i], strlen(cmd->env[i])) < 0)
ioError = errno;
if (safewrite(logfd, " ", 1) < 0)
ioError = errno;
}
- for (i = 0 ; i < cmd->nargs ; i++) {
+ for (i = 0; i < cmd->nargs; i++) {
if (safewrite(logfd, cmd->args[i], strlen(cmd->args[i])) < 0)
ioError = errno;
if (safewrite(logfd, i == cmd->nargs - 1 ? "\n" : " ", 1)
< 0)
@@ -1894,7 +1894,7 @@ virCommandProcessIO(virCommandPtr cmd)
goto cleanup;
}
- for (i = 0; i < nfds ; i++) {
+ for (i = 0; i < nfds; i++) {
if (fds[i].revents & (POLLIN | POLLHUP | POLLERR) &&
(fds[i].fd == errfd || fds[i].fd == outfd)) {
char data[1024];
@@ -2564,11 +2564,11 @@ virCommandFree(virCommandPtr cmd)
VIR_FORCE_CLOSE(cmd->outfd);
VIR_FORCE_CLOSE(cmd->errfd);
- for (i = 0 ; i < cmd->nargs ; i++)
+ for (i = 0; i < cmd->nargs; i++)
VIR_FREE(cmd->args[i]);
VIR_FREE(cmd->args);
- for (i = 0 ; i < cmd->nenv ; i++)
+ for (i = 0; i < cmd->nenv; i++)
VIR_FREE(cmd->env[i]);
VIR_FREE(cmd->env);
diff --git a/src/util/vireventpoll.c b/src/util/vireventpoll.c
index 1f0e5b6..cc29dcb 100644
--- a/src/util/vireventpoll.c
+++ b/src/util/vireventpoll.c
@@ -152,7 +152,7 @@ void virEventPollUpdateHandle(int watch, int events) {
}
virMutexLock(&eventLoop.lock);
- for (i = 0 ; i < eventLoop.handlesCount ; i++) {
+ for (i = 0; i < eventLoop.handlesCount; i++) {
if (eventLoop.handles[i].watch == watch) {
eventLoop.handles[i].events =
virEventPollToNativeEvents(events);
@@ -185,7 +185,7 @@ int virEventPollRemoveHandle(int watch) {
}
virMutexLock(&eventLoop.lock);
- for (i = 0 ; i < eventLoop.handlesCount ; i++) {
+ for (i = 0; i < eventLoop.handlesCount; i++) {
if (eventLoop.handles[i].deleted)
continue;
@@ -269,7 +269,7 @@ void virEventPollUpdateTimeout(int timer, int frequency)
}
virMutexLock(&eventLoop.lock);
- for (i = 0 ; i < eventLoop.timeoutsCount ; i++) {
+ for (i = 0; i < eventLoop.timeoutsCount; i++) {
if (eventLoop.timeouts[i].timer == timer) {
eventLoop.timeouts[i].frequency = frequency;
eventLoop.timeouts[i].expiresAt =
@@ -305,7 +305,7 @@ int virEventPollRemoveTimeout(int timer) {
}
virMutexLock(&eventLoop.lock);
- for (i = 0 ; i < eventLoop.timeoutsCount ; i++) {
+ for (i = 0; i < eventLoop.timeoutsCount; i++) {
if (eventLoop.timeouts[i].deleted)
continue;
@@ -331,7 +331,7 @@ static int virEventPollCalculateTimeout(int *timeout) {
int i;
EVENT_DEBUG("Calculate expiry of %zu timers", eventLoop.timeoutsCount);
/* Figure out if we need a timeout */
- for (i = 0 ; i < eventLoop.timeoutsCount ; i++) {
+ for (i = 0; i < eventLoop.timeoutsCount; i++) {
if (eventLoop.timeouts[i].deleted)
continue;
if (eventLoop.timeouts[i].frequency < 0)
@@ -373,7 +373,7 @@ static struct pollfd *virEventPollMakePollFDs(int *nfds) {
int i;
*nfds = 0;
- for (i = 0 ; i < eventLoop.handlesCount ; i++) {
+ for (i = 0; i < eventLoop.handlesCount; i++) {
if (eventLoop.handles[i].events && !eventLoop.handles[i].deleted)
(*nfds)++;
}
@@ -385,7 +385,7 @@ static struct pollfd *virEventPollMakePollFDs(int *nfds) {
}
*nfds = 0;
- for (i = 0 ; i < eventLoop.handlesCount ; i++) {
+ for (i = 0; i < eventLoop.handlesCount; i++) {
EVENT_DEBUG("Prepare n=%d w=%d, f=%d e=%d d=%d", i,
eventLoop.handles[i].watch,
eventLoop.handles[i].fd,
@@ -427,7 +427,7 @@ static int virEventPollDispatchTimeouts(void)
if (virTimeMillisNow(&now) < 0)
return -1;
- for (i = 0 ; i < ntimeouts ; i++) {
+ for (i = 0; i < ntimeouts; i++) {
if (eventLoop.timeouts[i].deleted || eventLoop.timeouts[i].frequency < 0)
continue;
@@ -472,7 +472,7 @@ static int virEventPollDispatchHandles(int nfds, struct pollfd *fds)
{
/* NB, use nfds not eventLoop.handlesCount, because new
* fds might be added on end of list, and they're not
* in the fds array we've got */
- for (i = 0, n = 0 ; n < nfds && i < eventLoop.handlesCount ; n++) {
+ for (i = 0, n = 0; n < nfds && i < eventLoop.handlesCount; n++) {
while ((eventLoop.handles[i].fd != fds[n].fd ||
eventLoop.handles[i].events == 0) &&
i < eventLoop.handlesCount) {
@@ -518,7 +518,7 @@ static void virEventPollCleanupTimeouts(void) {
/* Remove deleted entries, shuffling down remaining
* entries as needed to form contiguous series
*/
- for (i = 0 ; i < eventLoop.timeoutsCount ;) {
+ for (i = 0; i < eventLoop.timeoutsCount;) {
if (!eventLoop.timeouts[i].deleted) {
i++;
continue;
@@ -566,7 +566,7 @@ static void virEventPollCleanupHandles(void) {
/* Remove deleted entries, shuffling down remaining
* entries as needed to form contiguous series
*/
- for (i = 0 ; i < eventLoop.handlesCount ;) {
+ for (i = 0; i < eventLoop.handlesCount;) {
if (!eventLoop.handles[i].deleted) {
i++;
continue;
diff --git a/src/util/virhash.c b/src/util/virhash.c
index 2fe8751..db9ce6b 100644
--- a/src/util/virhash.c
+++ b/src/util/virhash.c
@@ -505,7 +505,7 @@ virHashForEach(virHashTablePtr table, virHashIterator iter, void
*data)
table->iterating = true;
table->current = NULL;
- for (i = 0 ; i < table->size ; i++) {
+ for (i = 0; i < table->size; i++) {
virHashEntryPtr entry = table->table[i];
while (entry) {
virHashEntryPtr next = entry->next;
@@ -551,7 +551,7 @@ virHashRemoveSet(virHashTablePtr table,
table->iterating = true;
table->current = NULL;
- for (i = 0 ; i < table->size ; i++) {
+ for (i = 0; i < table->size; i++) {
virHashEntryPtr *nextptr = table->table + i;
while (*nextptr) {
@@ -625,7 +625,7 @@ void *virHashSearch(virHashTablePtr table,
table->iterating = true;
table->current = NULL;
- for (i = 0 ; i < table->size ; i++) {
+ for (i = 0; i < table->size; i++) {
virHashEntryPtr entry;
for (entry = table->table[i]; entry; entry = entry->next) {
if (iter(entry->payload, entry->name, data)) {
diff --git a/src/util/viridentity.c b/src/util/viridentity.c
index 840485a..0af7c8c 100644
--- a/src/util/viridentity.c
+++ b/src/util/viridentity.c
@@ -217,7 +217,7 @@ static void virIdentityDispose(void *object)
virIdentityPtr ident = object;
size_t i;
- for (i = 0 ; i < VIR_IDENTITY_ATTR_LAST ; i++)
+ for (i = 0; i < VIR_IDENTITY_ATTR_LAST; i++)
VIR_FREE(ident->attrs[i]);
}
@@ -300,7 +300,7 @@ bool virIdentityIsEqual(virIdentityPtr identA,
size_t i;
VIR_DEBUG("identA=%p identB=%p", identA, identB);
- for (i = 0 ; i < VIR_IDENTITY_ATTR_LAST ; i++) {
+ for (i = 0; i < VIR_IDENTITY_ATTR_LAST; i++) {
if (STRNEQ_NULLABLE(identA->attrs[i],
identB->attrs[i]))
goto cleanup;
diff --git a/src/util/virjson.c b/src/util/virjson.c
index 9410b66..ce4d933 100644
--- a/src/util/virjson.c
+++ b/src/util/virjson.c
@@ -70,14 +70,14 @@ void virJSONValueFree(virJSONValuePtr value)
switch ((virJSONType) value->type) {
case VIR_JSON_TYPE_OBJECT:
- for (i = 0 ; i < value->data.object.npairs; i++) {
+ for (i = 0; i < value->data.object.npairs; i++) {
VIR_FREE(value->data.object.pairs[i].key);
virJSONValueFree(value->data.object.pairs[i].value);
}
VIR_FREE(value->data.object.pairs);
break;
case VIR_JSON_TYPE_ARRAY:
- for (i = 0 ; i < value->data.array.nvalues ; i++)
+ for (i = 0; i < value->data.array.nvalues; i++)
virJSONValueFree(value->data.array.values[i]);
VIR_FREE(value->data.array.values);
break;
@@ -406,7 +406,7 @@ int virJSONValueObjectHasKey(virJSONValuePtr object, const char *key)
if (object->type != VIR_JSON_TYPE_OBJECT)
return -1;
- for (i = 0 ; i < object->data.object.npairs ; i++) {
+ for (i = 0; i < object->data.object.npairs; i++) {
if (STREQ(object->data.object.pairs[i].key, key))
return 1;
}
@@ -421,7 +421,7 @@ virJSONValuePtr virJSONValueObjectGet(virJSONValuePtr object, const
char *key)
if (object->type != VIR_JSON_TYPE_OBJECT)
return NULL;
- for (i = 0 ; i < object->data.object.npairs ; i++) {
+ for (i = 0; i < object->data.object.npairs; i++) {
if (STREQ(object->data.object.pairs[i].key, key))
return object->data.object.pairs[i].value;
}
@@ -463,7 +463,7 @@ virJSONValueObjectRemoveKey(virJSONValuePtr object, const char *key,
if (object->type != VIR_JSON_TYPE_OBJECT)
return -1;
- for (i = 0 ; i < object->data.object.npairs ; i++) {
+ for (i = 0; i < object->data.object.npairs; i++) {
if (STREQ(object->data.object.pairs[i].key, key)) {
if (value) {
*value = object->data.object.pairs[i].value;
@@ -1013,7 +1013,7 @@ cleanup:
if (parser.nstate) {
int i;
- for (i = 0 ; i < parser.nstate ; i++) {
+ for (i = 0; i < parser.nstate; i++) {
VIR_FREE(parser.state[i].key);
}
}
@@ -1035,7 +1035,7 @@ static int virJSONValueToStringOne(virJSONValuePtr object,
case VIR_JSON_TYPE_OBJECT:
if (yajl_gen_map_open(g) != yajl_gen_status_ok)
return -1;
- for (i = 0; i < object->data.object.npairs ; i++) {
+ for (i = 0; i < object->data.object.npairs; i++) {
if (yajl_gen_string(g,
(unsigned char *)object->data.object.pairs[i].key,
strlen(object->data.object.pairs[i].key))
@@ -1050,7 +1050,7 @@ static int virJSONValueToStringOne(virJSONValuePtr object,
case VIR_JSON_TYPE_ARRAY:
if (yajl_gen_array_open(g) != yajl_gen_status_ok)
return -1;
- for (i = 0; i < object->data.array.nvalues ; i++) {
+ for (i = 0; i < object->data.array.nvalues; i++) {
if (virJSONValueToStringOne(object->data.array.values[i], g) < 0)
return -1;
}
diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c
index 620a460..01790ed 100644
--- a/src/util/virlockspace.c
+++ b/src/util/virlockspace.c
@@ -342,7 +342,7 @@ virLockSpacePtr virLockSpaceNewPostExecRestart(virJSONValuePtr
object)
goto error;
}
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virJSONValuePtr child = virJSONValueArrayGet(resources, i);
virLockSpaceResourcePtr res;
const char *tmp;
@@ -426,7 +426,7 @@ virLockSpacePtr virLockSpaceNewPostExecRestart(virJSONValuePtr
object)
goto error;
}
- for (j = 0 ; j < res->nOwners ; j++) {
+ for (j = 0; j < res->nOwners; j++) {
unsigned long long int owner;
virJSONValuePtr ownerval = virJSONValueArrayGet(owners, j);
@@ -517,7 +517,7 @@ virJSONValuePtr virLockSpacePreExecRestart(virLockSpacePtr lockspace)
goto error;
}
- for (i = 0 ; i < res->nOwners ; i++) {
+ for (i = 0; i < res->nOwners; i++) {
virJSONValuePtr owner = virJSONValueNewNumberUlong(res->owners[i]);
if (!owner)
goto error;
@@ -701,7 +701,7 @@ int virLockSpaceReleaseResource(virLockSpacePtr lockspace,
goto cleanup;
}
- for (i = 0 ; i < res->nOwners ; i++) {
+ for (i = 0; i < res->nOwners; i++) {
if (res->owners[i] == owner) {
break;
}
@@ -749,7 +749,7 @@ virLockSpaceRemoveResourcesForOwner(const void *payload,
VIR_DEBUG("res %s owner %lld", res->name, (unsigned long
long)data->owner);
- for (i = 0 ; i < res->nOwners ; i++) {
+ for (i = 0; i < res->nOwners; i++) {
if (res->owners[i] == data->owner) {
break;
}
diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c
index 590bb57..c7be10f 100644
--- a/src/util/virportallocator.c
+++ b/src/util/virportallocator.c
@@ -104,7 +104,7 @@ int virPortAllocatorAcquire(virPortAllocatorPtr pa,
*port = 0;
virObjectLock(pa);
- for (i = pa->start ; i <= pa->end && !*port; i++) {
+ for (i = pa->start; i <= pa->end && !*port; i++) {
int reuse = 1;
struct sockaddr_in addr;
bool used = false;
diff --git a/src/util/virprocess.c b/src/util/virprocess.c
index a569406..bc028d7 100644
--- a/src/util/virprocess.c
+++ b/src/util/virprocess.c
@@ -276,7 +276,7 @@ virProcessKillPainfully(pid_t pid, bool force)
*
* Note that setting @force could result in dataloss for the process.
*/
- for (i = 0 ; i < 75; i++) {
+ for (i = 0; i < 75; i++) {
int signum;
if (i == 0) {
signum = SIGTERM; /* kindly suggest it should exit */
@@ -348,7 +348,7 @@ realloc:
}
CPU_ZERO_S(masklen, mask);
- for (i = 0 ; i < virBitmapSize(map); i++) {
+ for (i = 0; i < virBitmapSize(map); i++) {
if (virBitmapGetBit(map, i, &set) < 0)
return -1;
if (set)
@@ -372,7 +372,7 @@ realloc:
cpu_set_t mask;
CPU_ZERO(&mask);
- for (i = 0 ; i < virBitmapSize(map); i++) {
+ for (i = 0; i < virBitmapSize(map); i++) {
if (virBitmapGetBit(map, i, &set) < 0)
return -1;
if (set)
@@ -435,7 +435,7 @@ realloc:
return -1;
}
- for (i = 0 ; i < maxcpu ; i++)
+ for (i = 0; i < maxcpu; i++)
if (CPU_ISSET_S(i, masklen, mask))
ignore_value(virBitmapSetBit(*map, i));
CPU_FREE(mask);
@@ -450,7 +450,7 @@ realloc:
return -1;
}
- for (i = 0 ; i < maxcpu ; i++)
+ for (i = 0; i < maxcpu; i++)
if (CPU_ISSET(i, &mask))
ignore_value(virBitmapSetBit(*map, i));
# endif
@@ -570,7 +570,7 @@ cleanup:
VIR_FREE(nsdir);
VIR_FREE(nsfile);
if (ret < 0) {
- for (i = 0 ; i < *nfdlist ; i++) {
+ for (i = 0; i < *nfdlist; i++) {
VIR_FORCE_CLOSE((*fdlist)[i]);
}
VIR_FREE(*fdlist);
@@ -589,7 +589,7 @@ int virProcessSetNamespaces(size_t nfdlist,
_("Expected at least one file descriptor"));
return -1;
}
- for (i = 0 ; i < nfdlist ; i++) {
+ for (i = 0; i < nfdlist; i++) {
if (setns(fdlist[i], 0) < 0) {
virReportSystemError(errno, "%s",
_("Unable to join domain namespace"));
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 0c43397..9bc8885 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -641,7 +641,7 @@ virStorageFileProbeFormatFromBuf(const char *path,
VIR_DEBUG("path=%s", path);
/* First check file magic */
- for (i = 0 ; i < VIR_STORAGE_FILE_LAST ; i++) {
+ for (i = 0; i < VIR_STORAGE_FILE_LAST; i++) {
if (virStorageFileMatchesMagic(i, buf, buflen)) {
if (!virStorageFileMatchesVersion(i, buf, buflen)) {
possibleFormat = i;
@@ -658,7 +658,7 @@ virStorageFileProbeFormatFromBuf(const char *path,
path, virStorageFileFormatTypeToString(possibleFormat));
/* No magic, so check file extension */
- for (i = 0 ; i < VIR_STORAGE_FILE_LAST ; i++) {
+ for (i = 0; i < VIR_STORAGE_FILE_LAST; i++) {
if (virStorageFileMatchesExtension(i, path)) {
format = i;
goto cleanup;
diff --git a/src/util/virstring.c b/src/util/virstring.c
index 1640d8c..82f1c2e 100644
--- a/src/util/virstring.c
+++ b/src/util/virstring.c
@@ -109,7 +109,7 @@ char **virStringSplit(const char *string,
no_memory:
virReportOOMError();
- for (i = 0 ; i < ntokens ; i++)
+ for (i = 0; i < ntokens; i++)
VIR_FREE(tokens[i]);
VIR_FREE(tokens);
return NULL;
diff --git a/src/util/virthreadwin32.c b/src/util/virthreadwin32.c
index bbe090f..4feaae9 100644
--- a/src/util/virthreadwin32.c
+++ b/src/util/virthreadwin32.c
@@ -56,7 +56,7 @@ void virThreadOnExit(void)
{
unsigned int i;
virMutexLock(&virThreadLocalLock);
- for (i = 0 ; i < virThreadLocalCount ; i++) {
+ for (i = 0; i < virThreadLocalCount; i++) {
if (virThreadLocalList[i].cleanup) {
void *data = TlsGetValue(virThreadLocalList[i].key);
if (data) {
@@ -220,7 +220,7 @@ void virCondBroadcast(virCondPtr c)
if (c->nwaiters) {
unsigned int i;
- for (i = 0 ; i < c->nwaiters ; i++) {
+ for (i = 0; i < c->nwaiters; i++) {
HANDLE event = c->waiters[i];
SetEvent(event);
}
diff --git a/src/util/viruri.c b/src/util/viruri.c
index 2a75425..56d3ab1 100644
--- a/src/util/viruri.c
+++ b/src/util/viruri.c
@@ -328,7 +328,7 @@ void virURIFree(virURIPtr uri)
VIR_FREE(uri->query);
VIR_FREE(uri->fragment);
- for (i = 0 ; i < uri->paramsCount ; i++) {
+ for (i = 0; i < uri->paramsCount; i++) {
VIR_FREE(uri->params[i].name);
VIR_FREE(uri->params[i].value);
}
diff --git a/src/util/virutil.c b/src/util/virutil.c
index 7f4ecd6..239fba8 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -386,7 +386,7 @@ int virEnumFromString(const char *const*types,
if (!type)
return -1;
- for (i = 0 ; i < ntypes ; i++)
+ for (i = 0; i < ntypes; i++)
if (STREQ(types[i], type))
return i;
--
1.8.1.4
5 a.m.
New subject: [libvirt] [PATCH 23/31] src/rpc: Remove the whitespace before ";"
---
src/rpc/virnetclient.c | 12 ++++++------
src/rpc/virnetclientprogram.c | 12 ++++++------
src/rpc/virnetmessage.c | 6 +++---
src/rpc/virnetserver.c | 26 +++++++++++++-------------
src/rpc/virnetserverclient.c | 4 ++--
src/rpc/virnetserverprogram.c | 2 +-
src/rpc/virnetserverservice.c | 14 +++++++-------
src/rpc/virnetsocket.c | 2 +-
8 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index 1d228f0..d87c7e3 100644
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -602,7 +602,7 @@ void virNetClientDispose(void *obj)
if (client->closeFf)
client->closeFf(client->closeOpaque);
- for (i = 0 ; i < client->nprograms ; i++)
+ for (i = 0; i < client->nprograms; i++)
virObjectUnref(client->programs[i]);
VIR_FREE(client->programs);
@@ -916,7 +916,7 @@ void virNetClientRemoveStream(virNetClientPtr client,
{
virObjectLock(client);
size_t i;
- for (i = 0 ; i < client->nstreams ; i++) {
+ for (i = 0; i < client->nstreams; i++) {
if (client->streams[i] == st)
break;
}
@@ -1008,7 +1008,7 @@ static int virNetClientCallDispatchMessage(virNetClientPtr client)
size_t i;
virNetClientProgramPtr prog = NULL;
- for (i = 0 ; i < client->nprograms ; i++) {
+ for (i = 0; i < client->nprograms; i++) {
if (virNetClientProgramMatches(client->programs[i],
&client->msg)) {
prog = client->programs[i];
@@ -1033,7 +1033,7 @@ static int virNetClientCallDispatchStream(virNetClientPtr client)
virNetClientCallPtr thecall;
/* First identify what stream this packet is directed at */
- for (i = 0 ; i < client->nstreams ; i++) {
+ for (i = 0; i < client->nstreams; i++) {
if (virNetClientStreamMatches(client->streams[i],
&client->msg)) {
st = client->streams[i];
@@ -1175,7 +1175,7 @@ virNetClientIOWriteMessage(virNetClientPtr client,
if (thecall->msg->bufferOffset == thecall->msg->bufferLength) {
size_t i;
- for (i = thecall->msg->donefds ; i < thecall->msg->nfds ; i++) {
+ for (i = thecall->msg->donefds; i < thecall->msg->nfds; i++) {
int rv;
if ((rv = virNetSocketSendFD(client->sock, thecall->msg->fds[i]))
< 0)
return -1;
@@ -1297,7 +1297,7 @@ virNetClientIOHandleInput(virNetClientPtr client)
virNetMessageDecodeNumFDs(&client->msg) < 0)
return -1;
- for (i = client->msg.donefds ; i < client->msg.nfds ; i++)
{
+ for (i = client->msg.donefds; i < client->msg.nfds; i++) {
int rv;
if ((rv = virNetSocketRecvFD(client->sock,
&(client->msg.fds[i]))) < 0)
return -1;
diff --git a/src/rpc/virnetclientprogram.c b/src/rpc/virnetclientprogram.c
index 2e6e4f6..1016f55 100644
--- a/src/rpc/virnetclientprogram.c
+++ b/src/rpc/virnetclientprogram.c
@@ -197,7 +197,7 @@ static virNetClientProgramEventPtr
virNetClientProgramGetEvent(virNetClientProgr
{
int i;
- for (i = 0 ; i < prog->nevents ; i++) {
+ for (i = 0; i < prog->nevents; i++) {
if (prog->events[i].proc == procedure)
return &prog->events[i];
}
@@ -301,9 +301,9 @@ int virNetClientProgramCall(virNetClientProgramPtr prog,
virReportOOMError();
goto error;
}
- for (i = 0 ; i < msg->nfds ; i++)
+ for (i = 0; i < msg->nfds; i++)
msg->fds[i] = -1;
- for (i = 0 ; i < msg->nfds ; i++) {
+ for (i = 0; i < msg->nfds; i++) {
if ((msg->fds[i] = dup(outfds[i])) < 0) {
virReportSystemError(errno,
_("Cannot duplicate FD %d"),
@@ -362,9 +362,9 @@ int virNetClientProgramCall(virNetClientProgramPtr prog,
virReportOOMError();
goto error;
}
- for (i = 0 ; i < *ninfds ; i++)
+ for (i = 0; i < *ninfds; i++)
(*infds)[i] = -1;
- for (i = 0 ; i < *ninfds ; i++) {
+ for (i = 0; i < *ninfds; i++) {
if (((*infds)[i] = dup(msg->fds[i])) < 0) {
virReportSystemError(errno,
_("Cannot duplicate FD %d"),
@@ -401,7 +401,7 @@ int virNetClientProgramCall(virNetClientProgramPtr prog,
error:
virNetMessageFree(msg);
if (infds && ninfds) {
- for (i = 0 ; i < *ninfds ; i++)
+ for (i = 0; i < *ninfds; i++)
VIR_FORCE_CLOSE((*infds)[i]);
}
return -1;
diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c
index b2c6e5b..85c831d 100644
--- a/src/rpc/virnetmessage.c
+++ b/src/rpc/virnetmessage.c
@@ -55,7 +55,7 @@ void virNetMessageClear(virNetMessagePtr msg)
VIR_DEBUG("msg=%p nfds=%zu", msg, msg->nfds);
- for (i = 0 ; i < msg->nfds ; i++)
+ for (i = 0; i < msg->nfds; i++)
VIR_FORCE_CLOSE(msg->fds[i]);
VIR_FREE(msg->fds);
VIR_FREE(msg->buffer);
@@ -75,7 +75,7 @@ void virNetMessageFree(virNetMessagePtr msg)
if (msg->cb)
msg->cb(msg, msg->opaque);
- for (i = 0 ; i < msg->nfds ; i++)
+ for (i = 0; i < msg->nfds; i++)
VIR_FORCE_CLOSE(msg->fds[i]);
VIR_FREE(msg->buffer);
VIR_FREE(msg->fds);
@@ -325,7 +325,7 @@ int virNetMessageDecodeNumFDs(virNetMessagePtr msg)
virReportOOMError();
goto cleanup;
}
- for (i = 0 ; i < msg->nfds ; i++)
+ for (i = 0; i < msg->nfds; i++)
msg->fds[i] = -1;
VIR_DEBUG("Got %zu FDs from peer", msg->nfds);
diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index e536cc3..94b27f0 100644
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -210,7 +210,7 @@ static int virNetServerDispatchNewMessage(virNetServerClientPtr
client,
srv, client, msg);
virObjectLock(srv);
- for (i = 0 ; i < srv->nprograms ; i++) {
+ for (i = 0; i < srv->nprograms; i++) {
if (virNetServerProgramMatches(srv->programs[i], msg)) {
prog = srv->programs[i];
break;
@@ -517,7 +517,7 @@ virNetServerPtr virNetServerNewPostExecRestart(virJSONValuePtr
object,
goto error;
}
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virNetServerServicePtr service;
virJSONValuePtr child = virJSONValueArrayGet(services, i);
if (!child) {
@@ -550,7 +550,7 @@ virNetServerPtr virNetServerNewPostExecRestart(virJSONValuePtr
object,
goto error;
}
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virNetServerClientPtr client;
virJSONValuePtr child = virJSONValueArrayGet(clients, i);
if (!child) {
@@ -645,7 +645,7 @@ virJSONValuePtr virNetServerPreExecRestart(virNetServerPtr srv)
goto error;
}
- for (i = 0 ; i < srv->nservices ; i++) {
+ for (i = 0; i < srv->nservices; i++) {
virJSONValuePtr child;
if (!(child = virNetServerServicePreExecRestart(srv->services[i])))
goto error;
@@ -662,7 +662,7 @@ virJSONValuePtr virNetServerPreExecRestart(virNetServerPtr srv)
goto error;
}
- for (i = 0 ; i < srv->nclients ; i++) {
+ for (i = 0; i < srv->nclients; i++) {
virJSONValuePtr child;
if (!(child = virNetServerClientPreExecRestart(srv->clients[i])))
goto error;
@@ -870,7 +870,7 @@ virNetServerSignalEvent(int watch,
goto cleanup;
}
- for (i = 0 ; i < srv->nsignals ; i++) {
+ for (i = 0; i < srv->nsignals; i++) {
if (siginfo.si_signo == srv->signals[i]->signum) {
virNetServerSignalFunc func = srv->signals[i]->func;
void *funcopaque = srv->signals[i]->opaque;
@@ -1051,7 +1051,7 @@ void virNetServerUpdateServices(virNetServerPtr srv,
int i;
virObjectLock(srv);
- for (i = 0 ; i < srv->nservices ; i++)
+ for (i = 0; i < srv->nservices; i++)
virNetServerServiceToggle(srv->services[i], enabled);
virObjectUnlock(srv);
@@ -1113,7 +1113,7 @@ void virNetServerRun(virNetServerPtr srv)
virObjectLock(srv);
reprocess:
- for (i = 0 ; i < srv->nclients ; i++) {
+ for (i = 0; i < srv->nclients; i++) {
/* Coverity 5.3.0 couldn't see that srv->clients is non-NULL
* if srv->nclients is non-zero. */
sa_assert(srv->clients);
@@ -1162,12 +1162,12 @@ void virNetServerDispose(void *obj)
VIR_FORCE_CLOSE(srv->autoShutdownInhibitFd);
- for (i = 0 ; i < srv->nservices ; i++)
+ for (i = 0; i < srv->nservices; i++)
virNetServerServiceToggle(srv->services[i], false);
virThreadPoolFree(srv->workers);
- for (i = 0 ; i < srv->nsignals ; i++) {
+ for (i = 0; i < srv->nsignals; i++) {
sigaction(srv->signals[i]->signum, &srv->signals[i]->oldaction,
NULL);
VIR_FREE(srv->signals[i]);
}
@@ -1177,15 +1177,15 @@ void virNetServerDispose(void *obj)
if (srv->sigwatch > 0)
virEventRemoveHandle(srv->sigwatch);
- for (i = 0 ; i < srv->nservices ; i++)
+ for (i = 0; i < srv->nservices; i++)
virObjectUnref(srv->services[i]);
VIR_FREE(srv->services);
- for (i = 0 ; i < srv->nprograms ; i++)
+ for (i = 0; i < srv->nprograms; i++)
virObjectUnref(srv->programs[i]);
VIR_FREE(srv->programs);
- for (i = 0 ; i < srv->nclients ; i++) {
+ for (i = 0; i < srv->nclients; i++) {
virNetServerClientClose(srv->clients[i]);
virObjectUnref(srv->clients[i]);
}
diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
index 6d7c439..7232191 100644
--- a/src/rpc/virnetserverclient.c
+++ b/src/rpc/virnetserverclient.c
@@ -1166,7 +1166,7 @@ readmore:
}
/* Try getting the file descriptors (may fail if blocking) */
- for (i = msg->donefds ; i < msg->nfds ; i++) {
+ for (i = msg->donefds; i < msg->nfds; i++) {
int rv;
if ((rv = virNetSocketRecvFD(client->sock, &(msg->fds[i]))) < 0)
{
virNetMessageQueueServe(&client->rx);
@@ -1317,7 +1317,7 @@ virNetServerClientDispatchWrite(virNetServerClientPtr client)
virNetMessagePtr msg;
size_t i;
- for (i = client->tx->donefds ; i < client->tx->nfds ; i++) {
+ for (i = client->tx->donefds; i < client->tx->nfds; i++) {
int rv;
if ((rv = virNetSocketSendFD(client->sock, client->tx->fds[i]))
< 0) {
client->wantClose = true;
diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c
index b80923d..09d4d21 100644
--- a/src/rpc/virnetserverprogram.c
+++ b/src/rpc/virnetserverprogram.c
@@ -451,7 +451,7 @@ virNetServerProgramDispatchCall(virNetServerProgramPtr prog,
*
*/
if (rv != 1) {
- for (i = 0 ; i < msg->nfds ; i++)
+ for (i = 0; i < msg->nfds; i++)
VIR_FORCE_CLOSE(msg->fds[i]);
VIR_FREE(msg->fds);
msg->nfds = 0;
diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c
index 2915355..baf0ebe 100644
--- a/src/rpc/virnetserverservice.c
+++ b/src/rpc/virnetserverservice.c
@@ -121,7 +121,7 @@ virNetServerServicePtr virNetServerServiceNewTCP(const char
*nodename,
&svc->nsocks) < 0)
goto error;
- for (i = 0 ; i < svc->nsocks ; i++) {
+ for (i = 0; i < svc->nsocks; i++) {
if (virNetSocketListen(svc->socks[i], 0) < 0)
goto error;
@@ -184,7 +184,7 @@ virNetServerServicePtr virNetServerServiceNewUNIX(const char *path,
&svc->socks[0]) < 0)
goto error;
- for (i = 0 ; i < svc->nsocks ; i++) {
+ for (i = 0; i < svc->nsocks; i++) {
if (virNetSocketListen(svc->socks[i], 0) < 0)
goto error;
@@ -243,7 +243,7 @@ virNetServerServicePtr virNetServerServiceNewFD(int fd,
&svc->socks[0]) < 0)
goto error;
- for (i = 0 ; i < svc->nsocks ; i++) {
+ for (i = 0; i < svc->nsocks; i++) {
/* IO callback is initially disabled, until we're ready
* to deal with incoming clients */
if (virNetSocketAddIOCallback(svc->socks[i],
@@ -315,7 +315,7 @@ virNetServerServicePtr
virNetServerServiceNewPostExecRestart(virJSONValuePtr obj
goto error;
}
- for (i = 0 ; i < svc->nsocks ; i++) {
+ for (i = 0; i < svc->nsocks; i++) {
virJSONValuePtr child = virJSONValueArrayGet(socks, i);
virNetSocketPtr sock;
@@ -372,7 +372,7 @@ virJSONValuePtr
virNetServerServicePreExecRestart(virNetServerServicePtr svc)
goto error;
}
- for (i = 0 ; i < svc->nsocks ; i++) {
+ for (i = 0; i < svc->nsocks; i++) {
virJSONValuePtr child;
if (!(child = virNetSocketPreExecRestart(svc->socks[i])))
goto error;
@@ -437,7 +437,7 @@ void virNetServerServiceDispose(void *obj)
virNetServerServicePtr svc = obj;
int i;
- for (i = 0 ; i < svc->nsocks ; i++)
+ for (i = 0; i < svc->nsocks; i++)
virObjectUnref(svc->socks[i]);
VIR_FREE(svc->socks);
@@ -451,7 +451,7 @@ void virNetServerServiceToggle(virNetServerServicePtr svc,
{
int i;
- for (i = 0 ; i < svc->nsocks ; i++)
+ for (i = 0; i < svc->nsocks; i++)
virNetSocketUpdateIOCallback(svc->socks[i],
enabled ?
VIR_EVENT_HANDLE_READABLE :
diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index 67eb496..2474003 100644
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -321,7 +321,7 @@ int virNetSocketNewListenTCP(const char *nodename,
return 0;
error:
- for (i = 0 ; i < nsocks ; i++)
+ for (i = 0; i < nsocks; i++)
virObjectUnref(socks[i]);
VIR_FREE(socks);
freeaddrinfo(ai);
--
1.8.1.4
5 a.m.
New subject: [libvirt] [PATCH 24/31] src/remote: Remove the whitespace before "; "
---
src/remote/remote_driver.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 13212d0..229a188 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -524,7 +524,7 @@ doRemoteOpen(virConnectPtr conn,
int i;
if (conn->uri) {
- for (i = 0; i < conn->uri->paramsCount ; i++) {
+ for (i = 0; i < conn->uri->paramsCount; i++) {
virURIParamPtr var = &conn->uri->params[i];
EXTRACT_URI_ARG_STR("name", name);
EXTRACT_URI_ARG_STR("command", command);
@@ -1335,7 +1335,7 @@ remoteNodeGetCellsFreeMemory(virConnectPtr conn,
(xdrproc_t) xdr_remote_node_get_cells_free_memory_ret, (char *)&ret) ==
-1)
goto done;
- for (i = 0 ; i < ret.cells.cells_len ; i++)
+ for (i = 0; i < ret.cells.cells_len; i++)
freeMems[i] = ret.cells.cells_val[i];
xdr_free((xdrproc_t) xdr_remote_node_get_cells_free_memory_ret, (char *) &ret);
@@ -3540,7 +3540,7 @@ remoteAuthenticate(virConnectPtr conn, struct private_data *priv,
_("unknown authentication type %s"), authtype);
return -1;
}
- for (i = 0 ; i < ret.types.types_len ; i++) {
+ for (i = 0; i < ret.types.types_len; i++) {
if (ret.types.types_val[i] == want)
type = want;
}
@@ -3683,7 +3683,7 @@ static sasl_callback_t *remoteAuthMakeCallbacks(int *credtype, int
ncredtype)
return NULL;
}
- for (i = 0, n = 0 ; i < ncredtype ; i++) {
+ for (i = 0, n = 0; i < ncredtype; i++) {
int id = remoteAuthCredVir2SASL(credtype[i]);
if (id != 0)
cbs[n++].id = id;
@@ -3712,7 +3712,7 @@ static int remoteAuthMakeCredentials(sasl_interact_t *interact,
if (!cred)
return -1;
- for (ninteract = 0, *ncred = 0 ; interact[ninteract].id != 0 ; ninteract++) {
+ for (ninteract = 0, *ncred = 0; interact[ninteract].id != 0; ninteract++) {
if (interact[ninteract].result)
continue;
(*ncred)++;
@@ -3721,7 +3721,7 @@ static int remoteAuthMakeCredentials(sasl_interact_t *interact,
if (VIR_ALLOC_N(*cred, *ncred) < 0)
return -1;
- for (ninteract = 0, *ncred = 0 ; interact[ninteract].id != 0 ; ninteract++) {
+ for (ninteract = 0, *ncred = 0; interact[ninteract].id != 0; ninteract++) {
if (interact[ninteract].result)
continue;
@@ -3756,7 +3756,7 @@ static void remoteAuthFillInteract(virConnectCredentialPtr cred,
sasl_interact_t *interact)
{
int ninteract, ncred;
- for (ninteract = 0, ncred = 0 ; interact[ninteract].id != 0 ; ninteract++) {
+ for (ninteract = 0, ncred = 0; interact[ninteract].id != 0; ninteract++) {
if (interact[ninteract].result)
continue;
interact[ninteract].result = cred[ncred].result;
@@ -3796,7 +3796,7 @@ static int remoteAuthFillFromConfig(virConnectPtr conn,
goto cleanup;
}
- for (ninteract = 0 ; state->interact[ninteract].id != 0 ; ninteract++) {
+ for (ninteract = 0; state->interact[ninteract].id != 0; ninteract++) {
const char *value = NULL;
switch (state->interact[ninteract].id) {
@@ -3846,7 +3846,7 @@ static void remoteAuthInteractStateClear(struct
remoteAuthInteractState *state,
if (!state)
return;
- for (i = 0 ; i < state->ncred ; i++)
+ for (i = 0; i < state->ncred; i++)
VIR_FREE(state->cred[i].result);
VIR_FREE(state->cred);
state->ncred = 0;
@@ -4189,7 +4189,7 @@ remoteAuthPolkit(virConnectPtr conn, struct private_data *priv,
/* Auth failed. Ask client to obtain it and check again. */
if (auth && auth->cb) {
/* Check if the necessary credential type for PolicyKit is supported */
- for (i = 0 ; i < auth->ncredtype ; i++) {
+ for (i = 0; i < auth->ncredtype; i++) {
if (auth->credtype[i] == VIR_CRED_EXTERNAL)
allowcb = 1;
}
@@ -4488,7 +4488,7 @@ remoteDomainBuildEventGraphics(virNetClientProgramPtr prog
ATTRIBUTE_UNUSED,
if (VIR_ALLOC_N(subject->identities, msg->subject.subject_len) < 0)
goto no_memory;
subject->nidentity = msg->subject.subject_len;
- for (i = 0 ; i < subject->nidentity ; i++) {
+ for (i = 0; i < subject->nidentity; i++) {
if (!(subject->identities[i].type =
strdup(msg->subject.subject_val[i].type)) ||
!(subject->identities[i].name =
strdup(msg->subject.subject_val[i].name)))
goto no_memory;
@@ -4518,7 +4518,7 @@ no_memory:
VIR_FREE(remoteAddr);
}
if (subject) {
- for (i = 0 ; i < subject->nidentity ; i++) {
+ for (i = 0; i < subject->nidentity; i++) {
VIR_FREE(subject->identities[i].type);
VIR_FREE(subject->identities[i].name);
}
--
1.8.1.4
5 a.m.
New subject: [libvirt] [PATCH 25/31] src/lxc: Remove the whitespace before ";"
---
src/lxc/lxc_cgroup.c | 4 ++--
src/lxc/lxc_container.c | 24 ++++++++++++------------
src/lxc/lxc_controller.c | 28 ++++++++++++++--------------
src/lxc/lxc_driver.c | 4 ++--
src/lxc/lxc_hostdev.c | 4 ++--
src/lxc/lxc_process.c | 18 +++++++++---------
6 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c
index de6b53b..5c8acb3 100644
--- a/src/lxc/lxc_cgroup.c
+++ b/src/lxc/lxc_cgroup.c
@@ -427,7 +427,7 @@ static int virLXCCgroupSetupDeviceACL(virDomainDefPtr def,
}
}
- for (i = 0 ; i < def->ndisks ; i++) {
+ for (i = 0; i < def->ndisks; i++) {
if (def->disks[i]->type != VIR_DOMAIN_DISK_TYPE_BLOCK)
continue;
@@ -445,7 +445,7 @@ static int virLXCCgroupSetupDeviceACL(virDomainDefPtr def,
}
}
- for (i = 0 ; i < def->nfss ; i++) {
+ for (i = 0; i < def->nfss; i++) {
if (def->fss[i]->type != VIR_DOMAIN_FS_TYPE_BLOCK)
continue;
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index b4be4cd..c74e3ca 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -353,7 +353,7 @@ static int lxcContainerRenameAndEnableInterfaces(bool privNet,
size_t i;
char *newname = NULL;
- for (i = 0 ; i < nveths ; i++) {
+ for (i = 0; i < nveths; i++) {
if (virAsprintf(&newname, "eth%zu", i) < 0) {
virReportOOMError();
rc = -1;
@@ -475,7 +475,7 @@ static int lxcContainerUnmountSubtree(const char *prefix,
if (lxcContainerGetSubtree(prefix, &mounts, &nmounts) < 0)
goto cleanup;
- for (i = 0 ; i < nmounts ; i++) {
+ for (i = 0; i < nmounts; i++) {
VIR_DEBUG("Umount %s", mounts[i]);
if (umount(mounts[i]) < 0) {
char ebuf[1024];
@@ -509,7 +509,7 @@ static int lxcContainerUnmountSubtree(const char *prefix,
ret = 0;
cleanup:
- for (i = 0 ; i < nmounts ; i++)
+ for (i = 0; i < nmounts; i++)
VIR_FREE(mounts[i]);
VIR_FREE(mounts);
@@ -689,7 +689,7 @@ static int lxcContainerMountBasicFS(char *sec_mount_options)
VIR_DEBUG("Mounting basic filesystems sec_mount_options=%s",
sec_mount_options);
- for (i = 0 ; i < ARRAY_CARDINALITY(mnts) ; i++) {
+ for (i = 0; i < ARRAY_CARDINALITY(mnts); i++) {
const char *srcpath = NULL;
VIR_DEBUG("Processing %s -> %s",
@@ -849,7 +849,7 @@ static int lxcContainerPopulateDevices(char **ttyPaths, size_t
nttyPaths)
};
/* Populate /dev/ with a few important bits */
- for (i = 0 ; i < ARRAY_CARDINALITY(devs) ; i++) {
+ for (i = 0; i < ARRAY_CARDINALITY(devs); i++) {
dev_t dev = makedev(devs[i].maj, devs[i].min);
if (mknod(devs[i].path, S_IFCHR, dev) < 0 ||
chmod(devs[i].path, devs[i].mode)) {
@@ -860,7 +860,7 @@ static int lxcContainerPopulateDevices(char **ttyPaths, size_t
nttyPaths)
}
}
- for (i = 0 ; i < ARRAY_CARDINALITY(links) ; i++) {
+ for (i = 0; i < ARRAY_CARDINALITY(links); i++) {
if (symlink(links[i].src, links[i].dst) < 0) {
virReportSystemError(errno,
_("Failed to symlink device %s to %s"),
@@ -890,7 +890,7 @@ static int lxcContainerPopulateDevices(char **ttyPaths, size_t
nttyPaths)
}
}
- for (i = 0 ; i < nttyPaths ; i++) {
+ for (i = 0; i < nttyPaths; i++) {
char *tty;
if (virAsprintf(&tty, "/dev/tty%zu", i+1) < 0) {
virReportOOMError();
@@ -1356,7 +1356,7 @@ static int lxcContainerMountAllFS(virDomainDefPtr vmDef,
VIR_DEBUG("Mounting all non-root filesystems");
/* Pull in rest of container's mounts */
- for (i = 0 ; i < vmDef->nfss ; i++) {
+ for (i = 0; i < vmDef->nfss; i++) {
if (STREQ(vmDef->fss[i]->dst, "/"))
continue;
@@ -1460,7 +1460,7 @@ static int lxcContainerSetupAllDisks(virDomainDefPtr vmDef,
size_t i;
VIR_DEBUG("Setting up disks");
- for (i = 0 ; i < vmDef->ndisks ; i++) {
+ for (i = 0; i < vmDef->ndisks; i++) {
if (lxcContainerSetupDisk(vmDef, vmDef->disks[i],
securityDriver) < 0)
return -1;
@@ -1702,7 +1702,7 @@ static int lxcContainerSetupAllHostdevs(virDomainDefPtr vmDef,
size_t i;
VIR_DEBUG("Setting up hostdevs");
- for (i = 0 ; i < vmDef->nhostdevs ; i++) {
+ for (i = 0; i < vmDef->nhostdevs; i++) {
virDomainHostdevDefPtr def = vmDef->hostdevs[i];
switch (def->mode) {
case VIR_DOMAIN_HOSTDEV_MODE_SUBSYS:
@@ -1840,7 +1840,7 @@ static int lxcContainerResolveSymlinks(virDomainDefPtr vmDef)
char *newroot;
size_t i;
- for (i = 0 ; i < vmDef->nfss ; i++) {
+ for (i = 0; i < vmDef->nfss; i++) {
virDomainFSDefPtr fs = vmDef->fss[i];
if (!fs->src)
continue;
@@ -2070,7 +2070,7 @@ lxcNeedNetworkNamespace(virDomainDefPtr def)
return true;
if (def->features & (1 << VIR_DOMAIN_FEATURE_PRIVNET))
return true;
- for (i = 0 ; i < def->nhostdevs ; i++) {
+ for (i = 0; i < def->nhostdevs; i++) {
if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES
&&
def->hostdevs[i]->source.caps.type ==
VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET)
return true;
diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index b3fc598..dfe686b 100644
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -199,7 +199,7 @@ static int virLXCControllerCloseLoopDevices(virLXCControllerPtr ctrl)
{
size_t i;
- for (i = 0 ; i < ctrl->nloopDevs ; i++)
+ for (i = 0; i < ctrl->nloopDevs; i++)
VIR_FORCE_CLOSE(ctrl->loopDevFds[i]);
return 0;
@@ -251,11 +251,11 @@ static void virLXCControllerFree(virLXCControllerPtr ctrl)
virObjectUnref(ctrl->securityManager);
- for (i = 0 ; i < ctrl->nveths ; i++)
+ for (i = 0; i < ctrl->nveths; i++)
VIR_FREE(ctrl->veths[i]);
VIR_FREE(ctrl->veths);
- for (i = 0 ; i < ctrl->nconsoles ; i++)
+ for (i = 0; i < ctrl->nconsoles; i++)
virLXCControllerConsoleClose(&(ctrl->consoles[i]));
VIR_FREE(ctrl->consoles);
@@ -450,7 +450,7 @@ static int virLXCControllerSetupLoopDevices(virLXCControllerPtr ctrl)
size_t i;
int ret = -1;
- for (i = 0 ; i < ctrl->def->nfss ; i++) {
+ for (i = 0; i < ctrl->def->nfss; i++) {
virDomainFSDefPtr fs = ctrl->def->fss[i];
int fd;
@@ -487,7 +487,7 @@ static int virLXCControllerSetupLoopDevices(virLXCControllerPtr ctrl)
}
}
- for (i = 0 ; i < ctrl->def->ndisks ; i++) {
+ for (i = 0; i < ctrl->def->ndisks; i++) {
virDomainDiskDefPtr disk = ctrl->def->disks[i];
int fd;
@@ -1067,7 +1067,7 @@ static int virLXCControllerMain(virLXCControllerPtr ctrl)
virResetLastError();
- for (i = 0 ; i < ctrl->nconsoles ; i++) {
+ for (i = 0; i < ctrl->nconsoles; i++) {
if ((ctrl->consoles[i].epollFd = epoll_create1(EPOLL_CLOEXEC)) < 0) {
virReportSystemError(errno, "%s",
_("Unable to create epoll fd"));
@@ -1115,7 +1115,7 @@ cleanup:
virMutexDestroy(&lock);
cleanup2:
- for (i = 0 ; i < ctrl->nconsoles ; i++)
+ for (i = 0; i < ctrl->nconsoles; i++)
virLXCControllerConsoleClose(&(ctrl->consoles[i]));
return rc;
@@ -1138,7 +1138,7 @@ static int virLXCControllerMoveInterfaces(virLXCControllerPtr ctrl)
size_t i;
virDomainDefPtr def = ctrl->def;
- for (i = 0 ; i < ctrl->nveths ; i++) {
+ for (i = 0; i < ctrl->nveths; i++) {
if (virNetDevSetNamespace(ctrl->veths[i], ctrl->initpid) < 0)
return -1;
}
@@ -1175,7 +1175,7 @@ static int virLXCControllerDeleteInterfaces(virLXCControllerPtr
ctrl)
size_t i;
int ret = 0;
- for (i = 0 ; i < ctrl->nveths ; i++) {
+ for (i = 0; i < ctrl->nveths; i++) {
if (virNetDevVethDelete(ctrl->veths[i]) < 0)
ret = -1;
}
@@ -1371,7 +1371,7 @@ virLXCControllerSetupConsoles(virLXCControllerPtr ctrl,
{
size_t i;
- for (i = 0 ; i < ctrl->nconsoles ; i++) {
+ for (i = 0; i < ctrl->nconsoles; i++) {
VIR_DEBUG("Opening tty on private %s", ctrl->devptmx);
if (lxcCreateTty(ctrl->devptmx,
&ctrl->consoles[i].contFd,
@@ -1568,7 +1568,7 @@ virLXCControllerRun(virLXCControllerPtr ctrl)
if (virLXCControllerDaemonHandshake(ctrl) < 0)
goto cleanup;
- for (i = 0 ; i < ctrl->nconsoles ; i++)
+ for (i = 0; i < ctrl->nconsoles; i++)
if (virLXCControllerConsoleSetNonblocking(&(ctrl->consoles[i])) < 0)
goto cleanup;
@@ -1582,7 +1582,7 @@ cleanup:
VIR_FORCE_CLOSE(containerhandshake[0]);
VIR_FORCE_CLOSE(containerhandshake[1]);
- for (i = 0 ; i < ctrl->nconsoles ; i++)
+ for (i = 0; i < ctrl->nconsoles; i++)
VIR_FREE(containerTTYPaths[i]);
VIR_FREE(containerTTYPaths);
@@ -1739,7 +1739,7 @@ int main(int argc, char *argv[])
ctrl->veths = veths;
ctrl->nveths = nveths;
- for (i = 0 ; i < nttyFDs ; i++) {
+ for (i = 0; i < nttyFDs; i++) {
if (virLXCControllerAddConsole(ctrl, ttyFDs[i]) < 0)
goto cleanup;
ttyFDs[i] = -1;
@@ -1801,7 +1801,7 @@ cleanup:
virPidFileDelete(LXC_STATE_DIR, name);
if (ctrl)
virLXCControllerDeleteInterfaces(ctrl);
- for (i = 0 ; i < nttyFDs ; i++)
+ for (i = 0; i < nttyFDs; i++)
VIR_FORCE_CLOSE(ttyFDs[i]);
VIR_FREE(ttyFDs);
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 997f81d..3d6baf5 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -2191,7 +2191,7 @@ lxcDomainInterfaceStats(virDomainPtr dom,
}
/* Check the path is one of the domain's network interfaces. */
- for (i = 0 ; i < vm->def->nnets ; i++) {
+ for (i = 0; i < vm->def->nnets; i++) {
if (vm->def->nets[i]->ifname &&
STREQ(vm->def->nets[i]->ifname, path)) {
ret = 0;
@@ -2544,7 +2544,7 @@ lxcDomainOpenConsole(virDomainPtr dom,
}
if (dev_name) {
- for (i = 0 ; i < vm->def->nconsoles ; i++) {
+ for (i = 0; i < vm->def->nconsoles; i++) {
if (vm->def->consoles[i]->info.alias &&
STREQ(vm->def->consoles[i]->info.alias, dev_name)) {
chr = vm->def->consoles[i];
diff --git a/src/lxc/lxc_hostdev.c b/src/lxc/lxc_hostdev.c
index 0ce5d05..257e93b 100644
--- a/src/lxc/lxc_hostdev.c
+++ b/src/lxc/lxc_hostdev.c
@@ -232,7 +232,7 @@ virLXCPrepareHostUSBDevices(virLXCDriverPtr driver,
/* Loop 1: build temporary list
*/
- for (i = 0 ; i < nhostdevs ; i++) {
+ for (i = 0; i < nhostdevs; i++) {
virDomainHostdevDefPtr hostdev = hostdevs[i];
bool required = true;
virUSBDevicePtr usb;
@@ -287,7 +287,7 @@ int virLXCPrepareHostDevices(virLXCDriverPtr driver,
return 0;
/* Sanity check for supported configurations only */
- for (i = 0 ; i < def->nhostdevs ; i++) {
+ for (i = 0; i < def->nhostdevs; i++) {
virDomainHostdevDefPtr dev = def->hostdevs[i];
switch (dev->mode) {
diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index b06d748..d2485c3 100644
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -261,7 +261,7 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver,
virLXCDomainReAttachHostDevices(driver, vm->def);
- for (i = 0 ; i < vm->def->nnets ; i++) {
+ for (i = 0; i < vm->def->nnets; i++) {
virDomainNetDefPtr iface = vm->def->nets[i];
vport = virDomainNetGetActualVirtPortProfile(iface);
if (iface->ifname) {
@@ -433,7 +433,7 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn,
int ret = -1;
size_t i;
- for (i = 0 ; i < def->nnets ; i++) {
+ for (i = 0; i < def->nnets; i++) {
char *veth = NULL;
/* If appropriate, grab a physical device from the configured
* network's pool of devices, or resolve bridge device name
@@ -536,7 +536,7 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn,
cleanup:
if (ret < 0) {
- for (i = 0 ; i < def->nnets ; i++) {
+ for (i = 0; i < def->nnets; i++) {
virDomainNetDefPtr iface = def->nets[i];
virNetDevVPortProfilePtr vport =
virDomainNetGetActualVirtPortProfile(iface);
if (vport && vport->virtPortType ==
VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH)
@@ -851,7 +851,7 @@ virLXCProcessBuildControllerCmd(virLXCDriverPtr driver,
}
virCommandAddArgList(cmd, "--name", vm->def->name, NULL);
- for (i = 0 ; i < nttyFDs ; i++) {
+ for (i = 0; i < nttyFDs; i++) {
virCommandAddArg(cmd, "--console");
virCommandAddArgFormat(cmd, "%d", ttyFDs[i]);
virCommandPreserveFD(cmd, ttyFDs[i]);
@@ -864,7 +864,7 @@ virLXCProcessBuildControllerCmd(virLXCDriverPtr driver,
virCommandAddArgFormat(cmd, "%d", handshakefd);
virCommandAddArg(cmd, "--background");
- for (i = 0 ; i < nveths ; i++) {
+ for (i = 0; i < nveths; i++) {
virCommandAddArgList(cmd, "--veth", veths[i], NULL);
}
@@ -1131,7 +1131,7 @@ int virLXCProcessStart(virConnectPtr conn,
virReportOOMError();
goto cleanup;
}
- for (i = 0 ; i < vm->def->nconsoles ; i++)
+ for (i = 0; i < vm->def->nconsoles; i++)
ttyFDs[i] = -1;
/* If you are using a SecurityDriver with dynamic labelling,
@@ -1152,7 +1152,7 @@ int virLXCProcessStart(virConnectPtr conn,
vm->def, NULL) < 0)
goto cleanup;
- for (i = 0 ; i < vm->def->nconsoles ; i++) {
+ for (i = 0; i < vm->def->nconsoles; i++) {
char *ttyPath;
if (vm->def->consoles[i]->source.type != VIR_DOMAIN_CHR_TYPE_PTY) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
@@ -1334,7 +1334,7 @@ cleanup:
virReportSystemError(errno, "%s", _("could not close
logfile"));
rc = -1;
}
- for (i = 0 ; i < nveths ; i++) {
+ for (i = 0; i < nveths; i++) {
if (rc != 0)
ignore_value(virNetDevVethDelete(veths[i]));
VIR_FREE(veths[i]);
@@ -1361,7 +1361,7 @@ cleanup:
VIR_FREE(vm->def->seclabels[0]->imagelabel);
}
}
- for (i = 0 ; i < nttyFDs ; i++)
+ for (i = 0; i < nttyFDs; i++)
VIR_FORCE_CLOSE(ttyFDs[i]);
VIR_FREE(ttyFDs);
VIR_FORCE_CLOSE(handshakefds[0]);
--
1.8.1.4
5 a.m.
New subject: [libvirt] [PATCH 26/31] examples: Remove the whitespace before '; '
---
examples/domain-events/events-c/event-test.c | 2 +-
examples/openauth/openauth.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/examples/domain-events/events-c/event-test.c
b/examples/domain-events/events-c/event-test.c
index 301caad..eeff50f 100644
--- a/examples/domain-events/events-c/event-test.c
+++ b/examples/domain-events/events-c/event-test.c
@@ -332,7 +332,7 @@ static int myDomainEventGraphicsCallback(virConnectPtr conn
ATTRIBUTE_UNUSED,
remote->family, remote->node, remote->service);
printf("auth: %s ", authScheme);
- for (i = 0 ; i < subject->nidentity ; i++) {
+ for (i = 0; i < subject->nidentity; i++) {
printf(" identity: %s=%s",
subject->identities[i].type,
subject->identities[i].name);
diff --git a/examples/openauth/openauth.c b/examples/openauth/openauth.c
index 4f01cdb..628451c 100644
--- a/examples/openauth/openauth.c
+++ b/examples/openauth/openauth.c
@@ -135,7 +135,7 @@ showDomains(virConnectPtr conn)
printf("Inactive domains:\n");
}
- for (i = 0 ; i < numNames ; i++) {
+ for (i = 0; i < numNames; i++) {
printf(" %s\n", *(nameList + i));
/* The API documentation doesn't say so, but the names
* returned by virConnectListDefinedDomains are strdup'd and
@@ -175,7 +175,7 @@ authCallback(virConnectCredentialPtr cred, unsigned int ncred, void
*cbdata)
* For example the ESX driver passes the hostname of the ESX or vCenter
* server as challenge. This allows a auth callback to return the
* proper credentials. */
- for (i = 0; i < ncred ; ++i) {
+ for (i = 0; i < ncred; ++i) {
switch (cred[i].type) {
case VIR_CRED_AUTHNAME:
cred[i].result = strdup(authData->username);
--
1.8.1.4
5 a.m.
New subject: [libvirt] [PATCH 27/31] python: Remove the whitespace before ";"
---
python/libvirt-lxc-override.c | 4 ++--
python/libvirt-override.c | 16 ++++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/python/libvirt-lxc-override.c b/python/libvirt-lxc-override.c
index ead175f..c69affc 100644
--- a/python/libvirt-lxc-override.c
+++ b/python/libvirt-lxc-override.c
@@ -81,7 +81,7 @@ libvirt_lxc_virDomainLxcOpenNamespace(PyObject *self ATTRIBUTE_UNUSED,
return VIR_PY_NONE;
py_retval = PyList_New(c_retval);
- for (i = 0 ; i < c_retval ; i++) {
+ for (i = 0; i < c_retval; i++) {
PyObject *item = NULL;
if ((item = PyInt_FromLong(fdlist[i])) == NULL)
@@ -95,7 +95,7 @@ libvirt_lxc_virDomainLxcOpenNamespace(PyObject *self ATTRIBUTE_UNUSED,
return py_retval;
error:
- for (i = 0 ; i < c_retval ; i++) {
+ for (i = 0; i < c_retval; i++) {
VIR_FORCE_CLOSE(fdlist[i]);
}
VIR_FREE(fdlist);
diff --git a/python/libvirt-override.c b/python/libvirt-override.c
index fd9ebb8..6ed2624 100644
--- a/python/libvirt-override.c
+++ b/python/libvirt-override.c
@@ -81,7 +81,7 @@ getPyVirTypedParameter(const virTypedParameterPtr params, int nparams)
if ((info = PyDict_New()) == NULL)
return NULL;
- for (i = 0 ; i < nparams ; i++) {
+ for (i = 0; i < nparams; i++) {
switch (params[i].type) {
case VIR_TYPED_PARAM_INT:
val = PyInt_FromLong(params[i].value.i);
@@ -1409,7 +1409,7 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED,
if ((pycpumap = PyList_New(dominfo.nrVirtCpu)) == NULL)
goto cleanup;
- for (i = 0 ; i < dominfo.nrVirtCpu ; i++) {
+ for (i = 0; i < dominfo.nrVirtCpu; i++) {
PyObject *info = PyTuple_New(4);
PyObject *item = NULL;
@@ -1441,12 +1441,12 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED,
Py_XDECREF(item);
goto cleanup;
}
- for (i = 0 ; i < dominfo.nrVirtCpu ; i++) {
+ for (i = 0; i < dominfo.nrVirtCpu; i++) {
PyObject *info = PyTuple_New(cpunum);
int j;
if (info == NULL)
goto cleanup;
- for (j = 0 ; j < cpunum ; j++) {
+ for (j = 0; j < cpunum; j++) {
PyObject *item = NULL;
if ((item = PyBool_FromLong(VIR_CPU_USABLE(cpumap, cpumaplen, i, j))) == NULL
||
PyTuple_SetItem(info, j, item) < 0) {
@@ -1950,7 +1950,7 @@ static int virConnectCredCallbackWrapper(virConnectCredentialPtr
cred,
list = PyTuple_New(2);
pycred = PyTuple_New(ncred);
- for (i = 0 ; i < ncred ; i++) {
+ for (i = 0; i < ncred; i++) {
PyObject *pycreditem;
pycreditem = PyList_New(5);
Py_INCREF(Py_None);
@@ -1985,7 +1985,7 @@ static int virConnectCredCallbackWrapper(virConnectCredentialPtr
cred,
ret = PyLong_AsLong(pyret);
if (ret == 0) {
- for (i = 0 ; i < ncred ; i++) {
+ for (i = 0; i < ncred; i++) {
PyObject *pycreditem;
PyObject *pyresult;
char *result = NULL;
@@ -2036,7 +2036,7 @@ libvirt_virConnectOpenAuth(PyObject *self ATTRIBUTE_UNUSED, PyObject
*args) {
int i;
if (VIR_ALLOC_N(auth.credtype, auth.ncredtype) < 0)
return VIR_PY_NONE;
- for (i = 0 ; i < auth.ncredtype ; i++) {
+ for (i = 0; i < auth.ncredtype; i++) {
PyObject *val;
val = PyList_GetItem(pycredtype, i);
auth.credtype[i] = (int)PyLong_AsLong(val);
@@ -5655,7 +5655,7 @@ libvirt_virConnectDomainEventGraphicsCallback(virConnectPtr conn
ATTRIBUTE_UNUSE
libvirt_constcharPtrWrap(remote->service));
pyobj_subject = PyList_New(subject->nidentity);
- for (i = 0 ; i < subject->nidentity ; i++) {
+ for (i = 0; i < subject->nidentity; i++) {
PyObject *pair = PyTuple_New(2);
PyTuple_SetItem(pair, 0,
libvirt_constcharPtrWrap(subject->identities[i].type));
PyTuple_SetItem(pair, 1,
libvirt_constcharPtrWrap(subject->identities[i].name));
--
1.8.1.4
5 a.m.
New subject: [libvirt] [PATCH 28/31] src/locking: Remove the whitespace before "; "
---
src/locking/domain_lock.c | 4 ++--
src/locking/lock_daemon.c | 4 ++--
src/locking/lock_driver_lockd.c | 12 ++++++------
src/locking/lock_driver_sanlock.c | 6 +++---
src/locking/lock_manager.c | 2 +-
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/locking/domain_lock.c b/src/locking/domain_lock.c
index 6191e9b..d79aeac 100644
--- a/src/locking/domain_lock.c
+++ b/src/locking/domain_lock.c
@@ -138,12 +138,12 @@ static virLockManagerPtr
virDomainLockManagerNew(virLockManagerPluginPtr plugin,
if (withResources) {
VIR_DEBUG("Adding leases");
- for (i = 0 ; i < dom->def->nleases ; i++)
+ for (i = 0; i < dom->def->nleases; i++)
if (virDomainLockManagerAddLease(lock, dom->def->leases[i]) < 0)
goto error;
VIR_DEBUG("Adding disks");
- for (i = 0 ; i < dom->def->ndisks ; i++)
+ for (i = 0; i < dom->def->ndisks; i++)
if (virDomainLockManagerAddDisk(lock, dom->def->disks[i]) < 0)
goto error;
}
diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index e1653b1..23a119f 100644
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -215,7 +215,7 @@ virLockDaemonNewPostExecRestart(virJSONValuePtr object, bool
privileged)
goto error;
}
- for (i = 0 ; i < n ; i++) {
+ for (i = 0; i < n; i++) {
virLockSpacePtr lockspace;
child = virJSONValueArrayGet(lockspaces, i);
@@ -749,7 +749,7 @@ virLockDaemonClientFree(void *opaque)
* closed the connection, we must kill it off
* to make sure it doesn't do nasty stuff */
if (data.gotError || data.hadSomeLeases) {
- for (i = 0 ; i < 15 ; i++) {
+ for (i = 0; i < 15; i++) {
int signum;
if (i == 0)
signum = SIGTERM;
diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c
index afe9e94..cc3b6b1 100644
--- a/src/locking/lock_driver_lockd.c
+++ b/src/locking/lock_driver_lockd.c
@@ -428,7 +428,7 @@ static void virLockManagerLockDaemonFree(virLockManagerPtr lock)
lock->privateData = NULL;
- for (i = 0 ; i < priv->nresources ; i++) {
+ for (i = 0; i < priv->nresources; i++) {
VIR_FREE(priv->resources[i].lockspace);
VIR_FREE(priv->resources[i].name);
}
@@ -459,7 +459,7 @@ static int virLockManagerLockDaemonNew(virLockManagerPtr lock,
switch (type) {
case VIR_LOCK_MANAGER_OBJECT_TYPE_DOMAIN:
- for (i = 0 ; i < nparams ; i++) {
+ for (i = 0; i < nparams; i++) {
if (STREQ(params[i].key, "uuid")) {
memcpy(priv->uuid, params[i].value.uuid, VIR_UUID_BUFLEN);
} else if (STREQ(params[i].key, "name")) {
@@ -530,7 +530,7 @@ static char *virLockManagerLockDaemonDiskLeaseName(const char *path)
return NULL;
}
- for (i = 0 ; i < SHA256_DIGEST_SIZE ; i++) {
+ for (i = 0; i < SHA256_DIGEST_SIZE; i++) {
ret[i*2] = hex[(buf[i] >> 4) & 0xf];
ret[(i*2)+1] = hex[buf[i] & 0xf];
}
@@ -629,7 +629,7 @@ static int virLockManagerLockDaemonAddResource(virLockManagerPtr
lock,
size_t i;
char *path = NULL;
char *lockspace = NULL;
- for (i = 0 ; i < nparams ; i++) {
+ for (i = 0; i < nparams; i++) {
if (STREQ(params[i].key, "offset")) {
if (params[i].value.ul != 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@@ -725,7 +725,7 @@ static int virLockManagerLockDaemonAcquire(virLockManagerPtr lock,
if (!(flags & VIR_LOCK_MANAGER_ACQUIRE_REGISTER_ONLY)) {
size_t i;
- for (i = 0 ; i < priv->nresources ; i++) {
+ for (i = 0; i < priv->nresources; i++) {
virLockSpaceProtocolAcquireResourceArgs args;
memset(&args, 0, sizeof(args));
@@ -781,7 +781,7 @@ static int virLockManagerLockDaemonRelease(virLockManagerPtr lock,
if (!(client = virLockManagerLockDaemonConnect(lock, &program, &counter)))
goto cleanup;
- for (i = 0 ; i < priv->nresources ; i++) {
+ for (i = 0; i < priv->nresources; i++) {
virLockSpaceProtocolReleaseResourceArgs args;
memset(&args, 0, sizeof(args));
diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c
index eb15e29..de14725 100644
--- a/src/locking/lock_driver_sanlock.c
+++ b/src/locking/lock_driver_sanlock.c
@@ -540,7 +540,7 @@ static int virLockManagerSanlockDiskLeaseName(const char *path,
return -1;
}
- for (i = 0 ; i < MD5_DIGEST_SIZE ; i++) {
+ for (i = 0; i < MD5_DIGEST_SIZE; i++) {
str[i*2] = hex[(buf[i] >> 4) & 0xf];
str[(i*2)+1] = hex[buf[i] & 0xf];
}
@@ -1020,7 +1020,7 @@ static int virLockManagerSanlockAcquire(virLockManagerPtr lock,
VIR_DEBUG("Acquire completed fd=%d", sock);
if (res_free) {
- for (i = 0 ; i < res_count ; i++) {
+ for (i = 0; i < res_count; i++) {
VIR_FREE(res_args[i]);
}
VIR_FREE(res_args);
@@ -1033,7 +1033,7 @@ static int virLockManagerSanlockAcquire(virLockManagerPtr lock,
error:
if (res_free) {
- for (i = 0 ; i < res_count ; i++) {
+ for (i = 0; i < res_count; i++) {
VIR_FREE(res_args[i]);
}
VIR_FREE(res_args);
diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c
index 4cffc3f..7c30c6f 100644
--- a/src/locking/lock_manager.c
+++ b/src/locking/lock_manager.c
@@ -79,7 +79,7 @@ static void virLockManagerLogParams(size_t nparams,
{
int i;
char uuidstr[VIR_UUID_STRING_BUFLEN];
- for (i = 0 ; i < nparams ; i++) {
+ 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);
--
1.8.1.4
5 a.m.
New subject: [libvirt] [PATCH 29/31] src/*.[ch]: Remove the whitespace before "; "
---
src/libvirt-lxc.c | 2 +-
src/libvirt.c | 10 +++++-----
src/nodeinfo.c | 18 +++++++++---------
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/libvirt-lxc.c b/src/libvirt-lxc.c
index 6b4e995..f30b6c3 100644
--- a/src/libvirt-lxc.c
+++ b/src/libvirt-lxc.c
@@ -151,7 +151,7 @@ virDomainLxcEnterNamespace(virDomainPtr domain,
if (virProcessSetNamespaces(nfdlist, fdlist) < 0) {
if (oldfdlist && noldfdlist) {
- for (i = 0 ; i < *noldfdlist ; i++) {
+ for (i = 0; i < *noldfdlist; i++) {
VIR_FORCE_CLOSE((*oldfdlist)[i]);
}
VIR_FREE(*oldfdlist);
diff --git a/src/libvirt.c b/src/libvirt.c
index 4c018ec..b129611 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -150,7 +150,7 @@ static int virConnectAuthCallbackDefault(virConnectCredentialPtr
cred,
void *cbdata ATTRIBUTE_UNUSED) {
int i;
- for (i = 0 ; i < ncred ; i++) {
+ for (i = 0; i < ncred; i++) {
char buf[1024];
char *bufptr = buf;
size_t len;
@@ -820,7 +820,7 @@ int virStateInitialize(bool privileged,
if (virInitialize() < 0)
return -1;
- for (i = 0 ; i < virStateDriverTabCount ; i++) {
+ for (i = 0; i < virStateDriverTabCount; i++) {
if (virStateDriverTab[i]->stateInitialize) {
VIR_DEBUG("Running global init for %s state driver",
virStateDriverTab[i]->name);
@@ -846,7 +846,7 @@ int virStateInitialize(bool privileged,
int virStateCleanup(void) {
int i, ret = 0;
- for (i = 0 ; i < virStateDriverTabCount ; i++) {
+ for (i = 0; i < virStateDriverTabCount; i++) {
if (virStateDriverTab[i]->stateCleanup &&
virStateDriverTab[i]->stateCleanup() < 0)
ret = -1;
@@ -864,7 +864,7 @@ int virStateCleanup(void) {
int virStateReload(void) {
int i, ret = 0;
- for (i = 0 ; i < virStateDriverTabCount ; i++) {
+ for (i = 0; i < virStateDriverTabCount; i++) {
if (virStateDriverTab[i]->stateReload &&
virStateDriverTab[i]->stateReload() < 0)
ret = -1;
@@ -882,7 +882,7 @@ int virStateReload(void) {
int virStateStop(void) {
int i, ret = 0;
- for (i = 0 ; i < virStateDriverTabCount ; i++) {
+ for (i = 0; i < virStateDriverTabCount; i++) {
if (virStateDriverTab[i]->stateStop &&
virStateDriverTab[i]->stateStop())
ret = 1;
diff --git a/src/nodeinfo.c b/src/nodeinfo.c
index 7118a0f..d8375ab 100644
--- a/src/nodeinfo.c
+++ b/src/nodeinfo.c
@@ -1478,9 +1478,9 @@ nodeCapsInitNUMAFake(virCapsPtr caps ATTRIBUTE_UNUSED)
}
id = 0;
- for (s = 0 ; s < nodeinfo.sockets ; s++) {
- for (c = 0 ; c < nodeinfo.cores ; c++) {
- for (t = 0 ; t < nodeinfo.threads ; t++) {
+ for (s = 0; s < nodeinfo.sockets; s++) {
+ for (c = 0; c < nodeinfo.cores; c++) {
+ for (t = 0; t < nodeinfo.threads; t++) {
cpus[id].id = id;
cpus[id].socket_id = s;
cpus[id].core_id = c;
@@ -1502,7 +1502,7 @@ nodeCapsInitNUMAFake(virCapsPtr caps ATTRIBUTE_UNUSED)
return 0;
error:
- for (; id >= 0 ; id--)
+ for (; id >= 0; id--)
virBitmapFree(cpus[id].siblings);
VIR_FREE(cpus);
return -1;
@@ -1637,7 +1637,7 @@ nodeCapsInitNUMA(virCapsPtr caps)
goto cleanup;
memset(allonesmask, 0xff, mask_n_bytes);
- for (n = 0 ; n <= numa_max_node() ; n++) {
+ for (n = 0; n <= numa_max_node(); n++) {
int i;
/* The first time this returns -1, ENOENT if node doesn't exist... */
if (numa_node_to_cpus(n, mask, mask_n_bytes) < 0) {
@@ -1655,14 +1655,14 @@ nodeCapsInitNUMA(virCapsPtr caps)
/* Detect the amount of memory in the numa cell */
memory = nodeGetCellMemory(n);
- for (ncpus = 0, i = 0 ; i < max_n_cpus ; i++)
+ for (ncpus = 0, i = 0; i < max_n_cpus; i++)
if (MASK_CPU_ISSET(mask, i))
ncpus++;
if (VIR_ALLOC_N(cpus, ncpus) < 0)
goto cleanup;
- for (ncpus = 0, i = 0 ; i < max_n_cpus ; i++) {
+ for (ncpus = 0, i = 0; i < max_n_cpus; i++) {
if (MASK_CPU_ISSET(mask, i)) {
if (virNodeCapsFillCPUInfo(i, cpus + ncpus++) < 0) {
topology_failed = true;
@@ -1714,7 +1714,7 @@ nodeGetCellsFreeMemory(unsigned long long *freeMems,
if (lastCell > maxCell)
lastCell = maxCell;
- for (numCells = 0, n = startCell ; n <= lastCell ; n++) {
+ for (numCells = 0, n = startCell; n <= lastCell; n++) {
long long mem;
if (numa_node_size64(n, &mem) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
@@ -1740,7 +1740,7 @@ nodeGetFreeMemory(void)
return nodeGetFreeMemoryFake();
- for (n = 0 ; n <= numa_max_node() ; n++) {
+ for (n = 0; n <= numa_max_node(); n++) {
long long mem;
if (numa_node_size64(n, &mem) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
--
1.8.1.4
5:01 a.m.
New subject: [libvirt] [PATCH 30/31] nwfitler: Change the comment style
The more common habit is to add the comment after the statements.
---
src/nwfilter/nwfilter_dhcpsnoop.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c
index b9921e5..451c783 100644
--- a/src/nwfilter/nwfilter_dhcpsnoop.c
+++ b/src/nwfilter/nwfilter_dhcpsnoop.c
@@ -369,7 +369,7 @@ virNWFilterSnoopListAdd(virNWFilterSnoopIPLeasePtr plnew,
for (pl = *end; pl && plnew->timeout < pl->timeout;
pl = pl->prev)
- /* empty */ ;
+ ; /* empty */
if (!pl) {
plnew->next = *start;
@@ -526,7 +526,7 @@ virNWFilterSnoopIPLeaseGetByIP(virNWFilterSnoopIPLeasePtr start,
for (pl = start;
pl && !virSocketAddrEqual(&pl->ipAddress, ipaddr);
pl = pl->next)
- /* empty */ ;
+ ; /* empty */
return pl;
}
--
1.8.1.4
10:35 a.m.
New subject: [libvirt] [PATCH 30/31] nwfitler: Change the comment style
On 05/21/2013 04:01 AM, Osier Yang wrote:
The more common habit is to add the comment after the statements.
---
src/nwfilter/nwfilter_dhcpsnoop.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c
index b9921e5..451c783 100644
--- a/src/nwfilter/nwfilter_dhcpsnoop.c
+++ b/src/nwfilter/nwfilter_dhcpsnoop.c
@@ -369,7 +369,7 @@ virNWFilterSnoopListAdd(virNWFilterSnoopIPLeasePtr plnew,
for (pl = *end; pl && plnew->timeout < pl->timeout;
pl = pl->prev)
- /* empty */ ;
+ ; /* empty */
How did you determine which style was more common? Do you have 'git
grep | wc' numbers to back your claim? I guess putting the comment
after makes it easier to avoid false positives in patch 31?
I did notice a couple of empty while loops in earlier patches (let me
search for them again...)
found it: patch 8/31. Reply coming up there, soon.
ACK to all patches up to 30 where I didn't explicitly reply.
Weak ack to this one (I don't care if it goes in, but I also don't mind
if it gets omitted).
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
10:39 a.m.
New subject: [libvirt] [PATCH 30/31] nwfitler: Change the comment style
On 21/05/13 23:35, Eric Blake wrote:
On 05/21/2013 04:01 AM, Osier Yang wrote:
> The more common habit is to add the comment after the statements.
> ---
> src/nwfilter/nwfilter_dhcpsnoop.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c
> index b9921e5..451c783 100644
> --- a/src/nwfilter/nwfilter_dhcpsnoop.c
> +++ b/src/nwfilter/nwfilter_dhcpsnoop.c
> @@ -369,7 +369,7 @@ virNWFilterSnoopListAdd(virNWFilterSnoopIPLeasePtr plnew,
>
> for (pl = *end; pl && plnew->timeout < pl->timeout;
> pl = pl->prev)
> - /* empty */ ;
> + ; /* empty */
How did you determine which style was more common? Do you have 'git
grep | wc' numbers to back your claim? I guess putting the comment
after makes it easier to avoid false positives in patch 31?
Yes, you are right. :-)
As far I saw when writing the script to exclude the empty statements,
all other comments for an empty statements are after ";"
I did notice a couple of empty while loops in earlier patches (let me
search for them again...)
found it: patch 8/31. Reply coming up there, soon.
ACK to all patches up to 30 where I didn't explicitly reply.
Pushed 1 to 30. Thanks.
Weak ack to this one (I don't care if it goes in, but I also don't mind
if it gets omitted).
I leave this one for more opinion, if there is no more opinion till
tomorrow, will push it.
10:41 a.m.
New subject: [libvirt] [PATCH 30/31] nwfitler: Change the comment style
s/nwfitler/nwfilter/ in the subject
Jan
5:01 a.m.
New subject: [libvirt] [PATCH 31/31] syntax-check: Add the rule to forbid whitespace before "; "
Only a few cases are allowed:
1) The expression is empty for "for" loop, E.g.
for (i = 0; ; i++)
2) An empty statement
while (write(statuswrite, &status, 1) == -1 &&
errno == EINTR)
; /* empty */
3) ";" is inside double-quote, I.e, as part of const string. E.g.
vshPrint(ctl, "a ; b ; cd;\n");
The "for" loop in src/rpc/virnettlscontext.c is the special case,
1) applies for it, so change it together in this patch.
---
build-aux/bracket-spacing.pl | 18 ++++++++++++++++++
src/rpc/virnettlscontext.c | 2 +-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/build-aux/bracket-spacing.pl b/build-aux/bracket-spacing.pl
index d3a916f..0d5d2ed 100755
--- a/build-aux/bracket-spacing.pl
+++ b/build-aux/bracket-spacing.pl
@@ -109,6 +109,24 @@ foreach my $file (@ARGV) {
$ret = 1;
last;
}
+
+ # Forbid whitespace before ";". Things like below are allowed:
+ #
+ # for (i = 0; ; i++)
+ #
+ # while (write(statuswrite, &status, 1) == -1 &&
+ # errno == EINTR)
+ # ;
+ #
+ # printf("%s", "a ; b\n");
+ while ($data =~ /[^;\s]\s+;/) {
+ # Inside the double-quote
+ if ($data !~ /"[^"]*\s;/) {
+ print "$file:$.: $line";
+ $ret = 1;
+ }
+ last;
+ }
}
close FILE;
}
diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c
index 1a7ccb8..305eee9 100644
--- a/src/rpc/virnettlscontext.c
+++ b/src/rpc/virnettlscontext.c
@@ -292,7 +292,7 @@ static int virNetTLSContextCheckCertKeyPurpose(gnutls_x509_crt_t
cert,
bool allowClient = false, allowServer = false;
critical = 0;
- for (i = 0 ; ; i++) {
+ for (i = 0; ; i++) {
size = 0;
status = gnutls_x509_crt_get_key_purpose_oid(cert, i, buffer, &size, NULL);
--
1.8.1.4
10:40 a.m.
New subject: [libvirt] [PATCH 31/31] syntax-check: Add the rule to forbid whitespace before "; "
On 05/21/2013 04:01 AM, Osier Yang wrote:
Only a few cases are allowed:
1) The expression is empty for "for" loop, E.g.
for (i = 0; ; i++)
2) An empty statement
while (write(statuswrite, &status, 1) == -1 &&
errno == EINTR)
; /* empty */
3) ";" is inside double-quote, I.e, as part of const string. E.g.
vshPrint(ctl, "a ; b ; cd;\n");
The "for" loop in src/rpc/virnettlscontext.c is the special case,
1) applies for it, so change it together in this patch.
---
build-aux/bracket-spacing.pl | 18 ++++++++++++++++++
src/rpc/virnettlscontext.c | 2 +-
2 files changed, 19 insertions(+), 1 deletion(-)
ACK.
diff --git a/build-aux/bracket-spacing.pl b/build-aux/bracket-spacing.pl
index d3a916f..0d5d2ed 100755
--- a/build-aux/bracket-spacing.pl
+++ b/build-aux/bracket-spacing.pl
@@ -109,6 +109,24 @@ foreach my $file (@ARGV) {
$ret = 1;
last;
}
+
+ # Forbid whitespace before ";". Things like below are allowed:
+ #
+ # for (i = 0; ; i++)
+ #
+ # while (write(statuswrite, &status, 1) == -1 &&
+ # errno == EINTR)
+ # ;
+ #
+ # printf("%s", "a ; b\n");
+ while ($data =~ /[^;\s]\s+;/) {
+ # Inside the double-quote
+ if ($data !~ /"[^"]*\s;/) {
False negative on:
for (str = "foo" ; *str; str++)
but I don't think we are likely to iterate over bytes of a string
literal, so I'm not too worried about it.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
12:33 a.m.
New subject: [libvirt] [PATCH 31/31] syntax-check: Add the rule to forbid whitespace before "; "
On 21/05/13 23:40, Eric Blake wrote:
On 05/21/2013 04:01 AM, Osier Yang wrote:
> Only a few cases are allowed:
>
> 1) The expression is empty for "for" loop, E.g.
>
> for (i = 0; ; i++)
>
> 2) An empty statement
>
> while (write(statuswrite, &status, 1) == -1 &&
> errno == EINTR)
> ; /* empty */
>
> 3) ";" is inside double-quote, I.e, as part of const string. E.g.
>
> vshPrint(ctl, "a ; b ; cd;\n");
>
> The "for" loop in src/rpc/virnettlscontext.c is the special case,
> 1) applies for it, so change it together in this patch.
> ---
> build-aux/bracket-spacing.pl | 18 ++++++++++++++++++
> src/rpc/virnettlscontext.c | 2 +-
> 2 files changed, 19 insertions(+), 1 deletion(-)
ACK.
Pushed.
4202
days inactive
4203
days old
42 comments
3 participants
participants (3)
-
Eric Blake -
Ján Tomko -
Osier Yang