[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 2/6] hw/i386/xen: Rename X86/PC specific function as xen_hvm_i
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 2/6] hw/i386/xen: Rename X86/PC specific function as xen_hvm_init_pc() |
Date: |
Tue, 8 Sep 2020 17:55:26 +0200 |
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>
---
include/hw/xen/xen.h | 2 +-
accel/stubs/xen-stub.c | 2 +-
hw/i386/pc_piix.c | 6 +++---
hw/i386/xen/xen-hvm.c | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h
index 771dd447f2b..b2b459964cb 100644
--- a/include/hw/xen/xen.h
+++ b/include/hw/xen/xen.h
@@ -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);
diff --git a/accel/stubs/xen-stub.c b/accel/stubs/xen-stub.c
index 8ae658acff5..fa3dddbce57 100644
--- a/accel/stubs/xen-stub.c
+++ b/accel/stubs/xen-stub.c
@@ -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)
{
}
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 32b1453e6a8..3e008bb0b1a 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -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 */
diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
index cde981bad66..49748cda3fb 100644
--- a/hw/i386/xen/xen-hvm.c
+++ b/hw/i386/xen/xen-hvm.c
@@ -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.26.2
- [PATCH v2 0/6] hw/xen: Housekeeping, Philippe Mathieu-Daudé, 2020/09/08
- [PATCH v2 1/6] hw/i386/q35: Remove unreachable Xen code on Q35 machine, Philippe Mathieu-Daudé, 2020/09/08
- [PATCH v2 2/6] hw/i386/xen: Rename X86/PC specific function as xen_hvm_init_pc(),
Philippe Mathieu-Daudé <=
- [PATCH v2 3/6] sysemu/xen: Add missing 'exec/cpu-common.h' header for ram_addr_t type, Philippe Mathieu-Daudé, 2020/09/08
- [PATCH v2 4/6] stubs: Split accelerator / hardware related stubs, Philippe Mathieu-Daudé, 2020/09/08
- [PATCH v2 5/6] hw/xen: Split x86-specific declaration from generic hardware ones, Philippe Mathieu-Daudé, 2020/09/08
- [PATCH v2 6/6] typedefs: Restrict PCMachineState to 'hw/i386/pc.h', Philippe Mathieu-Daudé, 2020/09/08
- Re: [PATCH v2 0/6] hw/xen: Housekeeping, Paolo Bonzini, 2020/09/22