From patchwork Thu Oct 25 11:37:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 194123 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 724A62C00A4 for ; Thu, 25 Oct 2012 22:38:27 +1100 (EST) Received: from localhost ([::1]:52235 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRLlZ-0002II-Jg for incoming@patchwork.ozlabs.org; Thu, 25 Oct 2012 07:38:25 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52561) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRLlM-0002BO-IX for qemu-devel@nongnu.org; Thu, 25 Oct 2012 07:38:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TRLlG-0004G8-Or for qemu-devel@nongnu.org; Thu, 25 Oct 2012 07:38:12 -0400 Received: from mail-la0-f45.google.com ([209.85.215.45]:52114) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRLlG-0004G0-Ev for qemu-devel@nongnu.org; Thu, 25 Oct 2012 07:38:06 -0400 Received: by mail-la0-f45.google.com with SMTP id m13so1311520lah.4 for ; Thu, 25 Oct 2012 04:38:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=sKw+e6Ip9Iv/qXw6E3EBL6YQvuV+PkjvGAxlpDS3Www=; b=U1qBulWW5dN/z5WOkYiXAENo/4iPKrZj6NWavitIs3gXlHl4j7VltwsGJD7/HsnAx3 myMGqCDn2S9Mr2odvnxa2b1ih9nF2ef5InKTRH1phW6UC/1WRDMoWN7GLeYo6ykBN4Re IK94mVhdDUi/J/rPhSZVS/8/FLYSWqyoM8QA0akqmUgzTzFNSpI7BJeTRVR3PvvPPBeV /LKC4xl61OUWR5R9S1vICbfEFl2iJclmTTUptQJyoVBvyg4sOljxeZBPwALvQ+3zw/z0 3UKSQlSrTSXGtVrsZRpG431ucuvfREFZxEd85s2nwM3zep/uIX4wkXvsDnfWGgxu21M5 K9hg== Received: by 10.112.100.101 with SMTP id ex5mr7506945lbb.20.1351165085343; Thu, 25 Oct 2012 04:38:05 -0700 (PDT) Received: from octofox.metropolis ([188.134.19.124]) by mx.google.com with ESMTPS id xw14sm5807044lab.15.2012.10.25.04.38.03 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 25 Oct 2012 04:38:04 -0700 (PDT) From: Max Filippov To: qemu-devel@nongnu.org Date: Thu, 25 Oct 2012 15:37:51 +0400 Message-Id: <1351165072-30278-2-git-send-email-jcmvbkbc@gmail.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1351165072-30278-1-git-send-email-jcmvbkbc@gmail.com> References: <1351165072-30278-1-git-send-email-jcmvbkbc@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.215.45 Cc: Blue Swirl , Peter Maydell , Max Filippov , Markus Armbruster , Eduardo Habkost Subject: [Qemu-devel] [PATCH v2 1/2] hw/xtensa_lx60: don't prematurely explode QEMUMachineInitArgs 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 Don't explode QEMUMachineInitArgs before passing it to lx_init. Signed-off-by: Max Filippov --- hw/xtensa_lx60.c | 30 +++++++----------------------- 1 files changed, 7 insertions(+), 23 deletions(-) diff --git a/hw/xtensa_lx60.c b/hw/xtensa_lx60.c index 5dd2e08..4c42edc 100644 --- a/hw/xtensa_lx60.c +++ b/hw/xtensa_lx60.c @@ -155,10 +155,7 @@ static void lx60_reset(void *opaque) cpu_reset(CPU(cpu)); } -static void lx_init(const LxBoardDesc *board, - ram_addr_t ram_size, const char *boot_device, - const char *kernel_filename, const char *kernel_cmdline, - const char *initrd_filename, const char *cpu_model) +static void lx_init(const LxBoardDesc *board, QEMUMachineInitArgs *args) { #ifdef TARGET_WORDS_BIGENDIAN int be = 1; @@ -171,6 +168,9 @@ static void lx_init(const LxBoardDesc *board, MemoryRegion *ram, *rom, *system_io; DriveInfo *dinfo; pflash_t *flash = NULL; + const char *cpu_model = args->cpu_model; + const char *kernel_filename = args->kernel_filename; + const char *kernel_cmdline = args->kernel_cmdline; int n; if (!cpu_model) { @@ -194,7 +194,7 @@ static void lx_init(const LxBoardDesc *board, } ram = g_malloc(sizeof(*ram)); - memory_region_init_ram(ram, "lx60.dram", ram_size); + memory_region_init_ram(ram, "lx60.dram", args->ram_size); vmstate_register_ram_global(ram); memory_region_add_subregion(system_memory, 0, ram); @@ -271,38 +271,22 @@ static void lx_init(const LxBoardDesc *board, static void xtensa_lx60_init(QEMUMachineInitArgs *args) { - ram_addr_t ram_size = args->ram_size; - 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; - const char *boot_device = args->boot_device; static const LxBoardDesc lx60_board = { .flash_size = 0x400000, .flash_sector_size = 0x10000, .sram_size = 0x20000, }; - lx_init(&lx60_board, ram_size, boot_device, - kernel_filename, kernel_cmdline, - initrd_filename, cpu_model); + lx_init(&lx60_board, args); } static void xtensa_lx200_init(QEMUMachineInitArgs *args) { - ram_addr_t ram_size = args->ram_size; - 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; - const char *boot_device = args->boot_device; static const LxBoardDesc lx200_board = { .flash_size = 0x1000000, .flash_sector_size = 0x20000, .sram_size = 0x2000000, }; - lx_init(&lx200_board, ram_size, boot_device, - kernel_filename, kernel_cmdline, - initrd_filename, cpu_model); + lx_init(&lx200_board, args); } static QEMUMachine xtensa_lx60_machine = {