diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 2fda634f21..cc6e486733 100644
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -223,8 +223,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) &&
@@ -2622,7 +2622,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 e33610da80..3c7a8cd5b6 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 fa21717529..3d3709483b 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -2390,7 +2390,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;
@@ -2639,7 +2639,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 e2b5e48ab8..5df3248544 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 39a43febe6..092d92def2 100644
--- a/src/xen/xm_internal.c
+++ b/src/xen/xm_internal.c
@@ -1355,7 +1355,7 @@ xenXMDomainDetachDeviceFlags(virConnectPtr conn,
     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)) {
@@ -1374,7 +1374,7 @@ xenXMDomainDetachDeviceFlags(virConnectPtr conn,
 
     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 496c30bd74..712ee821e8 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;