mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pc: Use PCMachineState for pc_memory_init() argument

Browse Source 
pc_memory_init() already expects a PCMachineState object, there's no
point in upcasting it to MachineState before calling the function.

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>
This commit is contained in:
Eduardo Habkost 2015-08-07 16:55:50 -03:00 committed by Michael S. Tsirkin
parent 23d3040704
commit 62b160c02c
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/i386/pc.c
View File

@ -1289,7 +1289,7 @@ FWCfgState *xen_load_linux(const char *kernel_filename,
return fw_cfg; return fw_cfg;
} }
FWCfgState *pc_memory_init(MachineState *machine, FWCfgState *pc_memory_init(PCMachineState *pcms,
MemoryRegion *system_memory, MemoryRegion *system_memory,
ram_addr_t below_4g_mem_size, ram_addr_t below_4g_mem_size,
ram_addr_t above_4g_mem_size, ram_addr_t above_4g_mem_size,
@ -1301,7 +1301,7 @@ FWCfgState *pc_memory_init(MachineState *machine,
MemoryRegion *ram, *option_rom_mr; MemoryRegion *ram, *option_rom_mr;
MemoryRegion *ram_below_4g, *ram_above_4g; MemoryRegion *ram_below_4g, *ram_above_4g;
FWCfgState *fw_cfg; FWCfgState *fw_cfg;
PCMachineState *pcms = PC_MACHINE(machine); MachineState *machine = MACHINE(pcms);
assert(machine->ram_size == below_4g_mem_size + above_4g_mem_size); assert(machine->ram_size == below_4g_mem_size + above_4g_mem_size);

2
hw/i386/pc_piix.c
View File

@ -178,7 +178,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(machine, system_memory, pc_memory_init(pcms, system_memory,
below_4g_mem_size, above_4g_mem_size, below_4g_mem_size, above_4g_mem_size,
rom_memory, &ram_memory, guest_info); rom_memory, &ram_memory, guest_info);
} else if (machine->kernel_filename != NULL) { } else if (machine->kernel_filename != NULL) {

2
hw/i386/pc_q35.c
View File

@ -170,7 +170,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(machine, get_system_memory(), pc_memory_init(pcms, get_system_memory(),
below_4g_mem_size, above_4g_mem_size, below_4g_mem_size, above_4g_mem_size,
rom_memory, &ram_memory, guest_info); rom_memory, &ram_memory, guest_info);
} }

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

@ -185,7 +185,7 @@ FWCfgState *xen_load_linux(const char *kernel_filename,
const char *initrd_filename, const char *initrd_filename,
ram_addr_t below_4g_mem_size, ram_addr_t below_4g_mem_size,
PcGuestInfo *guest_info); PcGuestInfo *guest_info);
FWCfgState *pc_memory_init(MachineState *machine, FWCfgState *pc_memory_init(PCMachineState *pcms,
MemoryRegion *system_memory, MemoryRegion *system_memory,
ram_addr_t below_4g_mem_size, ram_addr_t below_4g_mem_size,
ram_addr_t above_4g_mem_size, ram_addr_t above_4g_mem_size,