accel: Allow targets to use Kconfig
v6 cover accel: Allow targets to use Kconfig
Missing review:
- 4/11 rules.mak: Add strequal() and startwith() rules
- 5/11 rules.mak: Add base-arch() rule
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
Since v5:
- Fixed typo in patch #4 subject
- Added David R-b tag
- Stripped --- comments
Since v4:
- Addressed rth review comments in rules.mak
Since v3:
- Fixed base-arch() rule (rth)
- Dropped 'semihosting: Make the feature depend of TCG'
Since v2:
- Addressed Thomas review comments
- Fixed problem when including TARGET instead of BASE_TARGET
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
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 rules.mak: Add strequal() and startwith() rules rules.mak: Add base-arch() rule
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 accel/tcg: Add stub for probe_access()
Makefile | 15 +++++++++---- rules.mak | 49 ++++++++++++++++++++++++++++++++++++++++++ accel/stubs/tcg-stub.c | 7 ++++++ Kconfig.host | 7 ------ MAINTAINERS | 19 +++++++++++++++- accel/Kconfig | 9 ++++++++ 6 files changed, 94 insertions(+), 12 deletions(-) create mode 100644 accel/Kconfig
Signature · 1 line
2.21.3
PATCH v6 1/11 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.
--- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
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/
Signature · 1 line
2.21.3
Re: [PATCH v6 01/11] MAINTAINERS: Fix KVM path expansion glob
Quoted 7 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")Reviewed-by Richard Henderson <[email protected]>Reviewed-by Thomas Huth <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Quoted 17 lines
--- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)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/
Signature · 1 line
Alex Bennée
PATCH v6 2/11 MAINTAINERS: Add an 'overall' entry for accelerators
In reply to Philippe Mathieu-Daudé--- MAINTAINERS | 11 +++++++++++ 1 file changed, 11 insertions(+)
MAINTAINERS +11 -0
@@ -415,6 +415,17 @@ 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/accel.c +F: accel/Makefile.objs +F: accel/stubs/Makefile.objs + X86 HVF CPUs M: Roman Bolshakov <[email protected]> S: Maintained
Signature · 1 line
2.21.3
Re: [PATCH v6 02/11] MAINTAINERS: Add an 'overall' entry for accelerators
Quoted 2 lines · Philippe Mathieu-Daudé
Reviewed-by Richard Henderson <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Quoted 26 lines
--- MAINTAINERS | 11 +++++++++++ 1 file changed, 11 insertions(+)MAINTAINERS +11
-0@@ -415,6 +415,17 @@ 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/accel.c +F: accel/Makefile.objs +F: accel/stubs/Makefile.objs + X86 HVF CPUs M: Roman Bolshakov <[email protected]> S: Maintained
Signature · 1 line
Alex Bennée
PATCH v6 3/11 MAINTAINERS: Add an entry for the HAX accelerator
In reply to Philippe Mathieu-DaudéNobody replied since the first time [*] that patch was posted, so mark HAX as orphan.
[*] https://mid.mail-archive.com/[email protected]
--- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+)
MAINTAINERS +6 -0
@@ -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 <[email protected]> S: Maintained
Signature · 1 line
2.21.3
RE: [PATCH v6 03/11] MAINTAINERS: Add an entry for the HAX accelerator
Hi, Philippe,
Sorry for missing your mail.
We are still maintaining HAX accelerator in QEMU. The status had been added as below in MAINTAINERS line 458. I noticed that the only difference with your commit is the last third line. The file accel/stubs/hax-stub.c is missed in the current files, while others are listed. Do you want to add this one only? And I will avoid missing emails in future and reply as soon as possible. Thanks.
Guest CPU Cores (HAXM)
---------------------
X86 HAXM CPUs
M: Wenchao Wang <[email protected]>
M: Colin Xu <[email protected]>
L: [email protected]
W: https://github.com/intel/haxm/issues
S: Maintained
+F: accel/stubs/hax-stub.c
F: include/sysemu/hax.h
F: target/i386/hax-*
Best Regards,
Wenchao
-----Original Message-----
From: Philippe Mathieu-Daudé <[email protected]>
Sent: Friday, June 5, 2020 17:33
To: [email protected]
Cc: Richard Henderson <[email protected]>; Paolo Bonzini <[email protected]>; Philippe Mathieu-Daudé <[email protected]>; haxm-team <[email protected]>; Tao Wu <[email protected]>; Xu, Colin <[email protected]>; Wang, Wenchao <[email protected]>; Vincent Palatin <[email protected]>; Sergio Andres Gomez Del Real <[email protected]>
Subject: [PATCH v6 03/11] MAINTAINERS: Add an entry for the HAX accelerator
Nobody replied since the first time [*] that patch was posted, so mark HAX as orphan.
[*] https://mid.mail-archive.com/[email protected]
--- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+)
MAINTAINERS +6 -0
@@ -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 <[email protected]> S: Maintained
--
2.21.3
Re: [PATCH v6 03/11] MAINTAINERS: Add an entry for the HAX accelerator
Quoted 7 lines · Wenchao
Hi, Philippe,
Sorry for missing your mail.
We are still maintaining HAX accelerator in QEMU. The status had been added as below in
MAINTAINERSline 458. I noticed that the only difference with your commit is the last third line. The fileaccel/stubs/hax-stub.cis missed in the current files, while others are listed. Do you want to add this one only? And I will avoid missing emails in future and reply as soon as possible. Thanks.
Quoted 11 lines
Guest CPU Cores (HAXM)
---------------------
X86 HAXM CPUs
M: Wenchao Wang <[email protected]>
M: Colin Xu <[email protected]>
L: [email protected]
W: https://github.com/intel/haxm/issues
S: Maintained
+F:accel/stubs/hax-stub.c
F:include/sysemu/hax.h
F: target/i386/hax-*
I missed it, sorry.
Quoted 47 lines
Best Regards,
Wenchao-----Original Message-----
From: Philippe Mathieu-Daudé <[email protected]>
Sent: Friday, June 5, 2020 17:33
To: [email protected]
Cc: Richard Henderson <[email protected]>; Paolo Bonzini <[email protected]>; Philippe Mathieu-Daudé <[email protected]>; haxm-team <[email protected]>; Tao Wu <[email protected]>; Xu, Colin <[email protected]>; Wang, Wenchao <[email protected]>; Vincent Palatin <[email protected]>; Sergio Andres Gomez Del Real <[email protected]>
Subject: [PATCH v6 03/11]MAINTAINERS: Add an entry for the HAX acceleratorNobody replied since the first time [*] that patch was posted, so mark HAX as orphan.
[*] https://mid.mail-archive.com/[email protected]
Cc Tao Wu <[email protected]>Cc Colin Xu <[email protected]>Cc Wenchao Wang <[email protected]>Cc Vincent Palatin <[email protected]>Cc Sergio Andres Gomez Del Real <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+)MAINTAINERS +6
-1@@ -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 <[email protected]> S: Maintained --2.21.3
PATCH v6 4/11 rules.mak: Add strequal() and startwith() rules
In reply to Philippe Mathieu-DaudéAdd a rule to test if two strings are equal, and another to test if a string starts with a substring.
--- rules.mak | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
rules.mak +14 -0
@@ -191,6 +191,20 @@ ne = $(if $(subst $2,,$1)$(subst $1,,$2),y,n) isempty = $(if $1,n,y) notempty = $(if $1,y,n) +# strequal +# Usage: $(call strequal, str1, str2) +# +# This macro returns a string (TRUE) when @str1 and @str2 +# are equal, else returns the empty string (FALSE) +strequal = $(if $(subst $2,,$1)$(subst $1,,$2),,$1) + +# startwith +# Usage: $(call startwith, startstr, fullstr) +# +# This macro returns a string (TRUE) when @fullstr starts with +# @startstr, else returns the empty string (FALSE) +startwith = $(findstring :$1,:$2) + # Generate files with tracetool TRACETOOL=$(PYTHON) $(SRC_PATH)/scripts/tracetool.py
Signature · 1 line
2.21.3
PATCH v6 5/11 rules.mak: Add base-arch() rule
In reply to Philippe Mathieu-Daudé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
The rule can be tested calling 'print-base-arch-$TARGET':
$ make \
print-base-arch-openrisc \
print-base-arch-aarch64_be \
print-base-arch-x86_64 \
print-base-arch-mips64el \
print-base-arch-ppc64 \
print-base-arch-riscv64
openrisc=openrisc
aarch64_be=arm
x86_64=i386
mips64el=mips
ppc64=ppc
riscv64=riscv--- rules.mak | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+)
rules.mak +35 -0
@@ -452,3 +452,38 @@ 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 = $(strip \ + $(if $(call startwith,aarch64,$1),arm,\ + $(if $(call startwith,arm,$1),arm,\ + $(if $(call startwith,microblaze,$1),microblaze,\ + $(if $(call startwith,mips,$1),mips,\ + $(if $(call startwith,ppc,$1),ppc,\ + $(if $(call startwith,riscv,$1),riscv,\ + $(if $(call startwith,sh4,$1),sh4,\ + $(if $(call startwith,sparc,$1),sparc,\ + $(if $(call startwith,xtensa,$1),xtensa,\ + $(if $(call strequal,x86_64,$1),i386,\ + $1\ + )\ + )\ + )\ + )\ + )\ + )\ + )\ + )\ + )\ + )\ + ) + +print-base-arch-%: + @echo '$*=$(call base-arch,$*)'
Signature · 1 line
2.21.3
Re: [PATCH v6 05/11] rules.mak: Add base-arch() rule
Quoted 4 lines · Philippe Mathieu-Daudé
Add a rule to return the base architecture for a QEMU target.
The current list of
TARGET_BASE_ARCHis:
Quoted 14 lines
$ 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
This seems backwards. We encode the base architecture in configure.sh because this is where we can make such distinctions. We then:
echo "TARGET_BASE_ARCH=$TARGET_BASE_ARCH" >> $config_target_mak
Precisely so the make system can know what it is for any given target. So:
Quoted 21 lines
rules.mak +21
-0+# 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 = $(strip \ + $(if $(call startwith,aarch64,$1),arm,\ + $(if $(call startwith,arm,$1),arm,\ + $(if $(call startwith,microblaze,$1),microblaze,\ + $(if $(call startwith,mips,$1),mips,\ + $(if $(call startwith,ppc,$1),ppc,\ + $(if $(call startwith,riscv,$1),riscv,\ + $(if $(call startwith,sh4,$1),sh4,\ + $(if $(call startwith,sparc,$1),sparc,\ + $(if $(call startwith,xtensa,$1),xtensa,\ + $(if $(call strequal,x86_64,$1),i386,\ + $1\ + )\
rules.mak atomic = $(eval $1: $(call sentinel,$1) ; @:) \ · line 486
Quoted 10 lines
rules.mak +10
-0+ )\ + )\ + )\ + )\ + )\ + )\ + )\ + )\ + )\ + )
Seems like a replication of information already calculated in configure and prone to breakage if we add a new one (or come up with some franken architecture at a later date).
Signature · 1 line
Alex Bennée
PATCH v6 6/11 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
@@ -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
Re: [PATCH v6 06/11] Makefile: Remove dangerous EOL trailing backslash
Quoted 8 lines · Philippe Mathieu-Daudé
One might get caught trying to understand unexpected
Makefilebehavior. 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 <[email protected]>Reviewed-by Alistair Francis <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Signature · 1 line
Alex Bennée
PATCH v6 7/11 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
@@ -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
Re: [PATCH v6 07/11] Makefile: Write MINIKCONF variables as one entry per line
Quoted 6 lines · 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.
Reviewed-by Richard Henderson <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Signature · 1 line
Alex Bennée
PATCH v6 8/11 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
@@ -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
@@ -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
@@ -0,0 +1,6 @@ +config KVM + bool + +config XEN + bool + select FSDEV_9P if VIRTFS
Signature · 1 line
2.21.3
Re: [PATCH v6 08/11] accel/Kconfig: Extract accel selectors into their own config
Quoted 5 lines · Philippe Mathieu-Daudé
Move the accel selectors from the global
Kconfig.hostto their ownKconfigfile.Reviewed-by Richard Henderson <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Signature · 1 line
Alex Bennée
PATCH v6 9/11 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
@@ -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
@@ -1,3 +1,6 @@ +config TCG + bool + config KVM bool
Signature · 1 line
2.21.3
Re: [PATCH v6 09/11] accel/Kconfig: Add the TCG selector
Quoted 7 lines · Philippe Mathieu-Daudé
Expose the
CONFIG_TCGselector to letminikconf.pyuses it.When building with --disable-tcg build, this helps to deselect devices that are TCG-dependent.
Reviewed-by Richard Henderson <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Signature · 1 line
Alex Bennée
PATCH v6 10/11 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
@@ -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) \ > [email protected], "GEN", "[email protected]") $(call quiet-command, if test -f $@; then \ if cmp -s [email protected] $@; then \
Signature · 1 line
2.21.3
Re: [PATCH v6 10/11] Makefile: Allow target-specific optional Kconfig
Quoted 14 lines · Philippe Mathieu-Daudé
Allow use of target-specific
Kconfigfile.Reviewed-by Richard Henderson <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)Makefile +0
-0@@ -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/$(call base-arch, $(firstword $(subst -, ,$@)))/Kconfig) \
As discussed on IRC I think we can emit base-arch into config-host.mak from exiting data and then utilise that rather than re-coding the data inside rules.mak.
Otherwise:
Signature · 1 line
Alex Bennée
PATCH v6 11/11 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'
--- accel/stubs/tcg-stub.c | 7 +++++++ 1 file changed, 7 insertions(+)
accel/stubs/tcg-stub.c +7 -0
@@ -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
Re: [PATCH v6 11/11] accel/tcg: Add stub for probe_access()
Quoted 9 lines · Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <[email protected]>
The TCG helpers where added in
b92e5a22ec3insoftmmu_template.h.probe_write()was added in there in3b4afc9e75ato be moved out toaccel/tcg/cputlb.cin3b08f0a9254, and was later refactored asprobe_access()inc25c283df0f.
Since it is a TCG specific helper, add a stub to avoid failures when building without TCG, such:
Quoted 6 lines
target/arm/helper.o: In function `probe_read':
include/exec/exec-all.h:362: undefined reference to `probe_access'Reviewed-by Richard Henderson <[email protected]>Reviewed-by David Hildenbrand <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Signature · 1 line
Alex Bennée