* [PATCH v3 00/11] accel: Allow targets to use Kconfig, disable semihosting by default
@ 2020-05-21 19:59 Philippe Mathieu-Daudé
2020-05-21 19:59 ` [PATCH v3 01/11] MAINTAINERS: Fix KVM path expansion glob Philippe Mathieu-Daudé
` (11 more replies)
0 siblings, 12 replies; 19+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-05-21 19:59 UTC (permalink / raw)
To: qemu-devel
Cc: Marek Vasut, Peter Maydell, Thomas Huth, qemu-riscv,
Sagar Karandikar, Aleksandar Markovic, Bastian Koppelmann,
Chris Wulff, Laurent Vivier, Philippe Mathieu-Daudé,
Max Filippov, Michael Walle, qemu-arm, Palmer Dabbelt,
Paolo Bonzini, Alistair Francis, Alex Bennée,
Aleksandar Rikalo, Aurelien Jarno, Richard Henderson
Missing review: patch #9 'rules.mak: Add base-arch rule'
and patch #11 'semihosting: Make the feature depend of TCG'
This series include generic patches I took of the KVM/ARM
specific series which will follow.
- List orphan accelerators in MAINTAINERS
- Add accel/Kconfig
- Allow targets to use their how Kconfig
- Enforce semihosting on architecture where required,
disable it elsewhere
Since v2:
- Addressed Thomas review comments
- Fixed problem when including TARGET instead of BASE_TARGET
Since v1:
https://www.mail-archive.com/qemu-devel@nongnu.org/msg689024.html
- Drop HVF MAINTAINERS patch (merged elsewhere)
- Kconfig-select SEMIHOSTING (bonzini)
- Drop user-mode selection patches
- consider m68k/nios2/xtensa/riscv (pm215)
- reword Kconfig SEMIHOSTING description (pm215)
- reset some of rth R-b tags
Previous RFC for semihosting posted earlier:
https://www.mail-archive.com/qemu-devel@nongnu.org/msg631218.html
$ git backport-diff -u v2 -r v3
Key:
[----] : patches are identical
[####] : number of functional differences between upstream/downstream patch
[down] : patch is downstream-only
The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively
001/11:[----] [--] 'MAINTAINERS: Fix KVM path expansion glob'
002/11:[0002] [FC] 'MAINTAINERS: Add an 'overall' entry for accelerators'
003/11:[----] [-C] 'MAINTAINERS: Add an entry for the HAX accelerator'
004/11:[----] [--] 'accel/tcg: Add stub for probe_access()'
005/11:[----] [--] 'Makefile: Remove dangerous EOL trailing backslash'
006/11:[----] [--] 'Makefile: Write MINIKCONF variables as one entry per line'
007/11:[----] [--] 'accel/Kconfig: Extract accel selectors into their own config'
008/11:[----] [--] 'accel/Kconfig: Add the TCG selector'
009/11:[down] 'rules.mak: Add base-arch() rule'
010/11:[0002] [FC] 'Makefile: Allow target-specific optional Kconfig'
011/11:[0014] [FC] 'hw/semihosting: Make the feature depend of TCG, and allow to disable it'
Philippe Mathieu-Daudé (11):
MAINTAINERS: Fix KVM path expansion glob
MAINTAINERS: Add an 'overall' entry for accelerators
MAINTAINERS: Add an entry for the HAX accelerator
accel/tcg: Add stub for probe_access()
Makefile: Remove dangerous EOL trailing backslash
Makefile: Write MINIKCONF variables as one entry per line
accel/Kconfig: Extract accel selectors into their own config
accel/Kconfig: Add the TCG selector
rules.mak: Add base-arch() rule
Makefile: Allow target-specific optional Kconfig
hw/semihosting: Make the feature depend of TCG, and allow to disable
it
Makefile | 15 +++++++++++----
default-configs/arm-softmmu.mak | 1 -
default-configs/lm32-softmmu.mak | 2 --
default-configs/m68k-softmmu.mak | 2 --
default-configs/mips-softmmu-common.mak | 3 ---
default-configs/nios2-softmmu.mak | 2 --
default-configs/xtensa-softmmu.mak | 2 --
rules.mak | 16 ++++++++++++++++
accel/stubs/tcg-stub.c | 7 +++++++
Kconfig.host | 7 -------
MAINTAINERS | 19 ++++++++++++++++++-
accel/Kconfig | 9 +++++++++
hw/semihosting/Kconfig | 4 +++-
target/arm/Kconfig | 2 ++
target/lm32/Kconfig | 2 ++
target/m68k/Kconfig | 2 ++
target/mips/Kconfig | 2 ++
target/nios2/Kconfig | 2 ++
target/riscv/Kconfig | 2 ++
target/xtensa/Kconfig | 2 ++
20 files changed, 78 insertions(+), 25 deletions(-)
create mode 100644 accel/Kconfig
create mode 100644 target/arm/Kconfig
create mode 100644 target/lm32/Kconfig
create mode 100644 target/m68k/Kconfig
create mode 100644 target/mips/Kconfig
create mode 100644 target/nios2/Kconfig
create mode 100644 target/riscv/Kconfig
create mode 100644 target/xtensa/Kconfig
--
2.21.3
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v3 01/11] MAINTAINERS: Fix KVM path expansion glob
2020-05-21 19:59 [PATCH v3 00/11] accel: Allow targets to use Kconfig, disable semihosting by default Philippe Mathieu-Daudé
@ 2020-05-21 19:59 ` Philippe Mathieu-Daudé
2020-05-21 19:59 ` [PATCH v3 02/11] MAINTAINERS: Add an 'overall' entry for accelerators Philippe Mathieu-Daudé
` (10 subsequent siblings)
11 siblings, 0 replies; 19+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-05-21 19:59 UTC (permalink / raw)
To: qemu-devel
Cc: Marek Vasut, Peter Maydell, Thomas Huth, qemu-riscv,
Sagar Karandikar, Aleksandar Markovic, Bastian Koppelmann,
Chris Wulff, Richard Henderson, Laurent Vivier,
Philippe Mathieu-Daudé,
Max Filippov, Michael Walle, qemu-arm, Palmer Dabbelt,
Paolo Bonzini, Alistair Francis, Alex Bennée,
Aleksandar Rikalo, Aurelien Jarno, Richard Henderson
The KVM files has been moved from target-ARCH to the target/ARCH/
folder in commit fcf5ef2a. Fix the pathname expansion.
Fixes: fcf5ef2a ("Move target-* CPU file into a target/ folder")
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
MAINTAINERS | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 87a412c229..eebdcc6aa9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -361,7 +361,7 @@ Overall KVM CPUs
M: Paolo Bonzini <pbonzini@redhat.com>
L: kvm@vger.kernel.org
S: Supported
-F: */kvm.*
+F: */*/kvm*
F: accel/kvm/
F: accel/stubs/kvm-stub.c
F: include/hw/kvm/
--
2.21.3
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v3 02/11] MAINTAINERS: Add an 'overall' entry for accelerators
2020-05-21 19:59 [PATCH v3 00/11] accel: Allow targets to use Kconfig, disable semihosting by default Philippe Mathieu-Daudé
2020-05-21 19:59 ` [PATCH v3 01/11] MAINTAINERS: Fix KVM path expansion glob Philippe Mathieu-Daudé
@ 2020-05-21 19:59 ` Philippe Mathieu-Daudé
2020-05-21 19:59 ` [PATCH v3 03/11] MAINTAINERS: Add an entry for the HAX accelerator Philippe Mathieu-Daudé
` (9 subsequent siblings)
11 siblings, 0 replies; 19+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-05-21 19:59 UTC (permalink / raw)
To: qemu-devel
Cc: Marek Vasut, Peter Maydell, Thomas Huth, qemu-riscv,
Sagar Karandikar, Aleksandar Markovic, Bastian Koppelmann,
Chris Wulff, Richard Henderson, Laurent Vivier,
Philippe Mathieu-Daudé,
Max Filippov, Michael Walle, qemu-arm, Palmer Dabbelt,
Paolo Bonzini, Alistair Francis, Alex Bennée,
Aleksandar Rikalo, Aurelien Jarno, Richard Henderson
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Paolo Bonzini <pbonzini@redhat.com>
v2: Cover accel/accel.c & accel/Makefile.objs (thuth)
---
MAINTAINERS | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index eebdcc6aa9..d7b98f9878 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -415,6 +415,17 @@ S: Supported
F: target/i386/kvm.c
F: scripts/kvm/vmxcap
+Guest CPU Cores (other accelerators)
+------------------------------------
+Overall
+M: Richard Henderson <rth@twiddle.net>
+R: Paolo Bonzini <pbonzini@redhat.com>
+S: Maintained
+F: include/sysemu/accel.h
+F: accel/accel.c
+F: accel/Makefile.objs
+F: accel/stubs/Makefile.objs
+
X86 HVF CPUs
M: Roman Bolshakov <r.bolshakov@yadro.com>
S: Maintained
--
2.21.3
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v3 03/11] MAINTAINERS: Add an entry for the HAX accelerator
2020-05-21 19:59 [PATCH v3 00/11] accel: Allow targets to use Kconfig, disable semihosting by default Philippe Mathieu-Daudé
2020-05-21 19:59 ` [PATCH v3 01/11] MAINTAINERS: Fix KVM path expansion glob Philippe Mathieu-Daudé
2020-05-21 19:59 ` [PATCH v3 02/11] MAINTAINERS: Add an 'overall' entry for accelerators Philippe Mathieu-Daudé
@ 2020-05-21 19:59 ` Philippe Mathieu-Daudé
2020-05-21 19:59 ` [PATCH v3 04/11] accel/tcg: Add stub for probe_access() Philippe Mathieu-Daudé
` (8 subsequent siblings)
11 siblings, 0 replies; 19+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-05-21 19:59 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, Sagar Karandikar, Max Filippov, Alistair Francis,
Colin Xu, Yu Ning, Tao Wu, Marek Vasut, Vincent Palatin,
David Chou, Aleksandar Markovic, Aleksandar Rikalo,
Philippe Mathieu-Daudé,
Thomas Huth, haxm-team, Hang Yuan, qemu-arm, Alex Bennée,
Richard Henderson, qemu-riscv, Bastian Koppelmann, Chris Wulff,
Laurent Vivier, Sergio Andres Gomez Del Real, Michael Walle,
Palmer Dabbelt, Wenchao Wang, Paolo Bonzini, Aurelien Jarno
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Sergio Andres Gomez Del Real <sergio.g.delreal@gmail.com>
Cc: Vincent Palatin <vpalatin@chromium.org>
Cc: Yu Ning <yu.ning@intel.com>
Cc: Tao Wu <lepton@google.com>
Cc: haxm-team@intel.com
Cc: Colin Xu <colin.xu@intel.com>
Cc: Hang Yuan <hang.yuan@intel.com>
Cc: David Chou <david.j.chou@intel.com>
Cc: Wenchao Wang <wenchao.wang@intel.com>
---
MAINTAINERS | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index d7b98f9878..0f76dc330b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -426,6 +426,12 @@ F: accel/accel.c
F: accel/Makefile.objs
F: accel/stubs/Makefile.objs
+HAX Accelerator
+S: Orphan
+F: accel/stubs/hax-stub.c
+F: target/i386/hax-all.c
+F: include/sysemu/hax.h
+
X86 HVF CPUs
M: Roman Bolshakov <r.bolshakov@yadro.com>
S: Maintained
--
2.21.3
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v3 04/11] accel/tcg: Add stub for probe_access()
2020-05-21 19:59 [PATCH v3 00/11] accel: Allow targets to use Kconfig, disable semihosting by default Philippe Mathieu-Daudé
` (2 preceding siblings ...)
2020-05-21 19:59 ` [PATCH v3 03/11] MAINTAINERS: Add an entry for the HAX accelerator Philippe Mathieu-Daudé
@ 2020-05-21 19:59 ` Philippe Mathieu-Daudé
2020-06-17 13:51 ` Stefan Hajnoczi
2020-05-21 19:59 ` [PATCH v3 05/11] Makefile: Remove dangerous EOL trailing backslash Philippe Mathieu-Daudé
` (7 subsequent siblings)
11 siblings, 1 reply; 19+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-05-21 19:59 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, Sagar Karandikar, David Hildenbrand,
Philippe Mathieu-Daudé,
Max Filippov, Alistair Francis, Marek Vasut, Aleksandar Markovic,
Emilio G . Cota, Aleksandar Rikalo, Thomas Huth,
Richard Henderson, qemu-arm, Alex Bennée, Richard Henderson,
qemu-riscv, Bastian Koppelmann, Chris Wulff, Laurent Vivier,
Michael Walle, Palmer Dabbelt, Paolo Bonzini, Aurelien Jarno
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
The TCG helpers where added in b92e5a22ec3 in softmmu_template.h.
probe_write() was added in there in 3b4afc9e75a to be moved out
to accel/tcg/cputlb.c in 3b08f0a9254, and was later refactored
as probe_access() in c25c283df0f.
Since it is a TCG specific helper, add a stub to avoid failures
when building without TCG, such:
target/arm/helper.o: In function `probe_read':
include/exec/exec-all.h:362: undefined reference to `probe_access'
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
Cc: Richard Henderson <rth@twiddle.net>
Cc: Emilio G. Cota <cota@braap.org>
Cc: Alex Bennée <alex.bennee@linaro.org>
Cc: David Hildenbrand <david@redhat.com>
---
accel/stubs/tcg-stub.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/accel/stubs/tcg-stub.c b/accel/stubs/tcg-stub.c
index 677191a69c..e4bbf997aa 100644
--- a/accel/stubs/tcg-stub.c
+++ b/accel/stubs/tcg-stub.c
@@ -22,3 +22,10 @@ void tb_flush(CPUState *cpu)
void tlb_set_dirty(CPUState *cpu, target_ulong vaddr)
{
}
+
+void *probe_access(CPUArchState *env, target_ulong addr, int size,
+ MMUAccessType access_type, int mmu_idx, uintptr_t retaddr)
+{
+ /* Handled by hardware accelerator. */
+ g_assert_not_reached();
+}
--
2.21.3
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v3 05/11] Makefile: Remove dangerous EOL trailing backslash
2020-05-21 19:59 [PATCH v3 00/11] accel: Allow targets to use Kconfig, disable semihosting by default Philippe Mathieu-Daudé
` (3 preceding siblings ...)
2020-05-21 19:59 ` [PATCH v3 04/11] accel/tcg: Add stub for probe_access() Philippe Mathieu-Daudé
@ 2020-05-21 19:59 ` Philippe Mathieu-Daudé
2020-05-21 19:59 ` [PATCH v3 06/11] Makefile: Write MINIKCONF variables as one entry per line Philippe Mathieu-Daudé
` (6 subsequent siblings)
11 siblings, 0 replies; 19+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-05-21 19:59 UTC (permalink / raw)
To: qemu-devel
Cc: Marek Vasut, Peter Maydell, Thomas Huth, qemu-riscv,
Sagar Karandikar, Aleksandar Markovic, Bastian Koppelmann,
Chris Wulff, Laurent Vivier, Philippe Mathieu-Daudé,
Max Filippov, Michael Walle, qemu-arm, Palmer Dabbelt,
Paolo Bonzini, Alistair Francis, Alex Bennée,
Aleksandar Rikalo, Aurelien Jarno, Richard Henderson
One might get caught trying to understand unexpected Makefile
behavior. Trailing backslash can help to split very long lines,
but are rather dangerous when nothing follow. Preserve other
developers debugging time by removing this one.
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 40e4f7677b..6c9d718b2c 100644
--- a/Makefile
+++ b/Makefile
@@ -420,7 +420,7 @@ MINIKCONF_ARGS = \
MINIKCONF_INPUTS = $(SRC_PATH)/Kconfig.host $(SRC_PATH)/hw/Kconfig
MINIKCONF_DEPS = $(MINIKCONF_INPUTS) $(wildcard $(SRC_PATH)/hw/*/Kconfig)
-MINIKCONF = $(PYTHON) $(SRC_PATH)/scripts/minikconf.py \
+MINIKCONF = $(PYTHON) $(SRC_PATH)/scripts/minikconf.py
$(SUBDIR_DEVICES_MAK): %/config-devices.mak: default-configs/%.mak $(MINIKCONF_DEPS) $(BUILD_DIR)/config-host.mak
$(call quiet-command, $(MINIKCONF) $(MINIKCONF_ARGS) > $@.tmp, "GEN", "$@.tmp")
--
2.21.3
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v3 06/11] Makefile: Write MINIKCONF variables as one entry per line
2020-05-21 19:59 [PATCH v3 00/11] accel: Allow targets to use Kconfig, disable semihosting by default Philippe Mathieu-Daudé
` (4 preceding siblings ...)
2020-05-21 19:59 ` [PATCH v3 05/11] Makefile: Remove dangerous EOL trailing backslash Philippe Mathieu-Daudé
@ 2020-05-21 19:59 ` Philippe Mathieu-Daudé
2020-05-21 19:59 ` [PATCH v3 07/11] accel/Kconfig: Extract accel selectors into their own config Philippe Mathieu-Daudé
` (5 subsequent siblings)
11 siblings, 0 replies; 19+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-05-21 19:59 UTC (permalink / raw)
To: qemu-devel
Cc: Marek Vasut, Peter Maydell, Thomas Huth, qemu-riscv,
Sagar Karandikar, Aleksandar Markovic, Bastian Koppelmann,
Chris Wulff, Richard Henderson, Laurent Vivier,
Philippe Mathieu-Daudé,
Max Filippov, Michael Walle, qemu-arm, Palmer Dabbelt,
Paolo Bonzini, Alistair Francis, Alex Bennée,
Aleksandar Rikalo, Aurelien Jarno, Richard Henderson
Having one entry per line helps reviews/refactors. As we are
going to modify the MINIKCONF variables, split them now to
ease further review.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Makefile | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 6c9d718b2c..7666f81e8a 100644
--- a/Makefile
+++ b/Makefile
@@ -418,12 +418,15 @@ MINIKCONF_ARGS = \
CONFIG_LINUX=$(CONFIG_LINUX) \
CONFIG_PVRDMA=$(CONFIG_PVRDMA)
-MINIKCONF_INPUTS = $(SRC_PATH)/Kconfig.host $(SRC_PATH)/hw/Kconfig
-MINIKCONF_DEPS = $(MINIKCONF_INPUTS) $(wildcard $(SRC_PATH)/hw/*/Kconfig)
+MINIKCONF_INPUTS = $(SRC_PATH)/Kconfig.host \
+ $(SRC_PATH)/hw/Kconfig
+MINIKCONF_DEPS = $(MINIKCONF_INPUTS) \
+ $(wildcard $(SRC_PATH)/hw/*/Kconfig)
MINIKCONF = $(PYTHON) $(SRC_PATH)/scripts/minikconf.py
$(SUBDIR_DEVICES_MAK): %/config-devices.mak: default-configs/%.mak $(MINIKCONF_DEPS) $(BUILD_DIR)/config-host.mak
- $(call quiet-command, $(MINIKCONF) $(MINIKCONF_ARGS) > $@.tmp, "GEN", "$@.tmp")
+ $(call quiet-command, $(MINIKCONF) $(MINIKCONF_ARGS) \
+ > $@.tmp, "GEN", "$@.tmp")
$(call quiet-command, if test -f $@; then \
if cmp -s $@.old $@; then \
mv $@.tmp $@; \
--
2.21.3
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v3 07/11] accel/Kconfig: Extract accel selectors into their own config
2020-05-21 19:59 [PATCH v3 00/11] accel: Allow targets to use Kconfig, disable semihosting by default Philippe Mathieu-Daudé
` (5 preceding siblings ...)
2020-05-21 19:59 ` [PATCH v3 06/11] Makefile: Write MINIKCONF variables as one entry per line Philippe Mathieu-Daudé
@ 2020-05-21 19:59 ` Philippe Mathieu-Daudé
2020-05-21 19:59 ` [PATCH v3 08/11] accel/Kconfig: Add the TCG selector Philippe Mathieu-Daudé
` (4 subsequent siblings)
11 siblings, 0 replies; 19+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-05-21 19:59 UTC (permalink / raw)
To: qemu-devel
Cc: Marek Vasut, Peter Maydell, Thomas Huth, qemu-riscv,
Sagar Karandikar, Aleksandar Markovic, Bastian Koppelmann,
Chris Wulff, Richard Henderson, Laurent Vivier,
Philippe Mathieu-Daudé,
Max Filippov, Michael Walle, qemu-arm, Palmer Dabbelt,
Paolo Bonzini, Alistair Francis, Alex Bennée,
Aleksandar Rikalo, Aurelien Jarno, Richard Henderson
Move the accel selectors from the global Kconfig.host to their
own Kconfig file.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Makefile | 1 +
Kconfig.host | 7 -------
accel/Kconfig | 6 ++++++
3 files changed, 7 insertions(+), 7 deletions(-)
create mode 100644 accel/Kconfig
diff --git a/Makefile b/Makefile
index 7666f81e8a..648757f79a 100644
--- a/Makefile
+++ b/Makefile
@@ -419,6 +419,7 @@ MINIKCONF_ARGS = \
CONFIG_PVRDMA=$(CONFIG_PVRDMA)
MINIKCONF_INPUTS = $(SRC_PATH)/Kconfig.host \
+ $(SRC_PATH)/accel/Kconfig \
$(SRC_PATH)/hw/Kconfig
MINIKCONF_DEPS = $(MINIKCONF_INPUTS) \
$(wildcard $(SRC_PATH)/hw/*/Kconfig)
diff --git a/Kconfig.host b/Kconfig.host
index 55136e037d..a6d871c399 100644
--- a/Kconfig.host
+++ b/Kconfig.host
@@ -2,9 +2,6 @@
# down to Kconfig. See also MINIKCONF_ARGS in the Makefile:
# these two need to be kept in sync.
-config KVM
- bool
-
config LINUX
bool
@@ -31,10 +28,6 @@ config VHOST_KERNEL
bool
select VHOST
-config XEN
- bool
- select FSDEV_9P if VIRTFS
-
config VIRTFS
bool
diff --git a/accel/Kconfig b/accel/Kconfig
new file mode 100644
index 0000000000..c21802bb49
--- /dev/null
+++ b/accel/Kconfig
@@ -0,0 +1,6 @@
+config KVM
+ bool
+
+config XEN
+ bool
+ select FSDEV_9P if VIRTFS
--
2.21.3
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v3 08/11] accel/Kconfig: Add the TCG selector
2020-05-21 19:59 [PATCH v3 00/11] accel: Allow targets to use Kconfig, disable semihosting by default Philippe Mathieu-Daudé
` (6 preceding siblings ...)
2020-05-21 19:59 ` [PATCH v3 07/11] accel/Kconfig: Extract accel selectors into their own config Philippe Mathieu-Daudé
@ 2020-05-21 19:59 ` Philippe Mathieu-Daudé
2020-05-21 19:59 ` [PATCH v3 09/11] rules.mak: Add base-arch() rule Philippe Mathieu-Daudé
` (3 subsequent siblings)
11 siblings, 0 replies; 19+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-05-21 19:59 UTC (permalink / raw)
To: qemu-devel
Cc: Marek Vasut, Peter Maydell, Thomas Huth, qemu-riscv,
Sagar Karandikar, Aleksandar Markovic, Bastian Koppelmann,
Chris Wulff, Richard Henderson, Laurent Vivier,
Philippe Mathieu-Daudé,
Max Filippov, Michael Walle, qemu-arm, Palmer Dabbelt,
Paolo Bonzini, Alistair Francis, Alex Bennée,
Aleksandar Rikalo, Aurelien Jarno, Richard Henderson
Expose the CONFIG_TCG selector to let minikconf.py uses it.
When building with --disable-tcg build, this helps to deselect
devices that are TCG-dependent.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Makefile | 1 +
accel/Kconfig | 3 +++
2 files changed, 4 insertions(+)
diff --git a/Makefile b/Makefile
index 648757f79a..f8a45e1379 100644
--- a/Makefile
+++ b/Makefile
@@ -405,6 +405,7 @@ endif
MINIKCONF_ARGS = \
$(CONFIG_MINIKCONF_MODE) \
$@ $*/config-devices.mak.d $< $(MINIKCONF_INPUTS) \
+ CONFIG_TCG=$(CONFIG_TCG) \
CONFIG_KVM=$(CONFIG_KVM) \
CONFIG_SPICE=$(CONFIG_SPICE) \
CONFIG_IVSHMEM=$(CONFIG_IVSHMEM) \
diff --git a/accel/Kconfig b/accel/Kconfig
index c21802bb49..2ad94a3839 100644
--- a/accel/Kconfig
+++ b/accel/Kconfig
@@ -1,3 +1,6 @@
+config TCG
+ bool
+
config KVM
bool
--
2.21.3
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v3 09/11] rules.mak: Add base-arch() rule
2020-05-21 19:59 [PATCH v3 00/11] accel: Allow targets to use Kconfig, disable semihosting by default Philippe Mathieu-Daudé
` (7 preceding siblings ...)
2020-05-21 19:59 ` [PATCH v3 08/11] accel/Kconfig: Add the TCG selector Philippe Mathieu-Daudé
@ 2020-05-21 19:59 ` Philippe Mathieu-Daudé
2020-05-22 4:24 ` Richard Henderson
2020-05-21 19:59 ` [PATCH v3 10/11] Makefile: Allow target-specific optional Kconfig Philippe Mathieu-Daudé
` (2 subsequent siblings)
11 siblings, 1 reply; 19+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-05-21 19:59 UTC (permalink / raw)
To: qemu-devel
Cc: Marek Vasut, Peter Maydell, Thomas Huth, qemu-riscv,
Sagar Karandikar, Aleksandar Markovic, Bastian Koppelmann,
Chris Wulff, Laurent Vivier, Philippe Mathieu-Daudé,
Max Filippov, Michael Walle, qemu-arm, Palmer Dabbelt,
Paolo Bonzini, Alistair Francis, Alex Bennée,
Aleksandar Rikalo, Aurelien Jarno, Richard Henderson
Add a rule to return the base architecture for a QEMU target.
The current list of TARGET_BASE_ARCH is:
$ git grep TARGET_BASE_ARCH configure
configure:7785:TARGET_BASE_ARCH=""
configure:7795: TARGET_BASE_ARCH=i386
configure:7813: TARGET_BASE_ARCH=arm
configure:7846: TARGET_BASE_ARCH=mips
configure:7854: TARGET_BASE_ARCH=mips
configure:7864: TARGET_BASE_ARCH=openrisc
configure:7871: TARGET_BASE_ARCH=ppc
configure:7879: TARGET_BASE_ARCH=ppc
configure:7887: TARGET_BASE_ARCH=ppc
configure:7894: TARGET_BASE_ARCH=riscv
configure:7900: TARGET_BASE_ARCH=riscv
configure:7920: TARGET_BASE_ARCH=sparc
configure:7925: TARGET_BASE_ARCH=sparc
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
rules.mak | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/rules.mak b/rules.mak
index 694865b63e..55810d0cd6 100644
--- a/rules.mak
+++ b/rules.mak
@@ -438,3 +438,19 @@ atomic = $(eval $1: $(call sentinel,$1) ; @:) \
print-%:
@echo '$*=$($*)'
+
+# base-arch
+# Usage: $(call base-arch, target)
+#
+# @target: the target architecture.
+#
+# This macro will return the base architecture for a target.
+#
+# As example, $(call base-arch, aarch64) returns 'arm'.
+base-arch = $(subst $(SPACE),,\
+ $(if $(findstring mips,$1),mips,\
+ $(if $(findstring ppc,$1),ppc,\
+ $(if $(findstring risc,$1),risc,\
+ $(if $(findstring sparc,$1),sparc,\
+ $(if $(findstring x86,$1),i386,\
+ $(if $(findstring aarch64,$1),arm,$1)))))))
--
2.21.3
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v3 10/11] Makefile: Allow target-specific optional Kconfig
2020-05-21 19:59 [PATCH v3 00/11] accel: Allow targets to use Kconfig, disable semihosting by default Philippe Mathieu-Daudé
` (8 preceding siblings ...)
2020-05-21 19:59 ` [PATCH v3 09/11] rules.mak: Add base-arch() rule Philippe Mathieu-Daudé
@ 2020-05-21 19:59 ` Philippe Mathieu-Daudé
2020-05-21 19:59 ` [PATCH v3 11/11] hw/semihosting: Make the feature depend of TCG, and allow to disable it Philippe Mathieu-Daudé
2020-05-22 2:30 ` [PATCH v3 00/11] accel: Allow targets to use Kconfig, disable semihosting by default no-reply
11 siblings, 0 replies; 19+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-05-21 19:59 UTC (permalink / raw)
To: qemu-devel
Cc: Marek Vasut, Peter Maydell, Thomas Huth, qemu-riscv,
Sagar Karandikar, Aleksandar Markovic, Bastian Koppelmann,
Chris Wulff, Richard Henderson, Laurent Vivier,
Philippe Mathieu-Daudé,
Max Filippov, Michael Walle, qemu-arm, Palmer Dabbelt,
Paolo Bonzini, Alistair Francis, Alex Bennée,
Aleksandar Rikalo, Aurelien Jarno, Richard Henderson
Allow use of target-specific Kconfig file.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
v3: Use base-arch() to include TARGET_BASE_ARCH/Kconfig
---
Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index f8a45e1379..d5009cd304 100644
--- a/Makefile
+++ b/Makefile
@@ -423,11 +423,13 @@ MINIKCONF_INPUTS = $(SRC_PATH)/Kconfig.host \
$(SRC_PATH)/accel/Kconfig \
$(SRC_PATH)/hw/Kconfig
MINIKCONF_DEPS = $(MINIKCONF_INPUTS) \
- $(wildcard $(SRC_PATH)/hw/*/Kconfig)
+ $(wildcard $(SRC_PATH)/hw/*/Kconfig) \
+ $(wildcard $(SRC_PATH)/target/*/Kconfig)
MINIKCONF = $(PYTHON) $(SRC_PATH)/scripts/minikconf.py
$(SUBDIR_DEVICES_MAK): %/config-devices.mak: default-configs/%.mak $(MINIKCONF_DEPS) $(BUILD_DIR)/config-host.mak
$(call quiet-command, $(MINIKCONF) $(MINIKCONF_ARGS) \
+ $(wildcard $(SRC_PATH)/target/$(call base-arch, $(firstword $(subst -, ,$@)))/Kconfig) \
> $@.tmp, "GEN", "$@.tmp")
$(call quiet-command, if test -f $@; then \
if cmp -s $@.old $@; then \
--
2.21.3
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v3 11/11] hw/semihosting: Make the feature depend of TCG, and allow to disable it
2020-05-21 19:59 [PATCH v3 00/11] accel: Allow targets to use Kconfig, disable semihosting by default Philippe Mathieu-Daudé
` (9 preceding siblings ...)
2020-05-21 19:59 ` [PATCH v3 10/11] Makefile: Allow target-specific optional Kconfig Philippe Mathieu-Daudé
@ 2020-05-21 19:59 ` Philippe Mathieu-Daudé
2020-05-22 4:26 ` Richard Henderson
2020-05-22 15:12 ` Philippe Mathieu-Daudé
2020-05-22 2:30 ` [PATCH v3 00/11] accel: Allow targets to use Kconfig, disable semihosting by default no-reply
11 siblings, 2 replies; 19+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-05-21 19:59 UTC (permalink / raw)
To: qemu-devel
Cc: Marek Vasut, Peter Maydell, Thomas Huth, qemu-riscv,
Sagar Karandikar, Aleksandar Markovic, Bastian Koppelmann,
Chris Wulff, Laurent Vivier, Philippe Mathieu-Daudé,
Max Filippov, Michael Walle, qemu-arm, Palmer Dabbelt,
Paolo Bonzini, Alistair Francis, Alex Bennée,
Aleksandar Rikalo, Aurelien Jarno, Richard Henderson
The semihosting feature is only meaningful when using TCG.
Do not enable it by default, and let the few targets requiring
it to manually select it.
The targets restricted to TCG that previously selected it
(see commit 16932bb761e52c2 'introduce CONFIG_SEMIHOSTING')
are left unmodified; however the selection is moved to the
target Kconfig.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
v3: Fixed odd hidden \xC2 UTF-8 chars:
Traceback (most recent call last):
File "qemu/scripts/minikconf.py", line 355, in parse_file
self.src = fp.read()
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc2 in position 21: ordinal not in range(128)
---
default-configs/arm-softmmu.mak | 1 -
default-configs/lm32-softmmu.mak | 2 --
default-configs/m68k-softmmu.mak | 2 --
default-configs/mips-softmmu-common.mak | 3 ---
default-configs/nios2-softmmu.mak | 2 --
default-configs/xtensa-softmmu.mak | 2 --
hw/semihosting/Kconfig | 4 +++-
target/arm/Kconfig | 2 ++
target/lm32/Kconfig | 2 ++
target/m68k/Kconfig | 2 ++
target/mips/Kconfig | 2 ++
target/nios2/Kconfig | 2 ++
target/riscv/Kconfig | 2 ++
target/xtensa/Kconfig | 2 ++
14 files changed, 17 insertions(+), 13 deletions(-)
create mode 100644 target/arm/Kconfig
create mode 100644 target/lm32/Kconfig
create mode 100644 target/m68k/Kconfig
create mode 100644 target/mips/Kconfig
create mode 100644 target/nios2/Kconfig
create mode 100644 target/riscv/Kconfig
create mode 100644 target/xtensa/Kconfig
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 8fc09a4a51..f6044f1121 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -40,6 +40,5 @@ CONFIG_MICROBIT=y
CONFIG_FSL_IMX25=y
CONFIG_FSL_IMX7=y
CONFIG_FSL_IMX6UL=y
-CONFIG_SEMIHOSTING=y
CONFIG_ALLWINNER_H3=y
CONFIG_ACPI_APEI=y
diff --git a/default-configs/lm32-softmmu.mak b/default-configs/lm32-softmmu.mak
index 115b3e34c9..6d259665d6 100644
--- a/default-configs/lm32-softmmu.mak
+++ b/default-configs/lm32-softmmu.mak
@@ -4,8 +4,6 @@
#
#CONFIG_MILKYMIST_TMU2=n # disabling it actually causes compile-time failures
-CONFIG_SEMIHOSTING=y
-
# Boards:
#
CONFIG_LM32=y
diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmmu.mak
index 6629fd2aa3..4fef4bd731 100644
--- a/default-configs/m68k-softmmu.mak
+++ b/default-configs/m68k-softmmu.mak
@@ -1,7 +1,5 @@
# Default configuration for m68k-softmmu
-CONFIG_SEMIHOSTING=y
-
# Boards:
#
CONFIG_AN5206=y
diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
index da29c6c0b2..6c0904b200 100644
--- a/default-configs/mips-softmmu-common.mak
+++ b/default-configs/mips-softmmu-common.mak
@@ -1,8 +1,5 @@
# Common mips*-softmmu CONFIG defines
-# CONFIG_SEMIHOSTING is always required on this architecture
-CONFIG_SEMIHOSTING=y
-
CONFIG_ISA_BUS=y
CONFIG_PCI=y
CONFIG_PCI_DEVICES=y
diff --git a/default-configs/nios2-softmmu.mak b/default-configs/nios2-softmmu.mak
index 1bc4082ea9..e130d024e6 100644
--- a/default-configs/nios2-softmmu.mak
+++ b/default-configs/nios2-softmmu.mak
@@ -1,7 +1,5 @@
# Default configuration for nios2-softmmu
-CONFIG_SEMIHOSTING=y
-
# Boards:
#
CONFIG_NIOS2_10M50=y
diff --git a/default-configs/xtensa-softmmu.mak b/default-configs/xtensa-softmmu.mak
index 4fe1bf00c9..49e4c9da88 100644
--- a/default-configs/xtensa-softmmu.mak
+++ b/default-configs/xtensa-softmmu.mak
@@ -1,7 +1,5 @@
# Default configuration for Xtensa
-CONFIG_SEMIHOSTING=y
-
# Boards:
#
CONFIG_XTENSA_SIM=y
diff --git a/hw/semihosting/Kconfig b/hw/semihosting/Kconfig
index efe0a30734..30befcdd21 100644
--- a/hw/semihosting/Kconfig
+++ b/hw/semihosting/Kconfig
@@ -1,3 +1,5 @@
+# default is 'n'
config SEMIHOSTING
- bool
+ bool
+ depends on TCG
diff --git a/target/arm/Kconfig b/target/arm/Kconfig
new file mode 100644
index 0000000000..035592dd86
--- /dev/null
+++ b/target/arm/Kconfig
@@ -0,0 +1,2 @@
+config SEMIHOSTING
+ default y if TCG
diff --git a/target/lm32/Kconfig b/target/lm32/Kconfig
new file mode 100644
index 0000000000..68b946e79b
--- /dev/null
+++ b/target/lm32/Kconfig
@@ -0,0 +1,2 @@
+config SEMIHOSTING
+ default y
diff --git a/target/m68k/Kconfig b/target/m68k/Kconfig
new file mode 100644
index 0000000000..68b946e79b
--- /dev/null
+++ b/target/m68k/Kconfig
@@ -0,0 +1,2 @@
+config SEMIHOSTING
+ default y
diff --git a/target/mips/Kconfig b/target/mips/Kconfig
new file mode 100644
index 0000000000..035592dd86
--- /dev/null
+++ b/target/mips/Kconfig
@@ -0,0 +1,2 @@
+config SEMIHOSTING
+ default y if TCG
diff --git a/target/nios2/Kconfig b/target/nios2/Kconfig
new file mode 100644
index 0000000000..68b946e79b
--- /dev/null
+++ b/target/nios2/Kconfig
@@ -0,0 +1,2 @@
+config SEMIHOSTING
+ default y
diff --git a/target/riscv/Kconfig b/target/riscv/Kconfig
new file mode 100644
index 0000000000..035592dd86
--- /dev/null
+++ b/target/riscv/Kconfig
@@ -0,0 +1,2 @@
+config SEMIHOSTING
+ default y if TCG
diff --git a/target/xtensa/Kconfig b/target/xtensa/Kconfig
new file mode 100644
index 0000000000..68b946e79b
--- /dev/null
+++ b/target/xtensa/Kconfig
@@ -0,0 +1,2 @@
+config SEMIHOSTING
+ default y
--
2.21.3
^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH v3 00/11] accel: Allow targets to use Kconfig, disable semihosting by default
2020-05-21 19:59 [PATCH v3 00/11] accel: Allow targets to use Kconfig, disable semihosting by default Philippe Mathieu-Daudé
` (10 preceding siblings ...)
2020-05-21 19:59 ` [PATCH v3 11/11] hw/semihosting: Make the feature depend of TCG, and allow to disable it Philippe Mathieu-Daudé
@ 2020-05-22 2:30 ` no-reply
11 siblings, 0 replies; 19+ messages in thread
From: no-reply @ 2020-05-22 2:30 UTC (permalink / raw)
To: philmd
Cc: marex, peter.maydell, thuth, qemu-riscv, sagark, kbastian,
crwulff, qemu-devel, laurent, alex.bennee, jcmvbkbc,
aleksandar.qemu.devel, qemu-arm, palmer, michael, pbonzini,
Alistair.Francis, philmd, aleksandar.rikalo, aurelien, rth
Patchew URL: https://patchew.org/QEMU/20200521195911.19685-1-philmd@redhat.com/
Hi,
This series failed the docker-quick@centos7 build test. Please find the testing commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
make docker-image-centos7 V=1 NETWORK=1
time make docker-test-quick@centos7 SHOW_ENV=1 J=14 NETWORK=1
=== TEST SCRIPT END ===
TEST iotest-qcow2: 040
socket_accept failed: Resource temporarily unavailable
**
ERROR:/tmp/qemu-test/src/tests/qtest/libqtest.c:301:qtest_init_without_qmp_handshake: assertion failed: (s->fd >= 0 && s->qmp_fd >= 0)
/tmp/qemu-test/src/tests/qtest/libqtest.c:166: kill_qemu() tried to terminate QEMU process but encountered exit status 1 (expected 0)
ERROR - Bail out! ERROR:/tmp/qemu-test/src/tests/qtest/libqtest.c:301:qtest_init_without_qmp_handshake: assertion failed: (s->fd >= 0 && s->qmp_fd >= 0)
make: *** [check-qtest-x86_64] Error 1
make: *** Waiting for unfinished jobs....
TEST iotest-qcow2: 041
TEST iotest-qcow2: 042
---
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=42446f1cb3d84b08973bc47e5fc241a2', '-u', '1003', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=1', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew2/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-m5v271eo/src/docker-src.2020-05-21-22.14.17.8285:/var/tmp/qemu:z,ro', 'qemu:centos7', '/var/tmp/qemu/run', 'test-quick']' returned non-zero exit status 2.
filter=--filter=label=com.qemu.instance.uuid=42446f1cb3d84b08973bc47e5fc241a2
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-m5v271eo/src'
make: *** [docker-run-test-quick@centos7] Error 2
real 15m44.566s
user 0m8.933s
The full log is available at
http://patchew.org/logs/20200521195911.19685-1-philmd@redhat.com/testing.docker-quick@centos7/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v3 09/11] rules.mak: Add base-arch() rule
2020-05-21 19:59 ` [PATCH v3 09/11] rules.mak: Add base-arch() rule Philippe Mathieu-Daudé
@ 2020-05-22 4:24 ` Richard Henderson
2020-05-22 15:15 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 19+ messages in thread
From: Richard Henderson @ 2020-05-22 4:24 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Marek Vasut, Peter Maydell, Thomas Huth, qemu-riscv,
Sagar Karandikar, Bastian Koppelmann, Chris Wulff,
Laurent Vivier, Max Filippov, Aleksandar Markovic, qemu-arm,
Palmer Dabbelt, Michael Walle, Paolo Bonzini, Alistair Francis,
Alex Bennée, Aleksandar Rikalo, Aurelien Jarno,
Richard Henderson
On 5/21/20 12:59 PM, Philippe Mathieu-Daudé wrote:
> + $(if $(findstring risc,$1),risc,\
Eh? riscv{32,64} vs openrisc.
> + $(if $(findstring x86,$1),i386,\
Do we really not need an exact match for x86_64?
> + $(if $(findstring aarch64,$1),arm,$1)))))))
Exact match?
r~
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v3 11/11] hw/semihosting: Make the feature depend of TCG, and allow to disable it
2020-05-21 19:59 ` [PATCH v3 11/11] hw/semihosting: Make the feature depend of TCG, and allow to disable it Philippe Mathieu-Daudé
@ 2020-05-22 4:26 ` Richard Henderson
2020-05-22 15:11 ` Philippe Mathieu-Daudé
2020-05-22 15:12 ` Philippe Mathieu-Daudé
1 sibling, 1 reply; 19+ messages in thread
From: Richard Henderson @ 2020-05-22 4:26 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Marek Vasut, Peter Maydell, Thomas Huth, qemu-riscv,
Sagar Karandikar, Bastian Koppelmann, Chris Wulff,
Laurent Vivier, Max Filippov, Aleksandar Markovic, qemu-arm,
Palmer Dabbelt, Michael Walle, Paolo Bonzini, Alistair Francis,
Alex Bennée, Aleksandar Rikalo, Aurelien Jarno,
Richard Henderson
On 5/21/20 12:59 PM, Philippe Mathieu-Daudé wrote:
> +++ b/hw/semihosting/Kconfig
> @@ -1,3 +1,5 @@
>
> +# default is 'n'
> config SEMIHOSTING
> - bool
> + bool
> + depends on TCG
> diff --git a/target/arm/Kconfig b/target/arm/Kconfig
> new file mode 100644
> index 0000000000..035592dd86
> --- /dev/null
> +++ b/target/arm/Kconfig
> @@ -0,0 +1,2 @@
> +config SEMIHOSTING
> + default y if TCG
Did you answer my question about replicating the TCG test? If you did, I
missed it...
r~
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v3 11/11] hw/semihosting: Make the feature depend of TCG, and allow to disable it
2020-05-22 4:26 ` Richard Henderson
@ 2020-05-22 15:11 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 19+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-05-22 15:11 UTC (permalink / raw)
To: Richard Henderson, qemu-devel, Paolo Bonzini
Cc: Marek Vasut, Peter Maydell, Thomas Huth, qemu-riscv,
Sagar Karandikar, Bastian Koppelmann, Chris Wulff,
Laurent Vivier, Max Filippov, Aleksandar Markovic, qemu-arm,
Palmer Dabbelt, Michael Walle, Alistair Francis,
Aleksandar Rikalo, Alex Bennée, Aurelien Jarno,
Richard Henderson
On 5/22/20 6:26 AM, Richard Henderson wrote:
> On 5/21/20 12:59 PM, Philippe Mathieu-Daudé wrote:
>> +++ b/hw/semihosting/Kconfig
>> @@ -1,3 +1,5 @@
>>
>> +# default is 'n'
>> config SEMIHOSTING
>> - bool
>> + bool
>> + depends on TCG
>> diff --git a/target/arm/Kconfig b/target/arm/Kconfig
>> new file mode 100644
>> index 0000000000..035592dd86
>> --- /dev/null
>> +++ b/target/arm/Kconfig
>> @@ -0,0 +1,2 @@
>> +config SEMIHOSTING
>> + default y if TCG
>
> Did you answer my question about replicating the TCG test? If you did, I
> missed it...
Shortly before posting this series:
https://www.mail-archive.com/qemu-devel@nongnu.org/msg705992.html
There is indeed something wrong with this patch, but I'm not seeing it.
- semihosting only makes sense with TCG accelerator
This is the "depends on TCG"
- some targets (if built with TCG enabled) require semihosting
This would be a per-target "select SEMIHOSTING if TCG"
Another problem is some targets only require semihosting in system-mode;
and this approach select it for both system/user modes.
Paolo... help!
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v3 11/11] hw/semihosting: Make the feature depend of TCG, and allow to disable it
2020-05-21 19:59 ` [PATCH v3 11/11] hw/semihosting: Make the feature depend of TCG, and allow to disable it Philippe Mathieu-Daudé
2020-05-22 4:26 ` Richard Henderson
@ 2020-05-22 15:12 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 19+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-05-22 15:12 UTC (permalink / raw)
To: qemu-devel
Cc: Marek Vasut, Peter Maydell, Thomas Huth, qemu-riscv,
Sagar Karandikar, Aleksandar Markovic, Bastian Koppelmann,
Chris Wulff, Laurent Vivier, Max Filippov, Michael Walle,
qemu-arm, Palmer Dabbelt, Paolo Bonzini, Alistair Francis,
Alex Bennée, Aleksandar Rikalo, Aurelien Jarno,
Richard Henderson
On 5/21/20 9:59 PM, Philippe Mathieu-Daudé wrote:
> The semihosting feature is only meaningful when using TCG.
>
> Do not enable it by default, and let the few targets requiring
> it to manually select it.
> The targets restricted to TCG that previously selected it
> (see commit 16932bb761e52c2 'introduce CONFIG_SEMIHOSTING')
> are left unmodified; however the selection is moved to the
> target Kconfig.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> v3: Fixed odd hidden \xC2 UTF-8 chars:
>
> Traceback (most recent call last):
> File "qemu/scripts/minikconf.py", line 355, in parse_file
> self.src = fp.read()
> UnicodeDecodeError: 'ascii' codec can't decode byte 0xc2 in position 21: ordinal not in range(128)
> ---
> default-configs/arm-softmmu.mak | 1 -
> default-configs/lm32-softmmu.mak | 2 --
> default-configs/m68k-softmmu.mak | 2 --
> default-configs/mips-softmmu-common.mak | 3 ---
> default-configs/nios2-softmmu.mak | 2 --
> default-configs/xtensa-softmmu.mak | 2 --
> hw/semihosting/Kconfig | 4 +++-
> target/arm/Kconfig | 2 ++
> target/lm32/Kconfig | 2 ++
> target/m68k/Kconfig | 2 ++
> target/mips/Kconfig | 2 ++
> target/nios2/Kconfig | 2 ++
> target/riscv/Kconfig | 2 ++
> target/xtensa/Kconfig | 2 ++
> 14 files changed, 17 insertions(+), 13 deletions(-)
> create mode 100644 target/arm/Kconfig
> create mode 100644 target/lm32/Kconfig
> create mode 100644 target/m68k/Kconfig
> create mode 100644 target/mips/Kconfig
> create mode 100644 target/nios2/Kconfig
> create mode 100644 target/riscv/Kconfig
> create mode 100644 target/xtensa/Kconfig
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 8fc09a4a51..f6044f1121 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -40,6 +40,5 @@ CONFIG_MICROBIT=y
> CONFIG_FSL_IMX25=y
> CONFIG_FSL_IMX7=y
> CONFIG_FSL_IMX6UL=y
> -CONFIG_SEMIHOSTING=y
> CONFIG_ALLWINNER_H3=y
> CONFIG_ACPI_APEI=y
> diff --git a/default-configs/lm32-softmmu.mak b/default-configs/lm32-softmmu.mak
> index 115b3e34c9..6d259665d6 100644
> --- a/default-configs/lm32-softmmu.mak
> +++ b/default-configs/lm32-softmmu.mak
> @@ -4,8 +4,6 @@
> #
> #CONFIG_MILKYMIST_TMU2=n # disabling it actually causes compile-time failures
>
> -CONFIG_SEMIHOSTING=y
> -
> # Boards:
> #
> CONFIG_LM32=y
> diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmmu.mak
> index 6629fd2aa3..4fef4bd731 100644
> --- a/default-configs/m68k-softmmu.mak
> +++ b/default-configs/m68k-softmmu.mak
> @@ -1,7 +1,5 @@
> # Default configuration for m68k-softmmu
>
> -CONFIG_SEMIHOSTING=y
> -
> # Boards:
> #
> CONFIG_AN5206=y
> diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
> index da29c6c0b2..6c0904b200 100644
> --- a/default-configs/mips-softmmu-common.mak
> +++ b/default-configs/mips-softmmu-common.mak
> @@ -1,8 +1,5 @@
> # Common mips*-softmmu CONFIG defines
>
> -# CONFIG_SEMIHOSTING is always required on this architecture
> -CONFIG_SEMIHOSTING=y
> -
> CONFIG_ISA_BUS=y
> CONFIG_PCI=y
> CONFIG_PCI_DEVICES=y
> diff --git a/default-configs/nios2-softmmu.mak b/default-configs/nios2-softmmu.mak
> index 1bc4082ea9..e130d024e6 100644
> --- a/default-configs/nios2-softmmu.mak
> +++ b/default-configs/nios2-softmmu.mak
> @@ -1,7 +1,5 @@
> # Default configuration for nios2-softmmu
>
> -CONFIG_SEMIHOSTING=y
> -
> # Boards:
> #
> CONFIG_NIOS2_10M50=y
> diff --git a/default-configs/xtensa-softmmu.mak b/default-configs/xtensa-softmmu.mak
> index 4fe1bf00c9..49e4c9da88 100644
> --- a/default-configs/xtensa-softmmu.mak
> +++ b/default-configs/xtensa-softmmu.mak
> @@ -1,7 +1,5 @@
> # Default configuration for Xtensa
>
> -CONFIG_SEMIHOSTING=y
> -
> # Boards:
> #
> CONFIG_XTENSA_SIM=y
> diff --git a/hw/semihosting/Kconfig b/hw/semihosting/Kconfig
> index efe0a30734..30befcdd21 100644
> --- a/hw/semihosting/Kconfig
> +++ b/hw/semihosting/Kconfig
> @@ -1,3 +1,5 @@
>
> +# default is 'n'
> config SEMIHOSTING
> - bool
> + bool
> + depends on TCG
> diff --git a/target/arm/Kconfig b/target/arm/Kconfig
> new file mode 100644
> index 0000000000..035592dd86
> --- /dev/null
> +++ b/target/arm/Kconfig
> @@ -0,0 +1,2 @@
> +config SEMIHOSTING
> + default y if TCG
This patch is incorrect, because previously the feature was selected for
system-mode only, and now it is selected in user-mode too.
[...]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v3 09/11] rules.mak: Add base-arch() rule
2020-05-22 4:24 ` Richard Henderson
@ 2020-05-22 15:15 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 19+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-05-22 15:15 UTC (permalink / raw)
To: Richard Henderson, qemu-devel
Cc: Marek Vasut, Peter Maydell, Thomas Huth, qemu-riscv,
Sagar Karandikar, Bastian Koppelmann, Chris Wulff,
Laurent Vivier, Max Filippov, Aleksandar Markovic, qemu-arm,
Palmer Dabbelt, Michael Walle, Paolo Bonzini, Alistair Francis,
Alex Bennée, Aleksandar Rikalo, Aurelien Jarno,
Richard Henderson
On 5/22/20 6:24 AM, Richard Henderson wrote:
> On 5/21/20 12:59 PM, Philippe Mathieu-Daudé wrote:
>> + $(if $(findstring risc,$1),risc,\
>
> Eh? riscv{32,64} vs openrisc.
Nice catch, because with this patch openrisc builds with a riscv
config-devices.h =)
>
>> + $(if $(findstring x86,$1),i386,\
>
> Do we really not need an exact match for x86_64?
OK.
>
>> + $(if $(findstring aarch64,$1),arm,$1)))))))
>
> Exact match?
OK.
>
>
> r~
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v3 04/11] accel/tcg: Add stub for probe_access()
2020-05-21 19:59 ` [PATCH v3 04/11] accel/tcg: Add stub for probe_access() Philippe Mathieu-Daudé
@ 2020-06-17 13:51 ` Stefan Hajnoczi
0 siblings, 0 replies; 19+ messages in thread
From: Stefan Hajnoczi @ 2020-06-17 13:51 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Peter Maydell, Sagar Karandikar, David Hildenbrand, qemu-devel,
Laurent Vivier, Max Filippov, Alistair Francis, Marek Vasut,
Aleksandar Markovic, Emilio G . Cota, Aleksandar Rikalo,
Thomas Huth, Richard Henderson, qemu-arm, Alex Bennée,
Richard Henderson, qemu-riscv, Bastian Koppelmann, Chris Wulff,
Philippe Mathieu-Daudé,
Michael Walle, Palmer Dabbelt, Paolo Bonzini, Aurelien Jarno
[-- Attachment #1: Type: text/plain, Size: 213 bytes --]
On Thu, May 21, 2020 at 09:59:04PM +0200, Philippe Mathieu-Daudé wrote:
> From: Philippe Mathieu-Daudé <f4bug@amsat.org>
>
> The TCG helpers where added in b92e5a22ec3 in softmmu_template.h.
s/where/were/
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2020-06-17 13:52 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-21 19:59 [PATCH v3 00/11] accel: Allow targets to use Kconfig, disable semihosting by default Philippe Mathieu-Daudé
2020-05-21 19:59 ` [PATCH v3 01/11] MAINTAINERS: Fix KVM path expansion glob Philippe Mathieu-Daudé
2020-05-21 19:59 ` [PATCH v3 02/11] MAINTAINERS: Add an 'overall' entry for accelerators Philippe Mathieu-Daudé
2020-05-21 19:59 ` [PATCH v3 03/11] MAINTAINERS: Add an entry for the HAX accelerator Philippe Mathieu-Daudé
2020-05-21 19:59 ` [PATCH v3 04/11] accel/tcg: Add stub for probe_access() Philippe Mathieu-Daudé
2020-06-17 13:51 ` Stefan Hajnoczi
2020-05-21 19:59 ` [PATCH v3 05/11] Makefile: Remove dangerous EOL trailing backslash Philippe Mathieu-Daudé
2020-05-21 19:59 ` [PATCH v3 06/11] Makefile: Write MINIKCONF variables as one entry per line Philippe Mathieu-Daudé
2020-05-21 19:59 ` [PATCH v3 07/11] accel/Kconfig: Extract accel selectors into their own config Philippe Mathieu-Daudé
2020-05-21 19:59 ` [PATCH v3 08/11] accel/Kconfig: Add the TCG selector Philippe Mathieu-Daudé
2020-05-21 19:59 ` [PATCH v3 09/11] rules.mak: Add base-arch() rule Philippe Mathieu-Daudé
2020-05-22 4:24 ` Richard Henderson
2020-05-22 15:15 ` Philippe Mathieu-Daudé
2020-05-21 19:59 ` [PATCH v3 10/11] Makefile: Allow target-specific optional Kconfig Philippe Mathieu-Daudé
2020-05-21 19:59 ` [PATCH v3 11/11] hw/semihosting: Make the feature depend of TCG, and allow to disable it Philippe Mathieu-Daudé
2020-05-22 4:26 ` Richard Henderson
2020-05-22 15:11 ` Philippe Mathieu-Daudé
2020-05-22 15:12 ` Philippe Mathieu-Daudé
2020-05-22 2:30 ` [PATCH v3 00/11] accel: Allow targets to use Kconfig, disable semihosting by default no-reply
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).