Commit 9963236d authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Juergen Gross
Browse files

x86/xen: split suspend.c for PV and PVHVM guests 



Slit the code in suspend.c into suspend_pv.c and suspend_hvm.c.

Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
parent 7e0563de

arch/x86/xen/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ obj-y := enlighten.o setup.o multicalls.o mmu.o irq.o \ 
			grant-table.o suspend.o platform-pci-unplug.o \

			p2m.o apic.o pmu.o enlighten_pv.o mmu_pv.o



obj-$(CONFIG_XEN_PVHVM)		+= enlighten_hvm.o mmu_hvm.o

obj-$(CONFIG_XEN_PVHVM)		+= enlighten_hvm.o mmu_hvm.o suspend_hvm.o

obj-$(CONFIG_XEN_PV)			+= suspend_pv.o

obj-$(CONFIG_XEN_PVH)			+= enlighten_pvh.o



obj-$(CONFIG_EVENT_TRACING) += trace.o

arch/x86/xen/suspend.c

+0 −54
Original line number Diff line number Diff line
@@ -14,60 +14,6 @@ 
#include "mmu.h"

#include "pmu.h"



static void xen_pv_pre_suspend(void)

{

	xen_mm_pin_all();



	xen_start_info->store_mfn = mfn_to_pfn(xen_start_info->store_mfn);

	xen_start_info->console.domU.mfn =

		mfn_to_pfn(xen_start_info->console.domU.mfn);



	BUG_ON(!irqs_disabled());



	HYPERVISOR_shared_info = &xen_dummy_shared_info;

	if (HYPERVISOR_update_va_mapping(fix_to_virt(FIX_PARAVIRT_BOOTMAP),

					 __pte_ma(0), 0))

		BUG();

}



static void xen_hvm_post_suspend(int suspend_cancelled)

{

#ifdef CONFIG_XEN_PVHVM

	int cpu;

	if (!suspend_cancelled)

	    xen_hvm_init_shared_info();

	xen_callback_vector();

	xen_unplug_emulated_devices();

	if (xen_feature(XENFEAT_hvm_safe_pvclock)) {

		for_each_online_cpu(cpu) {

			xen_setup_runstate_info(cpu);

		}

	}

#endif

}



static void xen_pv_post_suspend(int suspend_cancelled)

{

	xen_build_mfn_list_list();



	xen_setup_shared_info();



	if (suspend_cancelled) {

		xen_start_info->store_mfn =

			pfn_to_mfn(xen_start_info->store_mfn);

		xen_start_info->console.domU.mfn =

			pfn_to_mfn(xen_start_info->console.domU.mfn);

	} else {

#ifdef CONFIG_SMP

		BUG_ON(xen_cpu_initialized_map == NULL);

		cpumask_copy(xen_cpu_initialized_map, cpu_online_mask);

#endif

		xen_vcpu_restore();

	}



	xen_mm_unpin_all();

}



void xen_arch_pre_suspend(void)

{

	if (xen_pv_domain())

arch/x86/xen/suspend_hvm.c

0 → 100644
+22 −0
Original line number Diff line number Diff line 
#include <linux/types.h>



#include <xen/xen.h>

#include <xen/features.h>

#include <xen/interface/features.h>



#include "xen-ops.h"



void xen_hvm_post_suspend(int suspend_cancelled)

{

	int cpu;



	if (!suspend_cancelled)

		xen_hvm_init_shared_info();

	xen_callback_vector();

	xen_unplug_emulated_devices();

	if (xen_feature(XENFEAT_hvm_safe_pvclock)) {

		for_each_online_cpu(cpu) {

			xen_setup_runstate_info(cpu);

		}

	}

}

arch/x86/xen/suspend_pv.c

0 → 100644
+46 −0
Original line number Diff line number Diff line 
#include <linux/types.h>



#include <asm/fixmap.h>



#include <asm/xen/hypercall.h>

#include <asm/xen/page.h>



#include "xen-ops.h"



void xen_pv_pre_suspend(void)

{

	xen_mm_pin_all();



	xen_start_info->store_mfn = mfn_to_pfn(xen_start_info->store_mfn);

	xen_start_info->console.domU.mfn =

		mfn_to_pfn(xen_start_info->console.domU.mfn);



	BUG_ON(!irqs_disabled());



	HYPERVISOR_shared_info = &xen_dummy_shared_info;

	if (HYPERVISOR_update_va_mapping(fix_to_virt(FIX_PARAVIRT_BOOTMAP),

					 __pte_ma(0), 0))

		BUG();

}



void xen_pv_post_suspend(int suspend_cancelled)

{

	xen_build_mfn_list_list();



	xen_setup_shared_info();



	if (suspend_cancelled) {

		xen_start_info->store_mfn =

			pfn_to_mfn(xen_start_info->store_mfn);

		xen_start_info->console.domU.mfn =

			pfn_to_mfn(xen_start_info->console.domU.mfn);

	} else {

#ifdef CONFIG_SMP

		BUG_ON(xen_cpu_initialized_map == NULL);

		cpumask_copy(xen_cpu_initialized_map, cpu_online_mask);

#endif

		xen_vcpu_restore();

	}



	xen_mm_unpin_all();

}

arch/x86/xen/xen-ops.h

+13 −0
Original line number Diff line number Diff line
@@ -155,5 +155,18 @@ void xen_pin_vcpu(int cpu); 


void xen_reboot(int reason);

void xen_emergency_restart(void);

#ifdef CONFIG_XEN_PV

void xen_pv_pre_suspend(void);

void xen_pv_post_suspend(int suspend_cancelled);

#else

static inline void xen_pv_pre_suspend(void) {}

static inline void xen_pv_post_suspend(int suspend_cancelled) {}

#endif



#ifdef CONFIG_XEN_PVHVM

void xen_hvm_post_suspend(int suspend_cancelled);

#else

static inline void xen_hvm_post_suspend(int suspend_cancelled) {}

#endif



#endif /* XEN_OPS_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE