diff options
author | Markus Armbruster <armbru@redhat.com> | 2013-08-16 13:13:49 +0200 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2013-08-21 23:22:22 +0300 |
commit | 92238367450d26eced103736ae555997ea3162c2 (patch) | |
tree | 16b9cf5324677ef5d3b0075ac0399e1cc2db225d /hw/ppc/e500plat.c | |
parent | ee87e32f830b4e22c02038de963bb9f72b55896f (diff) | |
download | qemu-92238367450d26eced103736ae555997ea3162c2.zip qemu-92238367450d26eced103736ae555997ea3162c2.tar.gz qemu-92238367450d26eced103736ae555997ea3162c2.tar.bz2 |
ppc: Don't duplicate QEMUMachineInitArgs in PPCE500Params
Pass on the generic arguments unadulterated, and the machine-specific
ones as separate argument.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alexander Graf <agraf@suse.de>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/ppc/e500plat.c')
-rw-r--r-- | hw/ppc/e500plat.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c index a78de07..bf65b69 100644 --- a/hw/ppc/e500plat.c +++ b/hw/ppc/e500plat.c @@ -31,12 +31,6 @@ static void e500plat_fixup_devtree(PPCE500Params *params, void *fdt) static void e500plat_init(QEMUMachineInitArgs *args) { PPCE500Params params = { - .ram_size = args->ram_size, - .boot_device = args->boot_device, - .kernel_filename = args->kernel_filename, - .kernel_cmdline = args->kernel_cmdline, - .initrd_filename = args->initrd_filename, - .cpu_model = args->cpu_model, .pci_first_slot = 0x1, .pci_nr_slots = PCI_SLOT_MAX - 1, .fixup_devtree = e500plat_fixup_devtree, @@ -49,7 +43,7 @@ static void e500plat_init(QEMUMachineInitArgs *args) params.mpic_version = OPENPIC_MODEL_FSL_MPIC_20; } - ppce500_init(¶ms); + ppce500_init(args, ¶ms); } static QEMUMachine e500plat_machine = { |