[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 28/49] pc: Simplify pc_memory_init() signature
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 28/49] pc: Simplify pc_memory_init() signature |
Date: |
Thu, 4 Feb 2016 23:52:50 +0200 |
From: Eduardo Habkost <address@hidden>
We can get the PcGuestInfo struct directly from PCMachineState,
and the return value is not needed at all.
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
---
include/hw/i386/pc.h | 9 ++++-----
hw/i386/pc.c | 11 +++++------
hw/i386/pc_piix.c | 2 +-
hw/i386/pc_q35.c | 2 +-
4 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 9d0b004..5b21d01 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -250,11 +250,10 @@ void pc_pci_as_mapping_init(Object *owner, MemoryRegion
*system_memory,
FWCfgState *xen_load_linux(PCMachineState *pcms,
PcGuestInfo *guest_info);
-FWCfgState *pc_memory_init(PCMachineState *pcms,
- MemoryRegion *system_memory,
- MemoryRegion *rom_memory,
- MemoryRegion **ram_memory,
- PcGuestInfo *guest_info);
+void pc_memory_init(PCMachineState *pcms,
+ MemoryRegion *system_memory,
+ MemoryRegion *rom_memory,
+ MemoryRegion **ram_memory);
qemu_irq pc_allocate_cpu_irq(void);
DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus);
void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index c421d2c..fbdad88 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1276,12 +1276,12 @@ FWCfgState *xen_load_linux(PCMachineState *pcms,
return fw_cfg;
}
-FWCfgState *pc_memory_init(PCMachineState *pcms,
- MemoryRegion *system_memory,
- MemoryRegion *rom_memory,
- MemoryRegion **ram_memory,
- PcGuestInfo *guest_info)
+void pc_memory_init(PCMachineState *pcms,
+ MemoryRegion *system_memory,
+ MemoryRegion *rom_memory,
+ MemoryRegion **ram_memory)
{
+ PcGuestInfo *guest_info = &pcms->acpi_guest_info;
int linux_boot, i;
MemoryRegion *ram, *option_rom_mr;
MemoryRegion *ram_below_4g, *ram_above_4g;
@@ -1403,7 +1403,6 @@ FWCfgState *pc_memory_init(PCMachineState *pcms,
rom_add_option(option_rom[i].name, option_rom[i].bootindex);
}
guest_info->fw_cfg = fw_cfg;
- return fw_cfg;
}
qemu_irq pc_allocate_cpu_irq(void)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 9951d6e..ad51fd6 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -162,7 +162,7 @@ static void pc_init1(MachineState *machine,
/* allocate ram and load rom/bios */
if (!xen_enabled()) {
pc_memory_init(pcms, system_memory,
- rom_memory, &ram_memory, guest_info);
+ rom_memory, &ram_memory);
} else if (machine->kernel_filename != NULL) {
/* For xen HVM direct kernel boot, load linux here */
xen_load_linux(pcms, guest_info);
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 56be9b1..0c156e2 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -156,7 +156,7 @@ static void pc_q35_init(MachineState *machine)
/* allocate ram and load rom/bios */
if (!xen_enabled()) {
pc_memory_init(pcms, get_system_memory(),
- rom_memory, &ram_memory, guest_info);
+ rom_memory, &ram_memory);
}
/* irq lines */
--
MST
- [Qemu-devel] [PULL 18/49] ipmi: replace goto by a return statement, (continued)
- [Qemu-devel] [PULL 18/49] ipmi: replace goto by a return statement, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 19/49] ipmi: replace *_MAXCMD defines, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 20/49] ipmi: cleanup error_report messages, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 21/49] ipmi: fix SDR length value, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 22/49] ipmi: introduce a struct ipmi_sdr_compact, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 23/49] ipmi: add get and set SENSOR_TYPE commands, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 24/49] ipmi: add GET_SYS_RESTART_CAUSE chassis command, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 25/49] ipmi: add ACPI power and GUID commands, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 26/49] pc: Move PcGuestInfo declaration to top of file, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 27/49] pc: Eliminate struct PcGuestInfoState, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 28/49] pc: Simplify pc_memory_init() signature,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 29/49] pc: Simplify xen_load_linux() signature, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 30/49] acpi: Remove guest_info parameters from functions, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 31/49] acpi: Don't save PcGuestInfo on AcpiBuildState, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 32/49] pc: Remove compat fields from PcGuestInfo, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 34/49] pc: Remove PcGuestInfo.isapc_ram_fw field, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 35/49] pc: Move PcGuestInfo.fw_cfg to PCMachineState, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 33/49] pc: Remove RAM size fields from PcGuestInfo, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 37/49] pc: Eliminate PcGuestInfo struct, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 36/49] pc: Move APIC and NUMA data from PcGuestInfo to PCMachineState, Michael S. Tsirkin, 2016/02/04
- [Qemu-devel] [PULL 38/49] acpi: take oem_id in build_header(), optionally, Michael S. Tsirkin, 2016/02/04