From mboxrd@z Thu Jan  1 00:00:00 1970
From: MINAI Katsuhito <minai@jp.fujitsu.com>
Subject: [PATCH] boot failes when strange value is specified for
	dom0_max_vcpus
Date: Thu, 31 Aug 2006 14:05:09 +0900
Message-ID: <20060831133221.3018.MINAI@jp.fujitsu.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="US-ASCII"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

Hi,

This patch corrects the following bug. 

The startup of Xen fails when the following values are specified
for boot option dom0_max_vcpus. 

- Value more than number of physical CPU
- Negative value


Signed-off-by: Katsuhito Minai <minai@jp.fujitsu.com>


diff -r f790546ecfda xen/arch/x86/domain_build.c
--- a/xen/arch/x86/domain_build.c	Mon Aug 28 20:22:56 2006 +0100
+++ b/xen/arch/x86/domain_build.c	Tue Aug 29 17:48:30 2006 +0900
@@ -671,6 +671,8 @@ int construct_dom0(struct domain *d,
 
     if ( opt_dom0_max_vcpus == 0 )
         opt_dom0_max_vcpus = num_online_cpus();
+    if ( opt_dom0_max_vcpus > num_online_cpus() )
+        opt_dom0_max_vcpus = num_online_cpus();
     if ( opt_dom0_max_vcpus > MAX_VIRT_CPUS )
         opt_dom0_max_vcpus = MAX_VIRT_CPUS;
     printk("Dom0 has maximum %u VCPUs\n", opt_dom0_max_vcpus);


Best regards,
Minai