From patchwork Thu Oct 25 08:47:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 194076 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 E9E392C008C for ; Thu, 25 Oct 2012 19:48:25 +1100 (EST) Received: from localhost ([::1]:47180 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRJ72-0006Ds-2L for incoming@patchwork.ozlabs.org; Thu, 25 Oct 2012 04:48:24 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60127) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRJ6j-0005vr-Tv for qemu-devel@nongnu.org; Thu, 25 Oct 2012 04:48:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TRJ6e-0005A6-8o for qemu-devel@nongnu.org; Thu, 25 Oct 2012 04:48:05 -0400 Received: from mail-la0-f45.google.com ([209.85.215.45]:42466) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRJ6e-00056N-1R for qemu-devel@nongnu.org; Thu, 25 Oct 2012 04:48:00 -0400 Received: by mail-la0-f45.google.com with SMTP id m13so1127864lah.4 for ; Thu, 25 Oct 2012 01:47:59 -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=AAJ+2u/zeYuzroEWO5q9IbTrNjPHmZyXBiUMKlxFynk=; b=S7dZB3JhB6LrWts8Np7m8P9VL5ULpdp/YAOJwZjwtC/2/wgrmLn3S8bIaz57EL1n4U maRxWAi+p5XrdlRAo18Cw7zaX11Cxnl2JvAOxM10ivVnbXEPQHKUroMeUDWsnJ9s9wlo qOaPV+4iAZVAf+tRMVR62HIhYVQ5jvRyG0BXB0hlVjMQ/x/pzfhm5n9KKOprRmA/TQLo l1M3iGLA7lIbb2Be+GsBw0lIvf/tk9o0QNu5Cj4w9qQml11jFQI3STX2FQQ26Cq7dycT KklwnMgAM2ciT8/M2bXFZD21vze8PBkGHUFWAWt9nGuParqqvwz4hrHZMv5x38pPEn/J 4UAg== Received: by 10.152.106.237 with SMTP id gx13mr16653353lab.46.1351154879520; Thu, 25 Oct 2012 01:47:59 -0700 (PDT) Received: from octofox.metropolis ([188.134.19.124]) by mx.google.com with ESMTPS id eo4sm4607915lbb.5.2012.10.25.01.47.49 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 25 Oct 2012 01:47:58 -0700 (PDT) From: Max Filippov To: qemu-devel@nongnu.org Date: Thu, 25 Oct 2012 12:47:32 +0400 Message-Id: <1351154852-29217-3-git-send-email-jcmvbkbc@gmail.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1351154852-29217-1-git-send-email-jcmvbkbc@gmail.com> References: <1351154852-29217-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 2/2] hw/xtensa_sim: get rid of intermediate xtensa_sim_init 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 Remove xtensa_sim_init that only explodes machine init args, rename sim_init to xtensa_sim_init. Signed-off-by: Max Filippov --- hw/xtensa_sim.c | 27 ++++++++------------------- 1 files changed, 8 insertions(+), 19 deletions(-) diff --git a/hw/xtensa_sim.c b/hw/xtensa_sim.c index 2e846d8..0d633e4 100644 --- a/hw/xtensa_sim.c +++ b/hw/xtensa_sim.c @@ -44,16 +44,20 @@ static void sim_reset(void *opaque) cpu_reset(CPU(cpu)); } -static void sim_init(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 xtensa_sim_init(QEMUMachineInitArgs *args) { XtensaCPU *cpu = NULL; CPUXtensaState *env = NULL; MemoryRegion *ram, *rom; + ram_addr_t ram_size = args->ram_size; + const char *cpu_model = args->cpu_model; + const char *kernel_filename = args->kernel_filename; int n; + if (!cpu_model) { + cpu_model = XTENSA_DEFAULT_CPU_MODEL; + } + for (n = 0; n < smp_cpus; n++) { cpu = cpu_xtensa_init(cpu_model); if (cpu == NULL) { @@ -96,21 +100,6 @@ static void sim_init(ram_addr_t ram_size, } } -static void xtensa_sim_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; - if (!cpu_model) { - cpu_model = XTENSA_DEFAULT_CPU_MODEL; - } - sim_init(ram_size, boot_device, kernel_filename, kernel_cmdline, - initrd_filename, cpu_model); -} - static QEMUMachine xtensa_sim_machine = { .name = "sim", .desc = "sim machine (" XTENSA_DEFAULT_CPU_MODEL ")",