diff options
| author | Markus Armbruster <armbru@redhat.com> | 2013-08-16 13:13:48 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2013-08-21 23:20:35 +0300 |
| commit | ee87e32f830b4e22c02038de963bb9f72b55896f (patch) | |
| tree | dcb93ed165729a5036551a5a334d7904d94a1f34 /hw/ppc | |
| parent | 6b63ef4d0f225810b74281e6689a4d5695860c08 (diff) | |
| download | qemu-ee87e32f830b4e22c02038de963bb9f72b55896f.tar.gz qemu-ee87e32f830b4e22c02038de963bb9f72b55896f.tar.bz2 qemu-ee87e32f830b4e22c02038de963bb9f72b55896f.zip | |
ppc: Don't explode QEMUMachineInitArgs into local variables needlessly
Don't explode when the variable is used just once, and never changed.
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')
| -rw-r--r-- | hw/ppc/e500plat.c | 18 | ||||
| -rw-r--r-- | hw/ppc/mpc8544ds.c | 18 |
2 files changed, 12 insertions, 24 deletions
diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c index c85299588c..a78de0765c 100644 --- a/hw/ppc/e500plat.c +++ b/hw/ppc/e500plat.c @@ -30,19 +30,13 @@ static void e500plat_fixup_devtree(PPCE500Params *params, void *fdt) static void e500plat_init(QEMUMachineInitArgs *args) { - ram_addr_t ram_size = args->ram_size; - const char *boot_device = args->boot_device; - const char *cpu_model = args->cpu_model; - const char *kernel_filename = args->kernel_filename; - const char *kernel_cmdline = args->kernel_cmdline; - const char *initrd_filename = args->initrd_filename; PPCE500Params params = { - .ram_size = ram_size, - .boot_device = boot_device, - .kernel_filename = kernel_filename, - .kernel_cmdline = kernel_cmdline, - .initrd_filename = initrd_filename, - .cpu_model = cpu_model, + .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, diff --git a/hw/ppc/mpc8544ds.c b/hw/ppc/mpc8544ds.c index 444da0246d..4e551affd6 100644 --- a/hw/ppc/mpc8544ds.c +++ b/hw/ppc/mpc8544ds.c @@ -28,19 +28,13 @@ static void mpc8544ds_fixup_devtree(PPCE500Params *params, void *fdt) static void mpc8544ds_init(QEMUMachineInitArgs *args) { - ram_addr_t ram_size = args->ram_size; - const char *boot_device = args->boot_device; - const char *cpu_model = args->cpu_model; - const char *kernel_filename = args->kernel_filename; - const char *kernel_cmdline = args->kernel_cmdline; - const char *initrd_filename = args->initrd_filename; PPCE500Params params = { - .ram_size = ram_size, - .boot_device = boot_device, - .kernel_filename = kernel_filename, - .kernel_cmdline = kernel_cmdline, - .initrd_filename = initrd_filename, - .cpu_model = cpu_model, + .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, |