From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Date: Thu, 9 Apr 2015 20:38:43 +0000 (-0400)
Subject: x86/dom0: Don't allow dom0_max_vcpus to be zero
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~3451
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c5e64ba6152309b770487bf143f2e49af45f9257;p=xen.git

x86/dom0: Don't allow dom0_max_vcpus to be zero

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>
---

diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c
index e5c845c3f5..378e6503eb 100644
--- a/xen/arch/x86/domain_build.c
+++ b/xen/arch/x86/domain_build.c
@@ -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 */