From e1037b514598d02f7c90b9e67c8b634b67cf2cdc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roger=20Pau=20Monn=C3=A9?= Date: Mon, 13 Feb 2017 15:23:34 +0100 Subject: [PATCH] x86/PVHv2: fix dom0_max_vcpus so it's capped to HVM_MAX_VCPUS for PVHv2 Dom0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit PVHv2 Dom0 is limited to 128 vCPUs, as are all HVM guests at the moment. Fix dom0_max_vcpus so it takes this limitation into account. Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/domain_build.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index 71239318b0..0134428e4b 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -38,6 +38,7 @@ #include #include +#include static long __initdata dom0_nrpages; static long __initdata dom0_min_nrpages; @@ -149,7 +150,7 @@ static nodemask_t __initdata dom0_nodes; unsigned int __init dom0_max_vcpus(void) { - unsigned int i, max_vcpus; + unsigned int i, max_vcpus, limit; nodeid_t node; for ( i = 0; i < dom0_nr_pxms; ++i ) @@ -169,8 +170,9 @@ unsigned int __init dom0_max_vcpus(void) max_vcpus = opt_dom0_max_vcpus_min; if ( opt_dom0_max_vcpus_max < max_vcpus ) max_vcpus = opt_dom0_max_vcpus_max; - if ( max_vcpus > MAX_VIRT_CPUS ) - max_vcpus = MAX_VIRT_CPUS; + limit = dom0_pvh ? HVM_MAX_VCPUS : MAX_VIRT_CPUS; + if ( max_vcpus > limit ) + max_vcpus = limit; return max_vcpus; } -- 2.30.2