From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46316) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UrqTA-0006Mx-9d for qemu-devel@nongnu.org; Wed, 26 Jun 2013 10:13:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UrqT8-0007Gf-Nw for qemu-devel@nongnu.org; Wed, 26 Jun 2013 10:13:12 -0400 From: Markus Armbruster Date: Wed, 26 Jun 2013 16:13:05 +0200 Message-Id: <1372255987-17061-5-git-send-email-armbru@redhat.com> In-Reply-To: <1372255987-17061-1-git-send-email-armbru@redhat.com> References: <1372255987-17061-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 4/6] ppc: Don't explode QEMUMachineInitArgs into local variables needlessly List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, mjt@tls.msk.ru, agraf@suse.de, blauwirbel@gmail.com, qemu-ppc@nongnu.org, aviksil@linux.vnet.ibm.com Don't explode when the variable is used just once, and never changed. Signed-off-by: Markus Armbruster --- hw/ppc/e500plat.c | 18 ++++++------------ 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 c852995..a78de07 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 444da02..4e551af 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, -- 1.7.11.7