From aa25a619d37b332446cb93828f9ac26160fa239d Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 26 Jun 2012 16:23:54 +0100 Subject: [PATCH] arm: do not set max_vcpus = 8 in arch_domain_create. XEN_DOMCTL_max_vcpus cannot reduce max_vcpus and therefore we can't create a smaller guest. The limit of 8 (due to GIC limits) should be expressed in MAX_VIRT_CPUS. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Committed-by: Ian Campbell --- xen/arch/arm/domain.c | 2 -- xen/include/asm-arm/config.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 2c3fc90139..63bad075f6 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -212,8 +212,6 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) goto fail; } - d->max_vcpus = 8; - if ( (rc = domain_vgic_init(d)) != 0 ) goto fail; diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 91e87e1571..7d02cc7385 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -27,7 +27,7 @@ #define NR_CPUS 128 #endif -#define MAX_VIRT_CPUS 128 /* XXX */ +#define MAX_VIRT_CPUS 8 #define MAX_HVM_VCPUS MAX_VIRT_CPUS #define asmlinkage /* Nothing needed */ -- 2.30.2