diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2015-08-07 16:55:50 -0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-08-13 14:08:27 +0300 |
| commit | 62b160c02ca46f0b5a06cc4416c47708c7ffd76b (patch) | |
| tree | 0186a5571d07f8885aa1e4baf290e24547b43b27 | |
| parent | 23d3040704e8e2a10f3e21e2c6594b3a8c7b20db (diff) | |
| download | qemu-62b160c02ca46f0b5a06cc4416c47708c7ffd76b.tar.gz qemu-62b160c02ca46f0b5a06cc4416c47708c7ffd76b.tar.bz2 qemu-62b160c02ca46f0b5a06cc4416c47708c7ffd76b.zip | |
pc: Use PCMachineState for pc_memory_init() argument
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>
| -rw-r--r-- | hw/i386/pc.c | 4 | ||||
| -rw-r--r-- | hw/i386/pc_piix.c | 2 | ||||
| -rw-r--r-- | hw/i386/pc_q35.c | 2 | ||||
| -rw-r--r-- | include/hw/i386/pc.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 255476b18e..a9a9cf4823 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1289,7 +1289,7 @@ FWCfgState *xen_load_linux(const char *kernel_filename, return fw_cfg; } -FWCfgState *pc_memory_init(MachineState *machine, +FWCfgState *pc_memory_init(PCMachineState *pcms, MemoryRegion *system_memory, ram_addr_t below_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_below_4g, *ram_above_4g; FWCfgState *fw_cfg; - PCMachineState *pcms = PC_MACHINE(machine); + MachineState *machine = MACHINE(pcms); assert(machine->ram_size == below_4g_mem_size + above_4g_mem_size); diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index b975c21cfe..18e9aa5129 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -178,7 +178,7 @@ static void pc_init1(MachineState *machine) /* allocate ram and load rom/bios */ if (!xen_enabled()) { - pc_memory_init(machine, system_memory, + pc_memory_init(pcms, system_memory, below_4g_mem_size, above_4g_mem_size, rom_memory, &ram_memory, guest_info); } else if (machine->kernel_filename != NULL) { diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 441e9d9b72..6763f0de2f 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -170,7 +170,7 @@ static void pc_q35_init(MachineState *machine) /* allocate ram and load rom/bios */ 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, rom_memory, &ram_memory, guest_info); } diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index d8184cd206..4fa2b3fb22 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -185,7 +185,7 @@ FWCfgState *xen_load_linux(const char *kernel_filename, const char *initrd_filename, ram_addr_t below_4g_mem_size, PcGuestInfo *guest_info); -FWCfgState *pc_memory_init(MachineState *machine, +FWCfgState *pc_memory_init(PCMachineState *pcms, MemoryRegion *system_memory, ram_addr_t below_4g_mem_size, ram_addr_t above_4g_mem_size, |