diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-06-10 19:15:17 +0800 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2014-06-19 18:44:20 +0300 |
| commit | 9521d42b546f2f624d4dcd299e13a9ab37eb1d82 (patch) | |
| tree | b302ccab94e1573fb1c89ca18ea25722ef3d2fb4 /hw/i386/pc_q35.c | |
| parent | c4090f8ef661fc314610883008c6593c720db564 (diff) | |
| download | hqemu-9521d42b546f2f624d4dcd299e13a9ab37eb1d82.zip hqemu-9521d42b546f2f624d4dcd299e13a9ab37eb1d82.tar.gz | |
pc: pass MachineState to pc_memory_init
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Reviewed-By: Igor Mammedov <imammedo@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/i386/pc_q35.c')
| -rw-r--r-- | hw/i386/pc_q35.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 629eb2d..aa71332 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -143,9 +143,7 @@ static void pc_q35_init(MachineState *machine) /* allocate ram and load rom/bios */ if (!xen_enabled()) { - pc_memory_init(get_system_memory(), - machine->kernel_filename, machine->kernel_cmdline, - machine->initrd_filename, + pc_memory_init(machine, get_system_memory(), below_4g_mem_size, above_4g_mem_size, rom_memory, &ram_memory, guest_info); } |
