x86/boot: Rename dom0_{pvh,verbose} variables to have an opt_ prefix

For consistency with other command line options.

No functional change.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/arch/x86/dom0_build.c b/xen/arch/x86/dom0_build.c
index 73f5407b0d361756220c0d7a19ebac3ab477c638..27315d5bd269f36b3dd2e74e14fbf39c95132697 100644 (file)
--- a/xen/arch/x86/dom0_build.c
+++ b/xen/arch/x86/dom0_build.c
@@ -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;
 

diff --git a/xen/arch/x86/hvm/dom0_build.c b/xen/arch/x86/hvm/dom0_build.c
index aa599f09ef7615959eab34d7a2b423d2f738aa7c..8845399ae9f1d89d4648cbb53913f48046123807 100644 (file)
--- a/xen/arch/x86/hvm/dom0_build.c
+++ b/xen/arch/x86/hvm/dom0_build.c
@@ -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;

diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index 9566b1d176de187cf7ea853eb37d36f0a08b1cd0..0ed94a613a4fc334498dc58bf4b30bc834af6e65 100644 (file)
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -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) ?

diff --git a/xen/include/asm-x86/setup.h b/xen/include/asm-x86/setup.h
index bb4c38567c68837e1a8c2a9b610f6517ede0ccb0..15d6363022374da6f38a208722ee8b4bf6245a96 100644 (file)
--- a/xen/include/asm-x86/setup.h
+++ b/xen/include/asm-x86/setup.h
@@ -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)