Commit fc05ea89 authored by Roger Pau Monne's avatar Roger Pau Monne Committed by Juergen Gross
Browse files

x86/xen: move xen_reserve_extra_memory() 



In preparation for making the function static.

No functional change.

Signed-off-by: default avatarRoger Pau Monné <roger.pau@citrix.com>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Message-ID: <20240725073116.14626-2-roger.pau@citrix.com>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
parent 368990a7

arch/x86/xen/enlighten_pvh.c

+48 −48
Original line number Diff line number Diff line
@@ -27,54 +27,6 @@ 
bool __ro_after_init xen_pvh;

EXPORT_SYMBOL_GPL(xen_pvh);



void __init xen_pvh_init(struct boot_params *boot_params)

{

	u32 msr;

	u64 pfn;



	xen_pvh = 1;

	xen_domain_type = XEN_HVM_DOMAIN;

	xen_start_flags = pvh_start_info.flags;



	msr = cpuid_ebx(xen_cpuid_base() + 2);

	pfn = __pa(hypercall_page);

	wrmsr_safe(msr, (u32)pfn, (u32)(pfn >> 32));



	if (xen_initial_domain())

		x86_init.oem.arch_setup = xen_add_preferred_consoles;

	x86_init.oem.banner = xen_banner;



	xen_efi_init(boot_params);



	if (xen_initial_domain()) {

		struct xen_platform_op op = {

			.cmd = XENPF_get_dom0_console,

		};

		int ret = HYPERVISOR_platform_op(&op);



		if (ret > 0)

			xen_init_vga(&op.u.dom0_console,

				     min(ret * sizeof(char),

					 sizeof(op.u.dom0_console)),

				     &boot_params->screen_info);

	}

}



void __init mem_map_via_hcall(struct boot_params *boot_params_p)

{

	struct xen_memory_map memmap;

	int rc;



	memmap.nr_entries = ARRAY_SIZE(boot_params_p->e820_table);

	set_xen_guest_handle(memmap.buffer, boot_params_p->e820_table);

	rc = HYPERVISOR_memory_op(XENMEM_memory_map, &memmap);

	if (rc) {

		xen_raw_printk("XENMEM_memory_map failed (%d)\n", rc);

		BUG();

	}

	boot_params_p->e820_entries = memmap.nr_entries;

}



/*

 * Reserve e820 UNUSABLE regions to inflate the memory balloon.

 *
@@ -141,3 +93,51 @@ void __init xen_reserve_extra_memory(struct boot_params *bootp) 
		xen_add_extra_mem(PFN_UP(e->addr), pages);

	}

}



void __init xen_pvh_init(struct boot_params *boot_params)

{

	u32 msr;

	u64 pfn;



	xen_pvh = 1;

	xen_domain_type = XEN_HVM_DOMAIN;

	xen_start_flags = pvh_start_info.flags;



	msr = cpuid_ebx(xen_cpuid_base() + 2);

	pfn = __pa(hypercall_page);

	wrmsr_safe(msr, (u32)pfn, (u32)(pfn >> 32));



	if (xen_initial_domain())

		x86_init.oem.arch_setup = xen_add_preferred_consoles;

	x86_init.oem.banner = xen_banner;



	xen_efi_init(boot_params);



	if (xen_initial_domain()) {

		struct xen_platform_op op = {

			.cmd = XENPF_get_dom0_console,

		};

		int ret = HYPERVISOR_platform_op(&op);



		if (ret > 0)

			xen_init_vga(&op.u.dom0_console,

				     min(ret * sizeof(char),

					 sizeof(op.u.dom0_console)),

				     &boot_params->screen_info);

	}

}



void __init mem_map_via_hcall(struct boot_params *boot_params_p)

{

	struct xen_memory_map memmap;

	int rc;



	memmap.nr_entries = ARRAY_SIZE(boot_params_p->e820_table);

	set_xen_guest_handle(memmap.buffer, boot_params_p->e820_table);

	rc = HYPERVISOR_memory_op(XENMEM_memory_map, &memmap);

	if (rc) {

		xen_raw_printk("XENMEM_memory_map failed (%d)\n", rc);

		BUG();

	}

	boot_params_p->e820_entries = memmap.nr_entries;

}