diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2012-06-26 16:23:54 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2012-06-26 16:23:54 +0100 |
| commit | aa25a619d37b332446cb93828f9ac26160fa239d (patch) | |
| tree | d694e592400968877ee832187f4b69ed8f185c5a | |
| parent | 400b3acd20cac38502bc2652630a40aacfe47a25 (diff) | |
| download | xen-aa25a619d37b332446cb93828f9ac26160fa239d.tar.gz xen-aa25a619d37b332446cb93828f9ac26160fa239d.tar.bz2 xen-aa25a619d37b332446cb93828f9ac26160fa239d.zip | |
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 <ian.campbell@citrix.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
| -rw-r--r-- | xen/arch/arm/domain.c | 2 | ||||
| -rw-r--r-- | xen/include/asm-arm/config.h | 2 |
2 files changed, 1 insertions, 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 */ |