From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11ED4C31E50 for ; Sun, 16 Jun 2019 18:54:11 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DD06320866 for ; Sun, 16 Jun 2019 18:54:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DD06320866 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42164 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hcaI5-00031L-SS for qemu-devel@archiver.kernel.org; Sun, 16 Jun 2019 14:54:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60152) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hcaDx-0001VA-G5 for qemu-devel@nongnu.org; Sun, 16 Jun 2019 14:49:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hcaDw-0008S4-Ei for qemu-devel@nongnu.org; Sun, 16 Jun 2019 14:49:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46124) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hcaDw-0008Q2-6C for qemu-devel@nongnu.org; Sun, 16 Jun 2019 14:49:52 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 94976C057F88; Sun, 16 Jun 2019 18:49:50 +0000 (UTC) Received: from localhost (unknown [10.43.2.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6AA3490C50; Sun, 16 Jun 2019 18:49:47 +0000 (UTC) Date: Sun, 16 Jun 2019 20:49:42 +0200 From: Igor Mammedov To: Yoshinori Sato Message-ID: <20190616204942.4131a648@redhat.com> In-Reply-To: <20190616142836.10614-18-ysato@users.sourceforge.jp> References: <20190616142836.10614-1-ysato@users.sourceforge.jp> <20190616142836.10614-18-ysato@users.sourceforge.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Sun, 16 Jun 2019 18:49:50 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [PATCH v20 17/24] target/rx: Move rx_load_image to rx-virt. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, richard.henderson@linaro.org, qemu-devel@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Sun, 16 Jun 2019 23:28:29 +0900 Yoshinori Sato wrote: > Signed-off-by: Yoshinori Sato > --- > hw/rx/rx-virt.c | 22 ++++++++++++++++++++++ > target/rx/cpu.c | 22 ---------------------- > 2 files changed, 22 insertions(+), 22 deletions(-) > > diff --git a/hw/rx/rx-virt.c b/hw/rx/rx-virt.c > index ed0a3a1da0..4cfe2e3123 100644 > --- a/hw/rx/rx-virt.c > +++ b/hw/rx/rx-virt.c > @@ -32,6 +32,28 @@ > /* Same address of GDB integrated simulator */ > #define SDRAM_BASE 0x01000000 > > +static void rx_load_image(RXCPU *cpu, const char *filename, > + uint32_t start, uint32_t size) function shouldn't be added to target/rx/cpu.c at all, it should be introduced in 16/24 instead and this patch shouldn't exist. > +{ > + static uint32_t extable[32]; > + long kernel_size; > + int i; > + > + kernel_size = load_image_targphys(filename, start, size); > + if (kernel_size < 0) { > + fprintf(stderr, "qemu: could not load kernel '%s'\n", filename); > + exit(1); > + } > + cpu->env.pc = start; > + > + /* setup exception trap trampoline */ > + /* linux kernel only works little-endian mode */ > + for (i = 0; i < ARRAY_SIZE(extable); i++) { > + extable[i] = cpu_to_le32(0x10 + i * 4); > + } > + rom_add_blob_fixed("extable", extable, sizeof(extable), 0xffffff80); > +} > + > static void rxvirt_init(MachineState *machine) > { > RX62NState *s = g_new(RX62NState, 1); > diff --git a/target/rx/cpu.c b/target/rx/cpu.c > index e3d76af55d..ea38639f47 100644 > --- a/target/rx/cpu.c > +++ b/target/rx/cpu.c > @@ -215,25 +215,3 @@ static void rx_cpu_register_types(void) > } > > type_init(rx_cpu_register_types) > - > -void rx_load_image(RXCPU *cpu, const char *filename, > - uint32_t start, uint32_t size) > -{ > - static uint32_t extable[32]; > - long kernel_size; > - int i; > - > - kernel_size = load_image_targphys(filename, start, size); > - if (kernel_size < 0) { > - fprintf(stderr, "qemu: could not load kernel '%s'\n", filename); > - exit(1); > - } > - cpu->env.pc = start; > - > - /* setup exception trap trampoline */ > - /* linux kernel only works little-endian mode */ > - for (i = 0; i < ARRAY_SIZE(extable); i++) { > - extable[i] = cpu_to_le32(0x10 + i * 4); > - } > - rom_add_blob_fixed("extable", extable, sizeof(extable), 0xffffff80); > -}