@@ -261,7 +261,7 @@ 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;
- limit = dom0_pvh ? HVM_MAX_VCPUS : MAX_VIRT_CPUS;
+ limit = opt_dom0_pvh ? HVM_MAX_VCPUS : MAX_VIRT_CPUS;
if ( max_vcpus > limit )
max_vcpus = limit;
@@ -280,8 +280,8 @@ struct vcpu *__init alloc_dom0_vcpu0(struct domain *dom0)
#ifdef CONFIG_SHADOW_PAGING
bool __initdata opt_dom0_shadow;
#endif
-bool __initdata dom0_pvh = !IS_ENABLED(CONFIG_PV);
-bool __initdata dom0_verbose;
+bool __initdata opt_dom0_pvh = !IS_ENABLED(CONFIG_PV);
+bool __initdata opt_dom0_verbose;
static int __init parse_dom0_param(const char *s)
{
@@ -296,15 +296,15 @@ static int __init parse_dom0_param(const char *s)
ss = strchr(s, '\0');
if ( IS_ENABLED(CONFIG_PV) && !cmdline_strcmp(s, "pv") )
- dom0_pvh = false;
+ opt_dom0_pvh = false;
else if ( IS_ENABLED(CONFIG_HVM) && !cmdline_strcmp(s, "pvh") )
- dom0_pvh = true;
+ opt_dom0_pvh = true;
#ifdef CONFIG_SHADOW_PAGING
else if ( (val = parse_boolean("shadow", s, ss)) >= 0 )
opt_dom0_shadow = val;
#endif
else if ( (val = parse_boolean("verbose", s, ss)) >= 0 )
- dom0_verbose = val;
+ opt_dom0_verbose = val;
else
rc = -EINVAL;
@@ -484,7 +484,7 @@ static int __init pvh_populate_p2m(struct domain *d)
return rc;
}
- if ( dom0_verbose )
+ if ( opt_dom0_verbose )
print_order_stats(d);
return 0;
@@ -1713,7 +1713,7 @@ void __init noreturn __start_xen(unsigned long mbi_p)
init_guest_cpuid();
init_guest_msr_policy();
- if ( dom0_pvh )
+ if ( opt_dom0_pvh )
{
dom0_cfg.flags |= (XEN_DOMCTL_CDF_hvm_guest |
((hvm_hap_supported() && !opt_dom0_shadow) ?
@@ -64,8 +64,8 @@ extern bool opt_dom0_shadow;
#else
#define opt_dom0_shadow false
#endif
-extern bool dom0_pvh;
-extern bool dom0_verbose;
+extern bool opt_dom0_pvh;
+extern bool opt_dom0_verbose;
#define max_init_domid (0)
For consistency with other command line options. No functional change. Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> --- CC: Jan Beulich <JBeulich@suse.com> CC: Wei Liu <wei.liu2@citrix.com> CC: Roger Pau Monné <roger.pau@citrix.com> --- xen/arch/x86/dom0_build.c | 12 ++++++------ xen/arch/x86/hvm/dom0_build.c | 2 +- xen/arch/x86/setup.c | 2 +- xen/include/asm-x86/setup.h | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-)