From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60015) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRJ6V-0005KE-W2 for qemu-devel@nongnu.org; Thu, 25 Oct 2012 04:47:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TRJ6U-00056t-VT for qemu-devel@nongnu.org; Thu, 25 Oct 2012 04:47:51 -0400 Received: from mail-la0-f45.google.com ([209.85.215.45]:54329) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRJ6U-00056l-Oe for qemu-devel@nongnu.org; Thu, 25 Oct 2012 04:47:50 -0400 Received: by mail-la0-f45.google.com with SMTP id m13so1127896lah.4 for ; Thu, 25 Oct 2012 01:47:49 -0700 (PDT) From: Max Filippov Date: Thu, 25 Oct 2012 12:47:31 +0400 Message-Id: <1351154852-29217-2-git-send-email-jcmvbkbc@gmail.com> In-Reply-To: <1351154852-29217-1-git-send-email-jcmvbkbc@gmail.com> References: <1351154852-29217-1-git-send-email-jcmvbkbc@gmail.com> Subject: [Qemu-devel] [PATCH 1/2] hw/xtensa_lx60: don't prematurely explode QEMUMachineInitArgs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Blue Swirl , Peter Maydell , Max Filippov , Markus Armbruster , Eduardo Habkost Don't explode QEMUMachineInitArgs before passing it to lx_init. Signed-off-by: Max Filippov --- hw/xtensa_lx60.c | 25 ++++++------------------- 1 files changed, 6 insertions(+), 19 deletions(-) diff --git a/hw/xtensa_lx60.c b/hw/xtensa_lx60.c index 5dd2e08..b4d3b8e 100644 --- a/hw/xtensa_lx60.c +++ b/hw/xtensa_lx60.c @@ -156,9 +156,7 @@ static void lx60_reset(void *opaque) } 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) + ram_addr_t ram_size, QEMUMachineInitArgs *args) { #ifdef TARGET_WORDS_BIGENDIAN int be = 1; @@ -171,6 +169,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) { @@ -272,37 +273,23 @@ 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, ram_size, 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, ram_size, args); } static QEMUMachine xtensa_lx60_machine = { -- 1.7.7.6