xen: cleanup pvh leftovers from pv-only sources
Subsystems (2)
Juergen Gross
maintainerPATCH 1/1 xen: cleanup pvh leftovers from pv-only sources
There are some leftovers testing for pvh guest mode in pv-only source files. Remove them.
Signed-off-by Juergen Gross <[email protected]>
--- arch/x86/xen/enlighten_pv.c | 15 ++----- arch/x86/xen/mmu_pv.c | 98 +++++++++++++++++---------------------------- 2 files changed, 40 insertions(+), 73 deletions(-)
arch/x86/xen/enlighten_pv.c +4 -11
@@ -142,9 +142,7 @@ static void __init xen_banner(void)struct xen_extraversion extra;HYPERVISOR_xen_version (XENVER_extraversion, &extra); -pr_info ("Booting paravirtualized kernel %son %s\n" , -xen_feature (XENFEAT_auto_translated_physmap) ? -"with PVH extensions " :"" , pv_info.name); +pr_info ("Booting paravirtualized kernel on %s\n" , pv_info.name);printk (KERN_INFO "Xen version: %d.%d%s%s\n" , version >>16 , version &0xffff , extra.extraversion,xen_feature (XENFEAT_mmu_pt_update_preserve_ad) ?" (preserve-AD)" :"" );
@@ -957,15 +955,10 @@ static void xen_write_msr(unsigned int msr, unsigned low, unsigned high)void xen_setup_shared_info (void ) { -if (!xen_feature (XENFEAT_auto_translated_physmap)) { -set_fixmap (FIX_PARAVIRT_BOOTMAP , - xen_start_info->shared_info); +set_fixmap (FIX_PARAVIRT_BOOTMAP , xen_start_info->shared_info); - HYPERVISOR_shared_info = - (struct shared_info *)fix_to_virt (FIX_PARAVIRT_BOOTMAP ); - }else - HYPERVISOR_shared_info = - (struct shared_info *)__va (xen_start_info->shared_info); + HYPERVISOR_shared_info = + (struct shared_info *)fix_to_virt (FIX_PARAVIRT_BOOTMAP );#ifndef CONFIG_SMP /* In UP this is as good a place as any to set up shared info */
arch/x86/xen/mmu_pv.c +36 -62
163 lines not on this page · raw message
Signature · 1 line
2.12.0
Quoted 4 lines · Juergen Gross
There are some leftovers testing for pvh guest mode in pv-only source files. Remove them.
Signed-off-by Juergen Gross <[email protected]>
Reviewed-by Boris Ostrovsky <[email protected]>
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel