>>> On 30.11.16 at 17:49, <roger....@citrix.com> wrote: > @@ -176,6 +177,8 @@ unsigned int __init dom0_max_vcpus(void) > max_vcpus = opt_dom0_max_vcpus_max; > if ( max_vcpus > MAX_VIRT_CPUS ) > max_vcpus = MAX_VIRT_CPUS; > + if ( dom0_hvm ) > + max_vcpus = min_t(typeof(max_vcpus), max_vcpus, HVM_MAX_VCPUS);
I don't see the need for min_t() here - just follow the code right before your addition: if ( dom0_hvm && max_vcpus > HVM_MAX_VCPUS ) max_vcpus = HVM_MAX_VCPUS; > --- a/xen/arch/x86/setup.c > +++ b/xen/arch/x86/setup.c > @@ -193,7 +193,7 @@ static void __init parse_acpi_param(char *s) > * - hvm Create a PVHv2 Dom0. > * - shadow Use shadow paging for Dom0. > */ > -static bool __initdata dom0_hvm; > +bool __initdata dom0_hvm; > static void __init parse_dom0_param(char *s) > { > char *ss; > --- a/xen/include/asm-x86/setup.h > +++ b/xen/include/asm-x86/setup.h > @@ -63,4 +63,6 @@ extern bool opt_dom0_shadow; > #define opt_dom0_shadow 0 > #endif > > +extern bool dom0_hvm; One more argument to move the command ling option parsing to domain_build.c. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel