OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/i386/xen: Rename X86/PC specific function as xen_hvm_init_pc()

Browse Source 
xen_hvm_init() is only meanful to initialize a X86/PC machine,
rename it as xen_hvm_init_pc().

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200908155530.249806-3-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2020-09-08 17:55:26 +02:00 committed by Paolo Bonzini
parent 9cb54b18e8
commit 5650ac00d7
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accel/stubs/xen-stub.c
View File

@ -46,7 +46,7 @@ void xen_register_framebuffer(MemoryRegion *mr)
{
}
void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory)
void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory)
{
}

6
hw/i386/pc_piix.c
View File

@ -117,8 +117,8 @@ static void pc_init1(MachineState *machine,
* so legacy non-PAE guests can get as much memory as possible in
* the 32bit address space below 4G.
*
* - Note that Xen has its own ram setp code in xen_ram_init(),
* called via xen_hvm_init().
* - Note that Xen has its own ram setup code in xen_ram_init(),
* called via xen_hvm_init_pc().
*
* Examples:
* qemu -M pc-1.7 -m 4G (old default) -> 3584M low, 512M high
@ -127,7 +127,7 @@ static void pc_init1(MachineState *machine,
* qemu -M pc,max-ram-below-4g=4G -m 3968M -> 3968M low (=4G-128M)
*/
if (xen_enabled()) {
xen_hvm_init(pcms, &ram_memory);
xen_hvm_init_pc(pcms, &ram_memory);
} else {
if (!pcms->max_ram_below_4g) {
pcms->max_ram_below_4g = 0xe0000000; /* default: 3.5G */

2
hw/i386/xen/xen-hvm.c
View File

@ -1395,7 +1395,7 @@ static int xen_map_ioreq_server(XenIOState *state)
return 0;
}
void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory)
void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory)
{
MachineState *ms = MACHINE(pcms);
unsigned int max_cpus = ms->smp.max_cpus;

2
include/hw/xen/xen.h
View File

@ -30,7 +30,7 @@ qemu_irq *xen_interrupt_controller_init(void);
void xenstore_store_pv_console_info(int i, struct Chardev *chr);
void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory);
void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory);
void xen_register_framebuffer(struct MemoryRegion *mr);