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>
This commit is contained in:
Markus Armbruster 2013-08-16 13:13:49 +02:00 committed by Michael S. Tsirkin
parent ee87e32f83
commit 9223836745
4 changed files with 23 additions and 41 deletions

View file

@ -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(&params);
ppce500_init(args, &params);
}
static QEMUMachine e500plat_machine = {