From patchwork Fri Aug 16 11:13:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 267614 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C74EC2C0164 for ; Fri, 16 Aug 2013 21:14:34 +1000 (EST) Received: from localhost ([::1]:57866 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VAHzE-0001In-Na for incoming@patchwork.ozlabs.org; Fri, 16 Aug 2013 07:14:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58178) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VAHyj-0001IM-77 for qemu-devel@nongnu.org; Fri, 16 Aug 2013 07:14:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VAHye-0002dy-9G for qemu-devel@nongnu.org; Fri, 16 Aug 2013 07:14:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7774) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VAHye-0002dr-1y; Fri, 16 Aug 2013 07:13:56 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r7GBDra0009831 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 16 Aug 2013 07:13:53 -0400 Received: from blackfin.pond.sub.org (ovpn-116-31.ams2.redhat.com [10.36.116.31]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r7GBDpHh025864; Fri, 16 Aug 2013 07:13:51 -0400 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id C510C200B9; Fri, 16 Aug 2013 13:13:50 +0200 (CEST) From: armbru@redhat.com To: qemu-devel@nongnu.org Date: Fri, 16 Aug 2013 13:13:48 +0200 Message-Id: <1376651630-9151-5-git-send-email-armbru@redhat.com> In-Reply-To: <1376651630-9151-1-git-send-email-armbru@redhat.com> References: <1376651630-9151-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com, mjt@tls.msk.ru, agraf@suse.de, blauwirbel@gmail.com, qemu-ppc@nongnu.org, aviksil@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH v4 4/6] ppc: Don't explode QEMUMachineInitArgs into local variables needlessly X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Markus Armbruster Don't explode when the variable is used just once, and never changed. Signed-off-by: Markus Armbruster Acked-by: Alexander Graf Reviewed-by: Laszlo Ersek --- 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,