From patchwork Mon Jul 15 15:22:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1132077 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com 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 ozlabs.org (Postfix) with ESMTPS id 45nS2p3S8Hz9sRK for ; Tue, 16 Jul 2019 01:22:58 +1000 (AEST) Received: from localhost ([::1]:40080 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn2oa-0005Rj-Bp for incoming@patchwork.ozlabs.org; Mon, 15 Jul 2019 11:22:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47234) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn2oP-0005Al-ID for qemu-devel@nongnu.org; Mon, 15 Jul 2019 11:22:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hn2oO-0001Jy-CT for qemu-devel@nongnu.org; Mon, 15 Jul 2019 11:22:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54766) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hn2oL-0001IM-UL; Mon, 15 Jul 2019 11:22:42 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2C242308FED5; Mon, 15 Jul 2019 15:22:41 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.87]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 68C086085B; Mon, 15 Jul 2019 15:22:35 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Mon, 15 Jul 2019 17:22:21 +0200 Message-Id: <20190715152225.26135-2-philmd@redhat.com> In-Reply-To: <20190715152225.26135-1-philmd@redhat.com> References: <20190715152225.26135-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Mon, 15 Jul 2019 15:22:41 +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] [RFC PATCH-for-4.1? v2 1/5] target/arm: Always enable CONFIG_SEMIHOSTING 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 , Thomas Huth , Aleksandar Rikalo , James Hogan , Riku Voipio , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, Aleksandar Markovic , Paolo Bonzini , James Hogan , =?utf-8?q?Alex_Benn=C3=A9e?= , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The semihosting feature is always required on user-space, and is also used by system emulation. Signed-off-by: Philippe Mathieu-Daudé --- default-configs/aarch64-linux-user-common.mak | 4 ++++ default-configs/aarch64-linux-user.mak | 2 ++ default-configs/aarch64_be-linux-user.mak | 2 ++ default-configs/arm-linux-user-common.mak | 4 ++++ default-configs/arm-linux-user.mak | 2 ++ default-configs/arm-softmmu.mak | 4 +++- default-configs/armeb-linux-user.mak | 2 ++ 7 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 default-configs/aarch64-linux-user-common.mak create mode 100644 default-configs/arm-linux-user-common.mak diff --git a/default-configs/aarch64-linux-user-common.mak b/default-configs/aarch64-linux-user-common.mak new file mode 100644 index 0000000000..94c0cdf826 --- /dev/null +++ b/default-configs/aarch64-linux-user-common.mak @@ -0,0 +1,4 @@ +# Common aarch64*-linux-user CONFIG defines + +# CONFIG_SEMIHOSTING is always required on this architecture +CONFIG_SEMIHOSTING=y diff --git a/default-configs/aarch64-linux-user.mak b/default-configs/aarch64-linux-user.mak index 0a5b08a007..d27232cbc6 100644 --- a/default-configs/aarch64-linux-user.mak +++ b/default-configs/aarch64-linux-user.mak @@ -1 +1,3 @@ # Default configuration for aarch64-linux-user + +include aarch64-linux-user-common.mak diff --git a/default-configs/aarch64_be-linux-user.mak b/default-configs/aarch64_be-linux-user.mak index a69d9d2e41..7dee7ba4cb 100644 --- a/default-configs/aarch64_be-linux-user.mak +++ b/default-configs/aarch64_be-linux-user.mak @@ -1 +1,3 @@ # Default configuration for aarch64_be-linux-user + +include aarch64-linux-user-common.mak diff --git a/default-configs/arm-linux-user-common.mak b/default-configs/arm-linux-user-common.mak new file mode 100644 index 0000000000..67acd961f3 --- /dev/null +++ b/default-configs/arm-linux-user-common.mak @@ -0,0 +1,4 @@ +# Common arm*-linux-user CONFIG defines + +# CONFIG_SEMIHOSTING is always required on this architecture +CONFIG_SEMIHOSTING=y diff --git a/default-configs/arm-linux-user.mak b/default-configs/arm-linux-user.mak index 413361a022..7d45e4d20a 100644 --- a/default-configs/arm-linux-user.mak +++ b/default-configs/arm-linux-user.mak @@ -1 +1,3 @@ # Default configuration for arm-linux-user + +include arm-linux-user-common.mak diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 1f2e0e7fde..ad2debf543 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -1,5 +1,8 @@ # Default configuration for arm-softmmu +# CONFIG_SEMIHOSTING is always required on this architecture +CONFIG_SEMIHOSTING=y + # TODO: ARM_V7M is currently always required - make this more flexible! CONFIG_ARM_V7M=y @@ -39,4 +42,3 @@ CONFIG_MICROBIT=y CONFIG_FSL_IMX25=y CONFIG_FSL_IMX7=y CONFIG_FSL_IMX6UL=y -CONFIG_SEMIHOSTING=y diff --git a/default-configs/armeb-linux-user.mak b/default-configs/armeb-linux-user.mak index bf2ffe7038..485132f606 100644 --- a/default-configs/armeb-linux-user.mak +++ b/default-configs/armeb-linux-user.mak @@ -1 +1,3 @@ # Default configuration for armeb-linux-user + +include arm-linux-user-common.mak From patchwork Mon Jul 15 15:22:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1132078 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com 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 ozlabs.org (Postfix) with ESMTPS id 45nS3428tZz9sRK for ; Tue, 16 Jul 2019 01:23:12 +1000 (AEST) Received: from localhost ([::1]:40090 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn2oo-0006Pe-2E for incoming@patchwork.ozlabs.org; Mon, 15 Jul 2019 11:23:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47286) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn2oY-0005p9-FO for qemu-devel@nongnu.org; Mon, 15 Jul 2019 11:22:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hn2oX-0001OA-7o for qemu-devel@nongnu.org; Mon, 15 Jul 2019 11:22:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37150) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hn2oU-0001Mo-PP; Mon, 15 Jul 2019 11:22:51 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EE909811A9; Mon, 15 Jul 2019 15:22:49 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.87]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EA52C6085B; Mon, 15 Jul 2019 15:22:41 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Mon, 15 Jul 2019 17:22:22 +0200 Message-Id: <20190715152225.26135-3-philmd@redhat.com> In-Reply-To: <20190715152225.26135-1-philmd@redhat.com> References: <20190715152225.26135-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 15 Jul 2019 15:22: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: [Qemu-devel] [RFC PATCH-for-4.1? v2 2/5] target/mips: Always enable CONFIG_SEMIHOSTING 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 , Thomas Huth , Aleksandar Rikalo , James Hogan , Riku Voipio , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, Aleksandar Markovic , Paolo Bonzini , James Hogan , =?utf-8?q?Alex_Benn=C3=A9e?= , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The semihosting feature is always required on user-space. Signed-off-by: Philippe Mathieu-Daudé --- default-configs/mips-linux-user-common.mak | 4 ++++ default-configs/mips-linux-user.mak | 2 ++ default-configs/mips64-linux-user.mak | 2 ++ default-configs/mips64el-linux-user.mak | 2 ++ default-configs/mipsel-linux-user.mak | 2 ++ default-configs/mipsn32-linux-user.mak | 2 ++ default-configs/mipsn32el-linux-user.mak | 2 ++ 7 files changed, 16 insertions(+) create mode 100644 default-configs/mips-linux-user-common.mak diff --git a/default-configs/mips-linux-user-common.mak b/default-configs/mips-linux-user-common.mak new file mode 100644 index 0000000000..04947706e8 --- /dev/null +++ b/default-configs/mips-linux-user-common.mak @@ -0,0 +1,4 @@ +# Common mips*-linux-user CONFIG defines + +# CONFIG_SEMIHOSTING is always required on this architecture +CONFIG_SEMIHOSTING=y diff --git a/default-configs/mips-linux-user.mak b/default-configs/mips-linux-user.mak index 31df57021e..c606e12444 100644 --- a/default-configs/mips-linux-user.mak +++ b/default-configs/mips-linux-user.mak @@ -1 +1,3 @@ # Default configuration for mips-linux-user + +include mips-linux-user-common.mak diff --git a/default-configs/mips64-linux-user.mak b/default-configs/mips64-linux-user.mak index 1598bfcf7d..81e16ac2eb 100644 --- a/default-configs/mips64-linux-user.mak +++ b/default-configs/mips64-linux-user.mak @@ -1 +1,3 @@ # Default configuration for mips64-linux-user + +include mips-linux-user-common.mak diff --git a/default-configs/mips64el-linux-user.mak b/default-configs/mips64el-linux-user.mak index 629f084086..6399af3fd5 100644 --- a/default-configs/mips64el-linux-user.mak +++ b/default-configs/mips64el-linux-user.mak @@ -1 +1,3 @@ # Default configuration for mips64el-linux-user + +include mips-linux-user-common.mak diff --git a/default-configs/mipsel-linux-user.mak b/default-configs/mipsel-linux-user.mak index 4d0e4afb69..4a27d30b45 100644 --- a/default-configs/mipsel-linux-user.mak +++ b/default-configs/mipsel-linux-user.mak @@ -1 +1,3 @@ # Default configuration for mipsel-linux-user + +include mips-linux-user-common.mak diff --git a/default-configs/mipsn32-linux-user.mak b/default-configs/mipsn32-linux-user.mak index 5b97919794..f3ac967463 100644 --- a/default-configs/mipsn32-linux-user.mak +++ b/default-configs/mipsn32-linux-user.mak @@ -1 +1,3 @@ # Default configuration for mipsn32-linux-user + +include mips-linux-user-common.mak diff --git a/default-configs/mipsn32el-linux-user.mak b/default-configs/mipsn32el-linux-user.mak index d6367ff987..63fe4de4fd 100644 --- a/default-configs/mipsn32el-linux-user.mak +++ b/default-configs/mipsn32el-linux-user.mak @@ -1 +1,3 @@ # Default configuration for mipsn32el-linux-user + +include mips-linux-user-common.mak From patchwork Mon Jul 15 15:22:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1132080 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com 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 ozlabs.org (Postfix) with ESMTPS id 45nS3M4NDPz9sRJ for ; Tue, 16 Jul 2019 01:23:27 +1000 (AEST) Received: from localhost ([::1]:40100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn2p3-0007TQ-73 for incoming@patchwork.ozlabs.org; Mon, 15 Jul 2019 11:23:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47333) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn2oh-0006Uy-Jg for qemu-devel@nongnu.org; Mon, 15 Jul 2019 11:23:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hn2of-0001T1-FA for qemu-devel@nongnu.org; Mon, 15 Jul 2019 11:23:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39584) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hn2oc-0001RU-F9; Mon, 15 Jul 2019 11:22:58 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A075481F31; Mon, 15 Jul 2019 15:22:57 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.87]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B8BC3608CD; Mon, 15 Jul 2019 15:22:50 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Mon, 15 Jul 2019 17:22:23 +0200 Message-Id: <20190715152225.26135-4-philmd@redhat.com> In-Reply-To: <20190715152225.26135-1-philmd@redhat.com> References: <20190715152225.26135-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 15 Jul 2019 15:22:57 +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] [RFC PATCH-for-4.1? v2 3/5] hw/semihosting: Allow this feature to be disabled 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 , Thomas Huth , Aleksandar Rikalo , James Hogan , Riku Voipio , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, Aleksandar Markovic , Paolo Bonzini , James Hogan , =?utf-8?q?Alex_Benn=C3=A9e?= , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" So far only the ARM/MIPS/LM32 provide the semihosting feature. Do not enable it by default, and let the few targets requiring it to manually select it (Actually only ARM/MIPS). Signed-off-by: Philippe Mathieu-Daudé --- hw/semihosting/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/semihosting/Kconfig b/hw/semihosting/Kconfig index efe0a30734..61edb4ada8 100644 --- a/hw/semihosting/Kconfig +++ b/hw/semihosting/Kconfig @@ -1,3 +1,4 @@ config SEMIHOSTING - bool + bool + default n From patchwork Mon Jul 15 15:22:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1132082 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com 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 ozlabs.org (Postfix) with ESMTPS id 45nS3v5d32z9sRp for ; Tue, 16 Jul 2019 01:23:55 +1000 (AEST) Received: from localhost ([::1]:40117 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn2pV-0001Ck-OY for incoming@patchwork.ozlabs.org; Mon, 15 Jul 2019 11:23:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47374) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn2oq-00078z-Cb for qemu-devel@nongnu.org; Mon, 15 Jul 2019 11:23:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hn2op-0001Ya-7L for qemu-devel@nongnu.org; Mon, 15 Jul 2019 11:23:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53388) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hn2om-0001WK-OO; Mon, 15 Jul 2019 11:23:08 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F1910307D851; Mon, 15 Jul 2019 15:23:07 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.87]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 53539608E4; Mon, 15 Jul 2019 15:22:58 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Mon, 15 Jul 2019 17:22:24 +0200 Message-Id: <20190715152225.26135-5-philmd@redhat.com> In-Reply-To: <20190715152225.26135-1-philmd@redhat.com> References: <20190715152225.26135-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Mon, 15 Jul 2019 15:23:08 +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] [RFC PATCH-for-4.1? v2 4/5] target/arm: Add stubs to build with CONFIG_SEMIHOSTING disabled 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 , Thomas Huth , Aleksandar Rikalo , James Hogan , Riku Voipio , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, Aleksandar Markovic , Paolo Bonzini , Miroslav Rezanina , James Hogan , =?utf-8?q?Alex_Benn=C3=A9e?= , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" If a distribution wants to build QEMU without semihosting support, it currently gets this build failure: $ ./configure --target-list=aarch64-softmmu --without-default-devices $ sed -i s/CONFIG_SEMIHOSTING=y/CONFIG_SEMIHOSTING=n/ default-configs/arm-softmmu.mak $ make subdir-aarch64-softmmu [...] LINK aarch64-softmmu/qemu-system-aarch64 /usr/bin/ld: target/arm/arm-semi.o: in function `do_arm_semihosting': ./target/arm/arm-semi.c:321: undefined reference to `qemu_semihosting_console_out' /usr/bin/ld: ./target/arm/arm-semi.c:318: undefined reference to `qemu_semihosting_console_out' collect2: error: ld returned 1 exit status make[1]: *** [Makefile:204: qemu-system-aarch64] Error 1 make: *** [Makefile:472: subdir-aarch64-softmmu] Error 2 Fix it by providing a stub when semihosting is disabled. Reported-by: Miroslav Rezanina Signed-off-by: Philippe Mathieu-Daudé --- default-configs/arm-softmmu.mak | 2 +- target/arm/Makefile.objs | 3 ++- target/arm/arm-semi-stubs.c | 21 +++++++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 target/arm/arm-semi-stubs.c diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index ad2debf543..bf34bcb137 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -1,6 +1,6 @@ # Default configuration for arm-softmmu -# CONFIG_SEMIHOSTING is always required on this architecture +# CONFIG_SEMIHOSTING is not required on KVM only builds CONFIG_SEMIHOSTING=y # TODO: ARM_V7M is currently always required - make this more flexible! diff --git a/target/arm/Makefile.objs b/target/arm/Makefile.objs index 5cafc1eb6c..4afaf82bbe 100644 --- a/target/arm/Makefile.objs +++ b/target/arm/Makefile.objs @@ -1,4 +1,5 @@ -obj-$(CONFIG_TCG) += arm-semi.o +obj-$(CONFIG_SEMIHOSTING) += arm-semi.o +obj-$(call lnot,$(CONFIG_SEMIHOSTING)) += arm-semi-stubs.o obj-y += helper.o vfp_helper.o obj-y += cpu.o gdbstub.o obj-$(TARGET_AARCH64) += cpu64.o gdbstub64.o diff --git a/target/arm/arm-semi-stubs.c b/target/arm/arm-semi-stubs.c new file mode 100644 index 0000000000..a91ecbd9d5 --- /dev/null +++ b/target/arm/arm-semi-stubs.c @@ -0,0 +1,21 @@ +/* + * Arm "Angel" semihosting stubs + * + * Copyright (c) 2019 Red Hat, Inc. + * + * Author: + * Philippe Mathieu-Daudé + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "cpu.h" + +target_ulong do_arm_semihosting(CPUARMState *env) +{ + g_assert_not_reached(); +} From patchwork Mon Jul 15 15:22:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1132081 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com 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 ozlabs.org (Postfix) with ESMTPS id 45nS3b22prz9sRV for ; Tue, 16 Jul 2019 01:23:39 +1000 (AEST) Received: from localhost ([::1]:40104 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn2pF-0008FE-4z for incoming@patchwork.ozlabs.org; Mon, 15 Jul 2019 11:23:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47457) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hn2ox-0007c0-43 for qemu-devel@nongnu.org; Mon, 15 Jul 2019 11:23:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hn2ow-0001ez-0t for qemu-devel@nongnu.org; Mon, 15 Jul 2019 11:23:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36548) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hn2ot-0001c2-Gs; Mon, 15 Jul 2019 11:23:15 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BA401C057F3D; Mon, 15 Jul 2019 15:23:14 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.87]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BEA5A608C6; Mon, 15 Jul 2019 15:23:08 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Mon, 15 Jul 2019 17:22:25 +0200 Message-Id: <20190715152225.26135-6-philmd@redhat.com> In-Reply-To: <20190715152225.26135-1-philmd@redhat.com> References: <20190715152225.26135-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 15 Jul 2019 15:23:14 +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] [RFC PATCH-for-4.1? v2 5/5] target/mips: Add stubs to build with CONFIG_SEMIHOSTING disabled 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 , Thomas Huth , Aleksandar Rikalo , James Hogan , Riku Voipio , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, Aleksandar Markovic , Paolo Bonzini , James Hogan , =?utf-8?q?Alex_Benn=C3=A9e?= , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" If a distribution wants to build QEMU without semihosting support, it currently gets this build failure: $ ./configure --target-list=mips64el-softmmu --without-default-devices $ sed -i s/CONFIG_SEMIHOSTING=y/CONFIG_SEMIHOSTING=n/ default-configs/mips-softmmu-common.mak $ make subdir-mips64el-softmmu [...] LINK mips64el-softmmu/qemu-system-mips64el /usr/bin/ld: target/mips/mips-semi.o: in function `helper_do_semihosting': ./target/mips/mips-semi.c:335: undefined reference to `qemu_semihosting_log_out' /usr/bin/ld: ./target/mips/mips-semi.c:338: undefined reference to `qemu_semihosting_log_out' collect2: error: ld returned 1 exit status make[1]: *** [Makefile:204: qemu-system-mips64el] Error 1 make: *** [Makefile:472: subdir-mips64el-softmmu] Error 2 Fix it by providing a stub when semihosting is disabled. Signed-off-by: Philippe Mathieu-Daudé --- default-configs/mips-softmmu-common.mak | 2 +- target/mips/Makefile.objs | 3 ++- target/mips/mips-semi-stubs.c | 22 ++++++++++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 target/mips/mips-semi-stubs.c diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak index da29c6c0b2..08fa16191f 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -1,6 +1,6 @@ # Common mips*-softmmu CONFIG defines -# CONFIG_SEMIHOSTING is always required on this architecture +# CONFIG_SEMIHOSTING is probably not required on KVM only builds CONFIG_SEMIHOSTING=y CONFIG_ISA_BUS=y diff --git a/target/mips/Makefile.objs b/target/mips/Makefile.objs index 3448ad5e19..3f4d566a35 100644 --- a/target/mips/Makefile.objs +++ b/target/mips/Makefile.objs @@ -1,5 +1,6 @@ obj-y += translate.o dsp_helper.o op_helper.o lmi_helper.o helper.o cpu.o obj-y += gdbstub.o msa_helper.o -obj-$(CONFIG_SOFTMMU) += mips-semi.o +obj-$(CONFIG_SEMIHOSTING) += mips-semi.o +obj-$(call lnot,$(CONFIG_SEMIHOSTING)) += mips-semi-stubs.o obj-$(CONFIG_SOFTMMU) += machine.o cp0_timer.o obj-$(CONFIG_KVM) += kvm.o diff --git a/target/mips/mips-semi-stubs.c b/target/mips/mips-semi-stubs.c new file mode 100644 index 0000000000..b1d3f88edc --- /dev/null +++ b/target/mips/mips-semi-stubs.c @@ -0,0 +1,22 @@ +/* + * Unified Hosting Interface syscalls stubs + * + * Copyright (c) 2019 Red Hat, Inc. + * + * Author: + * Philippe Mathieu-Daudé + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "cpu.h" +#include "exec/helper-proto.h" + +void helper_do_semihosting(CPUMIPSState *env) +{ + g_assert_not_reached(); +}