[Xen-devel] [PATCH][TOOL] Fix infinite loop in xenconsoled

[Kouya Shimura <kouya@xxxxxxxxxxxxxx>]

xenconsoled hungs when domid=(DOMID_FIRST_RESERVED-1).
(i.e. domid + 1 == DOMID_SELF)
Attached patch fixes it.

Thanks,
Kouya

Signed-off-by: Kouya Shimura <kouya@xxxxxxxxxxxxxx>

diff -r 7953164cebb6 tools/console/daemon/io.c
--- a/tools/console/daemon/io.c Tue Aug 07 09:07:29 2007 +0100
+++ b/tools/console/daemon/io.c Tue Aug 14 15:36:23 2007 +0900
@@ -569,6 +569,8 @@ void enum_domains(void)
                                create_domain(dominfo.domid);
                }
                domid = dominfo.domid + 1;
+               if (domid >= DOMID_FIRST_RESERVED)
+                       break;
        }
 }
 
diff -r 7953164cebb6 tools/libxc/xc_domain.c
--- a/tools/libxc/xc_domain.c   Tue Aug 07 09:07:29 2007 +0100
+++ b/tools/libxc/xc_domain.c   Tue Aug 14 15:36:23 2007 +0900
@@ -205,6 +205,10 @@ int xc_domain_getinfo(int xc_handle,
                sizeof(xen_domain_handle_t));
 
         next_domid = (uint16_t)domctl.domain + 1;
+        if (next_domid >= DOMID_FIRST_RESERVED) {
+            nr_doms++;
+            break;
+        }
         info++;
     }
 

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel