Skip to contentSkip to conversation

accel: Allow targets to use Kconfig, disable semihosting by default

PATCH Superseded Philippe Mathieu-Daudé 5 participants 23 messages May 15, 2020 – May 21, 2020

Subsystems (2)

v2 of 9 Superseded Latest is v9 →

lore
Share & tools
lore
#0 lore raw

v2 cover accel: Allow targets to use Kconfig, disable semihosting by default

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 v1:
https://www.mail-archive.com/[email protected]/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/[email protected]/msg631218.html

$ git backport-diff -u v1 -r v2
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/10:[----] [--] 'MAINTAINERS: Fix KVM path expansion glob'
002/10:[----] [-C] 'MAINTAINERS: Add an 'overall' entry for accelerators' 003/10:[----] [-C] 'MAINTAINERS: Add an entry for the HAX accelerator' 004/10:[down] 'accel/tcg: Add stub for probe_access()'
005/10:[down] 'Makefile: Remove dangerous EOL trailing backslash' 006/10:[0003] [FC] 'Makefile: Write MINIKCONF variables as one entry per line' 007/10:[----] [--] 'accel/Kconfig: Extract accel selectors into their own config' 008/10:[----] [--] 'accel/Kconfig: Add the TCG selector'
009/10:[down] 'Makefile: Allow target-specific optional Kconfig' 010/10:[0028] [FC] 'hw/semihosting: Make the feature depend of TCG, and allow to disable it'

Philippe Mathieu-Daudé (10):
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
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 --
 accel/stubs/tcg-stub.c                  |  7 +++++++
 Kconfig.host                            |  7 -------
 MAINTAINERS                             | 17 ++++++++++++++++-
 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 ++
 19 files changed, 60 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
Signature · 1 line
2.21.3
#1 lore raw

PATCH v2 1/10 MAINTAINERS: Fix KVM path expansion glob

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")
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
MAINTAINERS +1 -1
index 47ef3139e6..fd88a3de49 100644
@@ -361,7 +361,7 @@ Overall KVM CPUs
 M: Paolo Bonzini <[email protected]>
 L: [email protected]
 S: Supported
-F: */kvm.*
+F: */*/kvm*
 F: accel/kvm/
 F: accel/stubs/kvm-stub.c
 F: include/hw/kvm/
Signature · 1 line
2.21.3
Reviewed-by on v2 1/10
#2 lore raw

Re: [PATCH v2 01/10] MAINTAINERS: Fix KVM path expansion glob

Quoted 4 lines · Philippe Mathieu-Daudé

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")

Oops, my bad. Sorry for that oversight!

Quoted 6 lines
MAINTAINERS +0 -0
index 47ef3139e6..fd88a3de49 100644

MAINTAINERS Overall KVM CPUs · line 367

Quoted 8 lines
MAINTAINERS +1 -1
@@ -361,7 +361,7 @@ Overall KVM CPUs
 M: Paolo Bonzini <[email protected]>
 L: [email protected]
 S: Supported
-F: */kvm.*
+F: */*/kvm*
 F: accel/kvm/
 F: accel/stubs/kvm-stub.c
 F: include/hw/kvm/
#3 lore raw

PATCH v2 2/10 MAINTAINERS: Add an 'overall' entry for accelerators

In reply to Philippe Mathieu-Daudé

---
Cc: Paolo Bonzini <[email protected]>

---
 MAINTAINERS | 9 +++++++++
 1 file changed, 9 insertions(+)
MAINTAINERS +9 -0
index fd88a3de49..659092eb43 100644
@@ -415,6 +415,15 @@ S: Supported
 F: target/i386/kvm.c
 F: scripts/kvm/vmxcap
 
+Guest CPU Cores (other accelerators)
+------------------------------------
+Overall
+M: Richard Henderson <[email protected]>
+R: Paolo Bonzini <[email protected]>
+S: Maintained
+F: include/sysemu/accel.h
+F: accel/stubs/Makefile.objs
+
 X86 HVF CPUs
 M: Roman Bolshakov <[email protected]>
 S: Maintained
Signature · 1 line
2.21.3
#4 lore raw

Re: [PATCH v2 02/10] MAINTAINERS: Add an 'overall' entry for accelerators

Quoted 13 lines · Philippe Mathieu-Daudé

---
Cc: Paolo Bonzini <[email protected]>

---
 MAINTAINERS | 9 +++++++++
 1 file changed, 9 insertions(+)
MAINTAINERS +0 -0
index fd88a3de49..659092eb43 100644

MAINTAINERS S: Supported · line 418

Quoted 4 lines
MAINTAINERS +1 -0
@@ -415,6 +415,15 @@ S: Supported
 F: target/i386/kvm.c
 F: scripts/kvm/vmxcap
 
+Guest CPU Cores (other accelerators)

Maybe s/other accelerators/accelerators generic code/ ?

MAINTAINERS S: Supported · line 425

Quoted 7 lines
MAINTAINERS +7 -0
+------------------------------------
+Overall
+M: Richard Henderson <[email protected]>
+R: Paolo Bonzini <[email protected]>
+S: Maintained
+F: include/sysemu/accel.h
+F: accel/stubs/Makefile.objs

What about accel/accel.c and accel/Makefile.objs ? Should they also be in the list here?

Thomas

#5 lore raw

Re: [PATCH v2 02/10] MAINTAINERS: Add an 'overall' entry for accelerators

Quoted 17 lines · Thomas Huth
Quoted 16 lines · Philippe Mathieu-Daudé

---
Cc: Paolo Bonzini <[email protected]>

---
  MAINTAINERS | 9 +++++++++
  1 file changed, 9 insertions(+)
MAINTAINERS +0 -0
index fd88a3de49..659092eb43 100644
@@ -415,6 +415,15 @@ S: Supported
  F: target/i386/kvm.c
  F: scripts/kvm/vmxcap
 
Quoted 3 lines

MAINTAINERS S: Supported · line 418

Quoted 1 line
MAINTAINERS +1 -0
+Guest CPU Cores (other accelerators)

Maybe s/other accelerators/accelerators generic code/ ?

But then we have HVF and WHPX listed there...

Quoted 11 lines

MAINTAINERS S: Supported · line 425

Quoted 8 lines
MAINTAINERS +7 -0
+------------------------------------
+Overall
+M: Richard Henderson <[email protected]>
+R: Paolo Bonzini <[email protected]>
+S: Maintained
+F: include/sysemu/accel.h
+F: accel/stubs/Makefile.objs

What about accel/accel.c and accel/Makefile.objs ? Should they also be in the list here?

OK.

Quoted 3 lines

Thomas

#6 lore raw

PATCH v2 3/10 MAINTAINERS: Add an entry for the HAX accelerator

In reply to Philippe Mathieu-Daudé

---
Cc: Sergio Andres Gomez Del Real <[email protected]>
Cc: Vincent Palatin <[email protected]>
Cc: Yu Ning <[email protected]>
Cc: Tao Wu <[email protected]>
Cc: [email protected]
Cc: Colin Xu <[email protected]>
Cc: Hang Yuan <[email protected]>
Cc: David Chou <[email protected]>
Cc: Wenchao Wang <[email protected]>

---
 MAINTAINERS | 6 ++++++
 1 file changed, 6 insertions(+)
MAINTAINERS +6 -0
index 659092eb43..5172e9a734 100644
@@ -424,6 +424,12 @@ S: Maintained
 F: include/sysemu/accel.h
 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 <[email protected]>
 S: Maintained
Signature · 1 line
2.21.3
#7 lore raw

PATCH v2 4/10 accel/tcg: Add stub for probe_access()

In reply to Philippe Mathieu-Daudé

From: Philippe Mathieu-Daudé <[email protected]>

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'

---
Cc: Richard Henderson <[email protected]>
Cc: Emilio G. Cota <[email protected]>
Cc: Alex Bennée <[email protected]>
Cc: David Hildenbrand <[email protected]>

---
 accel/stubs/tcg-stub.c | 7 +++++++
 1 file changed, 7 insertions(+)
accel/stubs/tcg-stub.c +7 -0
index 677191a69c..e4bbf997aa 100644
@@ -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();
+}
Signature · 1 line
2.21.3
Reviewed-by on v2 4/10
#8 lore raw

Re: [PATCH v2 04/10] accel/tcg: Add stub for probe_access()

Quoted 13 lines · Philippe Mathieu-Daudé

From: Philippe Mathieu-Daudé <[email protected]>

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'

Quoted 8 lines

---
Cc: Richard Henderson <[email protected]>
Cc: Emilio G. Cota <[email protected]>
Cc: Alex Bennée <[email protected]>
Cc: David Hildenbrand <[email protected]>

---
 accel/stubs/tcg-stub.c | 7 +++++++
 1 file changed, 7 insertions(+)

r~

#9 lore raw

PATCH v2 5/10 Makefile: Remove dangerous EOL trailing backslash

In reply to Philippe Mathieu-Daudé

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.

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +1 -1
index 34275f57c9..84453789f9 100644
@@ -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) > [email protected], "GEN", "[email protected]")
Signature · 1 line
2.21.3
Reviewed-by on v2 5/10
#10 lore raw

Re: [PATCH v2 05/10] Makefile: Remove dangerous EOL trailing backslash

Quoted 16 lines · Philippe Mathieu-Daudé

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.

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +0 -0
index 34275f57c9..84453789f9 100644

Makefile MINIKCONF_ARGS = \ · line 426

Quoted 8 lines
Makefile +1 -1
@@ -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) > [email protected], "GEN", "[email protected]")
Reviewed-by on v2 5/10
#11 lore raw

Re: [PATCH v2 05/10] Makefile: Remove dangerous EOL trailing backslash

In reply to Philippe Mathieu-Daudé
Quoted 7 lines · Philippe Mathieu-Daudé

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.

Alistair

Quoted 21 lines
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +1 -2
index 34275f57c9..84453789f9 100644
@@ -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) > [email protected], "GEN", "[email protected]")
--

2.21.3

#12 lore raw

PATCH v2 6/10 Makefile: Write MINIKCONF variables as one entry per line

In reply to Philippe Mathieu-Daudé

Having one entry per line helps reviews/refactors. As we are going to modify the MINIKCONF variables, split them now to ease further review.

---
 Makefile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
Makefile +6 -3
index 84453789f9..665900d5c8 100644
@@ -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) > [email protected], "GEN", "[email protected]")
+	$(call quiet-command, $(MINIKCONF) $(MINIKCONF_ARGS) \
+		> [email protected], "GEN", "[email protected]")
 	$(call quiet-command, if test -f $@; then \
 	  if cmp -s [email protected] $@; then \
 	    mv [email protected] $@; \
Signature · 1 line
2.21.3
#13 lore raw

PATCH v2 7/10 accel/Kconfig: Extract accel selectors into their own config

In reply to Philippe Mathieu-Daudé

Move the accel selectors from the global Kconfig.host to their own Kconfig file.

---
 Makefile      | 1 +
 Kconfig.host  | 7 -------
 accel/Kconfig | 6 ++++++
 3 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 accel/Kconfig
Makefile +1 -0
index 665900d5c8..06826273c1 100644
@@ -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)
Kconfig.host +0 -7
index 55136e037d..a6d871c399 100644
@@ -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
 
accel/Kconfig new file +6 -0
new file mode 100644
index 0000000000..c21802bb49
@@ -0,0 +1,6 @@
+config KVM
+    bool
+
+config XEN
+    bool
+    select FSDEV_9P if VIRTFS
Signature · 1 line
2.21.3
#14 lore raw

PATCH v2 8/10 accel/Kconfig: Add the TCG selector

In reply to Philippe Mathieu-Daudé

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.

---
 Makefile      | 1 +
 accel/Kconfig | 3 +++
 2 files changed, 4 insertions(+)
Makefile +1 -0
index 06826273c1..b4c0830b26 100644
@@ -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) \
accel/Kconfig +3 -0
index c21802bb49..2ad94a3839 100644
@@ -1,3 +1,6 @@
+config TCG
+    bool
+
 config KVM
     bool
 
Signature · 1 line
2.21.3
#15 lore raw

PATCH v2 9/10 Makefile: Allow target-specific optional Kconfig

In reply to Philippe Mathieu-Daudé

Allow use of target-specific Kconfig file.

---
 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Makefile +3 -1
index b4c0830b26..5fce168fcb 100644
@@ -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/$(firstword $(subst -, ,$@))/Kconfig) \
 		> [email protected], "GEN", "[email protected]")
 	$(call quiet-command, if test -f $@; then \
 	  if cmp -s [email protected] $@; then \
Signature · 1 line
2.21.3
#17 lore raw

Re: [PATCH v2 09/10] Makefile: Allow target-specific optional Kconfig

In reply to Philippe Mathieu-Daudé
Quoted 14 lines · Philippe Mathieu-Daudé

Allow use of target-specific Kconfig file.

---
 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Makefile +0 -0
index b4c0830b26..5fce168fcb 100644
@@ -423,11 +423,13 @@ MINIKCONF_INPUTS = $(SRC_PATH)/Kconfig.host \
                    $(SRC_PATH)/accel/Kconfig \

Makefile MINIKCONF_INPUTS = $(SRC_PATH)/Kconfig.host \ · line 432

Quoted 10 lines
Makefile +3 -1
                    $(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/$(firstword $(subst -, ,$@))/Kconfig) \

This is incorrect, $@ is a $TARGET_ARCH (example aarch64) and we want to include $TARGET_BASE_ARCH (example arm).

Quoted 6 lines
Makefile +0 -1
                > [email protected], "GEN", "[email protected]")
        $(call quiet-command, if test -f $@; then \
          if cmp -s [email protected] $@; then \
--

2.21.3

#18 lore raw

PATCH v2 10/10 hw/semihosting: Make the feature depend of TCG, and allow to disable it

In reply to Philippe Mathieu-Daudé

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.

---
 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
default-configs/arm-softmmu.mak +0 -1
index 8fc09a4a51..f6044f1121 100644
@@ -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
default-configs/lm32-softmmu.mak +0 -2
index 115b3e34c9..6d259665d6 100644
@@ -4,8 +4,6 @@
 #
 #CONFIG_MILKYMIST_TMU2=n        # disabling it actually causes compile-time failures
 
-CONFIG_SEMIHOSTING=y
-
 # Boards:
 #
 CONFIG_LM32=y
default-configs/m68k-softmmu.mak +0 -2
index 6629fd2aa3..4fef4bd731 100644
@@ -1,7 +1,5 @@
 # Default configuration for m68k-softmmu
 
-CONFIG_SEMIHOSTING=y
-
 # Boards:
 #
 CONFIG_AN5206=y
default-configs/mips-softmmu-common.mak +0 -3
index da29c6c0b2..6c0904b200 100644
@@ -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
default-configs/nios2-softmmu.mak +0 -2
index 1bc4082ea9..e130d024e6 100644
@@ -1,7 +1,5 @@
 # Default configuration for nios2-softmmu
 
-CONFIG_SEMIHOSTING=y
-
 # Boards:
 #
 CONFIG_NIOS2_10M50=y
default-configs/xtensa-softmmu.mak +0 -2
index 4fe1bf00c9..49e4c9da88 100644
@@ -1,7 +1,5 @@
 # Default configuration for Xtensa
 
-CONFIG_SEMIHOSTING=y
-
 # Boards:
 #
 CONFIG_XTENSA_SIM=y
hw/semihosting/Kconfig +3 -1
index efe0a30734..30befcdd21 100644
@@ -1,3 +1,5 @@
 
+# default is 'n'
 config SEMIHOSTING
-       bool
+    bool
+    depends on TCG
target/arm/Kconfig new file +2 -0
new file mode 100644
index 0000000000..3224cac4ad
@@ -0,0 +1,2 @@
+config SEMIHOSTING
+    default y if TCG
target/lm32/Kconfig new file +2 -0
new file mode 100644
index 0000000000..c0a9a9e799
@@ -0,0 +1,2 @@
+config SEMIHOSTING
+    default y
target/m68k/Kconfig new file +2 -0
new file mode 100644
index 0000000000..c0a9a9e799
@@ -0,0 +1,2 @@
+config SEMIHOSTING
+    default y
target/mips/Kconfig new file +2 -0
new file mode 100644
index 0000000000..3224cac4ad
@@ -0,0 +1,2 @@
+config SEMIHOSTING
+    default y if TCG
target/nios2/Kconfig new file +2 -0
new file mode 100644
index 0000000000..c0a9a9e799
@@ -0,0 +1,2 @@
+config SEMIHOSTING
+    default y
target/riscv/Kconfig new file +2 -0
new file mode 100644
index 0000000000..3224cac4ad
@@ -0,0 +1,2 @@
+config SEMIHOSTING
+    default y if TCG
target/xtensa/Kconfig new file +2 -0
new file mode 100644
index 0000000000..c0a9a9e799
@@ -0,0 +1,2 @@
+config SEMIHOSTING
+    default y
Signature · 1 line
2.21.3
#19 lore raw

Re: [PATCH v2 10/10] hw/semihosting: Make the feature depend of TCG, and allow to disable it

Quoted 14 lines · Philippe Mathieu-Daudé

+++ b/hw/semihosting/Kconfig

hw/semihosting/Kconfig +3 -1
@@ -1,3 +1,5 @@
 
+# default is 'n'
 config SEMIHOSTING
-       bool
+    bool
+    depends on TCG
target/arm/Kconfig new file +0 -0
new file mode 100644
index 0000000000..3224cac4ad

target/arm/Kconfig line 2

Quoted 2 lines
target/arm/Kconfig new file +2 -0
@@ -0,0 +1,2 @@
+config SEMIHOSTING
+    default y if TCG

Do you really have to duplicate the TCG condition?

r~

#20 lore raw

Re: [PATCH v2 10/10] hw/semihosting: Make the feature depend of TCG, and allow to disable it

Quoted 4 lines · Richard Henderson
Quoted 3 lines · Philippe Mathieu-Daudé

+++ b/hw/semihosting/Kconfig

(quoted diff) +0 -0
@@ -1,3 +1,5 @@
 
Quoted 15 lines

target/arm/Kconfig line 2

Quoted 13 lines
hw/semihosting/Kconfig +3 -1
+# default is 'n'
  config SEMIHOSTING
-       bool
+    bool
+    depends on TCG
target/arm/Kconfig new file +2 -0
new file mode 100644
index 0000000000..3224cac4ad
@@ -0,0 +1,2 @@
+config SEMIHOSTING
+    default y if TCG

Do you really have to duplicate the TCG condition?

How so? The semihosting default table is:

TCG KVM XEN
y n y n y n
TCG y - - y y y y
n - n n n n
KVM y - - n n
n n n
XEN y - -
n -

So checking for TCG is the simpler way.

Maybe I'm not understanding well your question.

The logic is if TCG is selected, SEMIHOSTING is too.

#21 lore raw
In reply to Philippe Mathieu-Daudé
Patchew URL: https://patchew.org/QEMU/[email protected]/

Patchew URL: https://patchew.org/QEMU/[email protected]/

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 ===

/tmp/qemu-test/src/target/arm/arm-semi.c:787: undefined reference to qemu_semihosting_console_outs' /tmp/qemu-test/src/target/arm/arm-semi.c:815: undefined reference to qemu_semihosting_console_inc' /tmp/qemu-test/src/target/arm/arm-semi.c:784: undefined reference to `qemu_semihosting_console_outc'
collect2: error: ld returned 1 exit status
make[1]: *** [qemu-system-aarch64] Error 1
make: *** [aarch64-softmmu/all] Error 2
Traceback (most recent call last):
File "./tests/docker/docker.py", line 664, in <module>

    sys.exit(main())

---
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=490bf18b41e04df58182bdb1996b896b', '-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-k03oe5yh/src/docker-src.2020-05-15-23.41.43.21629:/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=490bf18b41e04df58182bdb1996b896b
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-k03oe5yh/src'
make: *** [docker-run-test-quick@centos7] Error 2

real 2m45.420s
user 0m8.257s

The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-quick@centos7/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]

#22 lore raw
In reply to Philippe Mathieu-Daudé
Patchew URL: https://patchew.org/QEMU/[email protected]/

Patchew URL: https://patchew.org/QEMU/[email protected]/

Hi,

This series failed the docker-mingw@fedora 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
export ARCH=x86_64
make docker-image-fedora V=1 NETWORK=1
time make docker-test-mingw@fedora J=14 NETWORK=1
=== TEST SCRIPT END ===

/tmp/qemu-test/src/target/arm/arm-semi.c:815: undefined reference to `qemu_semihosting_console_inc'
/tmp/qemu-test/src/target/arm/arm-semi.c:787: undefined reference to `qemu_semihosting_console_outs'
/tmp/qemu-test/src/target/arm/arm-semi.c:784: undefined reference to `qemu_semihosting_console_outc'
collect2: error: ld returned 1 exit status
make[1]: *** [Makefile:208: qemu-system-aarch64w.exe] Error 1
make: *** [Makefile:534: aarch64-softmmu/all] Error 2
make: *** Waiting for unfinished jobs....
Traceback (most recent call last):
File "./tests/docker/docker.py", line 664, in <module>
---
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=e4300b50b74f4cf6a4342bebb0db3e5b', '-u', '1001', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-d_su7kf_/src/docker-src.2020-05-15-23.55.36.10662:/var/tmp/qemu:z,ro', 'qemu:fedora', '/var/tmp/qemu/run', 'test-mingw']' returned non-zero exit status 2. filter=--filter=label=com.qemu.instance.uuid=e4300b50b74f4cf6a4342bebb0db3e5b
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-d_su7kf_/src'
make: *** [docker-run-test-mingw@fedora] Error 2

real 2m20.941s
user 0m8.489s

The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]