From nobody Thu Nov 6 01:27:54 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1538734642313838.6438550380299; Fri, 5 Oct 2018 03:17:22 -0700 (PDT) Received: from localhost ([::1]:34354 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g8NAe-0006qj-OT for importer@patchew.org; Fri, 05 Oct 2018 06:17:20 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40154) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g8N9E-00068V-18 for qemu-devel@nongnu.org; Fri, 05 Oct 2018 06:15:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g8N98-0007fg-Rf for qemu-devel@nongnu.org; Fri, 05 Oct 2018 06:15:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48976) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g8N98-0007f4-Jq for qemu-devel@nongnu.org; Fri, 05 Oct 2018 06:15:46 -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 3EE183001BFF; Fri, 5 Oct 2018 10:15:45 +0000 (UTC) Received: from thuth.com (dhcp-200-199.str.redhat.com [10.33.200.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9A92A5D9CA; Fri, 5 Oct 2018 10:15:39 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Alistair Francis Date: Fri, 5 Oct 2018 12:15:35 +0200 Message-Id: <1538734535-7483-1-git-send-email-thuth@redhat.com> 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.45]); Fri, 05 Oct 2018 10:15:45 +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: [Qemu-devel] [PATCH] hw/core/generic-loader: Compile only once, not for each target X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Richard Henderson , "Michael S. Tsirkin" , Peter Crosthwaite Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The generic-loader is currently compiled target specific due to one single "#ifdef TARGET_WORDS_BIGENDIAN" in the file. We've already got a function called target_words_bigendian() for this instead, so we can put the generic-loader into common-obj to save some compilation time. Signed-off-by: Thomas Huth --- exec.c | 1 - hw/core/Makefile.objs | 2 +- hw/core/generic-loader.c | 6 +----- hw/virtio/virtio.c | 1 - include/qom/cpu.h | 2 ++ qom/cpu.c | 1 - 6 files changed, 4 insertions(+), 9 deletions(-) diff --git a/exec.c b/exec.c index d0821e6..3ae0e54 100644 --- a/exec.c +++ b/exec.c @@ -3910,7 +3910,6 @@ int qemu_target_page_bits_min(void) * A helper function for the _utterly broken_ virtio device model to find = out if * it's running on a big endian machine. Don't do this at home kids! */ -bool target_words_bigendian(void); bool target_words_bigendian(void) { #if defined(TARGET_WORDS_BIGENDIAN) diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs index eb88ca9..b736ce2 100644 --- a/hw/core/Makefile.objs +++ b/hw/core/Makefile.objs @@ -20,6 +20,6 @@ common-obj-$(CONFIG_SOFTMMU) +=3D register.o common-obj-$(CONFIG_SOFTMMU) +=3D or-irq.o common-obj-$(CONFIG_SOFTMMU) +=3D split-irq.o common-obj-$(CONFIG_PLATFORM_BUS) +=3D platform-bus.o +common-obj-$(CONFIG_SOFTMMU) +=3D generic-loader.o =20 -obj-$(CONFIG_SOFTMMU) +=3D generic-loader.o obj-$(CONFIG_SOFTMMU) +=3D null-machine.o diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c index be29ae1..fbae05f 100644 --- a/hw/core/generic-loader.c +++ b/hw/core/generic-loader.c @@ -130,11 +130,7 @@ static void generic_loader_realize(DeviceState *dev, E= rror **errp) s->cpu =3D first_cpu; } =20 -#ifdef TARGET_WORDS_BIGENDIAN - big_endian =3D 1; -#else - big_endian =3D 0; -#endif + big_endian =3D target_words_bigendian(); =20 if (s->file) { AddressSpace *as =3D s->cpu ? s->cpu->as : NULL; diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 94f5c8e..4e61944 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -1169,7 +1169,6 @@ int virtio_set_status(VirtIODevice *vdev, uint8_t val) return 0; } =20 -bool target_words_bigendian(void); static enum virtio_device_endian virtio_default_endian(void) { if (target_words_bigendian()) { diff --git a/include/qom/cpu.h b/include/qom/cpu.h index dc130cd..0e2ce80 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -1085,6 +1085,8 @@ void cpu_exec_initfn(CPUState *cpu); void cpu_exec_realizefn(CPUState *cpu, Error **errp); void cpu_exec_unrealizefn(CPUState *cpu); =20 +bool target_words_bigendian(void); + #ifdef NEED_CPU_H =20 #ifdef CONFIG_SOFTMMU diff --git a/qom/cpu.c b/qom/cpu.c index 92599f3..f774654 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -194,7 +194,6 @@ static bool cpu_common_debug_check_watchpoint(CPUState = *cpu, CPUWatchpoint *wp) return true; } =20 -bool target_words_bigendian(void); static bool cpu_common_virtio_is_big_endian(CPUState *cpu) { return target_words_bigendian(); --=20 1.8.3.1