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

pc: Simplify pc_memory_init() signature 

We can get the PcGuestInfo struct directly from PCMachineState,
and the return value is not needed at all.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
This commit is contained in:
Eduardo Habkost 2015-12-11 16:42:24 -02:00 committed by Michael S. Tsirkin
parent 9ebeed0c1e
commit 5934e2169a
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/i386/pc.c
View File

@ -1276,12 +1276,12 @@ FWCfgState *xen_load_linux(PCMachineState *pcms,
return fw_cfg; return fw_cfg;
} }
FWCfgState *pc_memory_init(PCMachineState *pcms, void pc_memory_init(PCMachineState *pcms,
MemoryRegion *system_memory, MemoryRegion *system_memory,
MemoryRegion *rom_memory, MemoryRegion *rom_memory,
MemoryRegion **ram_memory, MemoryRegion **ram_memory)
PcGuestInfo *guest_info)
{ {
PcGuestInfo *guest_info = &pcms->acpi_guest_info;
int linux_boot, i; int linux_boot, i;
MemoryRegion *ram, *option_rom_mr; MemoryRegion *ram, *option_rom_mr;
MemoryRegion *ram_below_4g, *ram_above_4g; 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); rom_add_option(option_rom[i].name, option_rom[i].bootindex);
} }
guest_info->fw_cfg = fw_cfg; guest_info->fw_cfg = fw_cfg;
return fw_cfg;
} }
qemu_irq pc_allocate_cpu_irq(void) qemu_irq pc_allocate_cpu_irq(void)

2
hw/i386/pc_piix.c
View File

@ -162,7 +162,7 @@ static void pc_init1(MachineState *machine,
/* allocate ram and load rom/bios */ /* allocate ram and load rom/bios */
if (!xen_enabled()) { if (!xen_enabled()) {
pc_memory_init(pcms, system_memory, pc_memory_init(pcms, system_memory,
rom_memory, &ram_memory, guest_info); rom_memory, &ram_memory);
} else if (machine->kernel_filename != NULL) { } else if (machine->kernel_filename != NULL) {
/* For xen HVM direct kernel boot, load linux here */ /* For xen HVM direct kernel boot, load linux here */
xen_load_linux(pcms, guest_info); xen_load_linux(pcms, guest_info);

2
hw/i386/pc_q35.c
View File

@ -156,7 +156,7 @@ static void pc_q35_init(MachineState *machine)
/* allocate ram and load rom/bios */ /* allocate ram and load rom/bios */
if (!xen_enabled()) { if (!xen_enabled()) {
pc_memory_init(pcms, get_system_memory(), pc_memory_init(pcms, get_system_memory(),
rom_memory, &ram_memory, guest_info); rom_memory, &ram_memory);
} }
/* irq lines */ /* irq lines */

9
include/hw/i386/pc.h
View File

@ -250,11 +250,10 @@ void pc_pci_as_mapping_init(Object *owner, MemoryRegion *system_memory,
FWCfgState *xen_load_linux(PCMachineState *pcms, FWCfgState *xen_load_linux(PCMachineState *pcms,
PcGuestInfo *guest_info); PcGuestInfo *guest_info);
FWCfgState *pc_memory_init(PCMachineState *pcms, void pc_memory_init(PCMachineState *pcms,
MemoryRegion *system_memory, MemoryRegion *system_memory,
MemoryRegion *rom_memory, MemoryRegion *rom_memory,
MemoryRegion **ram_memory, MemoryRegion **ram_memory);
PcGuestInfo *guest_info);
qemu_irq pc_allocate_cpu_irq(void); qemu_irq pc_allocate_cpu_irq(void);
DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus); DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus);
void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,