]> xenbits.xensource.com Git - people/pauldu/xen.git/commitdiff
x86/dom0: Don't allow dom0_max_vcpus to be zero
authorBoris Ostrovsky <boris.ostrovsky@oracle.com>
Thu, 9 Apr 2015 20:38:43 +0000 (16:38 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 10 Apr 2015 15:35:52 +0000 (11:35 -0400)
In case dom0_max_vcpus is incorrectly specified on boot line make sure
we will still boot.

Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
xen/arch/x86/domain_build.c

index e5c845c3f50bc57d8dd5e9e8fd19d04d8f5dfc0e..378e6503eb71955686c7a1a53da99fd476456621 100644 (file)
@@ -92,6 +92,8 @@ static void __init parse_dom0_max_vcpus(const char *s)
     else                               /* N, N-, or N-M */
     {
         opt_dom0_max_vcpus_min = simple_strtoul(s, &s, 0);
+        if ( opt_dom0_max_vcpus_min == 0 )
+            opt_dom0_max_vcpus_min = 1;
         if ( !*s )                    /* N */
             opt_dom0_max_vcpus_max = opt_dom0_max_vcpus_min;
         else if ( *s++ == '-' && *s ) /* N-M */