summaryrefslogtreecommitdiff
path: root/hw/ppc/mpc8544ds.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2013-08-16 13:13:49 +0200
committerMichael S. Tsirkin <mst@redhat.com>2013-08-21 23:22:22 +0300
commit92238367450d26eced103736ae555997ea3162c2 (patch)
tree16b9cf5324677ef5d3b0075ac0399e1cc2db225d /hw/ppc/mpc8544ds.c
parentee87e32f830b4e22c02038de963bb9f72b55896f (diff)
downloadqemu-92238367450d26eced103736ae555997ea3162c2.tar.gz
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/mpc8544ds.c')
-rw-r--r--hw/ppc/mpc8544ds.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/hw/ppc/mpc8544ds.c b/hw/ppc/mpc8544ds.c
index 4e551affd6..1888e75545 100644
--- a/hw/ppc/mpc8544ds.c
+++ b/hw/ppc/mpc8544ds.c
@@ -29,19 +29,13 @@ static void mpc8544ds_fixup_devtree(PPCE500Params *params, void *fdt)
static void mpc8544ds_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 = 0x11,
.pci_nr_slots = 2,
.fixup_devtree = mpc8544ds_fixup_devtree,
.mpic_version = OPENPIC_MODEL_FSL_MPIC_20,
};
- ppce500_init(&params);
+ ppce500_init(args, &params);
}