| Message ID | 20210604155312.15902-99-alex.bennee@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | arm tcg/kvm refactor and split with kvm only support | expand |
On 6/4/21 8:53 AM, Alex Bennée wrote: > +++ b/configs/aarch64-softmmu/64bit-only.mak > @@ -0,0 +1,10 @@ > +# > +# A version of the config that only supports 64bits and their devices. > +# This doesn't quite eliminate all 32 bit devices as some boards like > +# "virt" support both. It's not really 64bit-only then is it? What is this attempting to show that virt-only (with sbsa) doesn't? > +++ b/configs/aarch64-softmmu/virt-only.mak > @@ -0,0 +1,8 @@ > +# > +# A version of the config that only supports virtual machines. This is > +# intended to be combined with options like --disable-tcg for a > +# minimal build supporting only machines we can virtualise with a > +# hypervisor. > +# > + > +CONFIG_ARM_VIRT=y I would have included SBSA here. That's a virtual machine as well, just not named "virt". It would also make a useful build configuration, imo, suitable for --disable-tcg --enable-kvm. r~
On 6/4/21 5:53 PM, Alex Bennée wrote: > While the default config works well enough it does end up enabling a > lot of stuff. For more minimal builds we can pass a slimmed down list > of devices and let Kconfig work out what we want. For example: > > ../../configure --without-default-features \ > --target-list=arm-softmmu,aarch64-softmmu \ > --with-devices-aarch64=(pwd)/../../configs/aarch64-softmmu/64bit-only.mak > > will override the aarch64-softmmu default devices to one of our own > choosing. Currently there are two configs provided: > > - 64bit-only, to build without any 32 bit boards at all > - virt, even more minimal set for --disable-tcg builds > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Cc: Paolo Bonzini <pbonzini@redhat.com> > Message-Id: <20210528163116.31902-1-alex.bennee@linaro.org> > > --- > v2 > - remove extraneous cc > - dropped pathname from config > - add virt.mak config > - drop ZYNQMP from the 64bit only build > - test -f the --with-devices-FOO file > --- > configure | 20 ++++++++++++++++++++ > configs/aarch64-softmmu/64bit-only.mak | 10 ++++++++++ > configs/aarch64-softmmu/virt-only.mak | 8 ++++++++ > meson.build | 3 ++- > 4 files changed, 40 insertions(+), 1 deletion(-) > create mode 100644 configs/aarch64-softmmu/64bit-only.mak > create mode 100644 configs/aarch64-softmmu/virt-only.mak Shouldn't we also move default-configs/devices/X.mak to configs/X/default.mak and adapt ./configure (instead of having configurations spreads in multiple directories)?
diff --git a/configure b/configure index f0c8629dc6..5bf2f56ac6 100755 --- a/configure +++ b/configure @@ -920,6 +920,16 @@ for opt do ;; --without-default-devices) default_devices="false" ;; + --with-devices-*[!a-zA-Z0-9_-]*=*) error_exit "Passed bad --with-devices-FOO option" + ;; + --with-devices-*) device_arch=${opt#--with-devices-}; device_arch=${device_arch%%=*} + if test -f "$optarg"; then + device_archs="$device_archs $device_arch" + eval "devices_${device_arch}=\$optarg" + else + error_exit "File $optarg does not exist" + fi + ;; --without-default-features) # processed above ;; --enable-gprof) gprof="yes" @@ -1766,6 +1776,7 @@ Advanced options (experts only): --without-default-devices do not include any device that is not needed to start the emulator (only use if you are including desired devices in default-configs/devices/) + --with-devices-ARCH=PATH override default-configs/devices with your own file --enable-debug enable common debug build options --enable-sanitizers enable default sanitizers --enable-tsan enable thread sanitizer @@ -6343,6 +6354,15 @@ if test "$skip_meson" = no; then echo "# Automatically generated by configure - do not modify" > $cross echo "[properties]" >> $cross + + # unroll any custom device configs + if test -n "$device_archs"; then + for a in $device_archs; do + eval "c=\$devices_${a}" + echo "${a}-softmmu = [ '$c' ]" >> $cross + done + fi + test -z "$cxx" && echo "link_language = 'c'" >> $cross echo "[built-in options]" >> $cross echo "c_args = [${CFLAGS:+$(meson_quote $CFLAGS)}]" >> $cross diff --git a/configs/aarch64-softmmu/64bit-only.mak b/configs/aarch64-softmmu/64bit-only.mak new file mode 100644 index 0000000000..19638a56cf --- /dev/null +++ b/configs/aarch64-softmmu/64bit-only.mak @@ -0,0 +1,10 @@ +# +# A version of the config that only supports 64bits and their devices. +# This doesn't quite eliminate all 32 bit devices as some boards like +# "virt" support both. The CONFIG_XLNX_ZYNQMP_ARM isn't included as it +# also requires 32 bit support for the R5s +# + +CONFIG_ARM_VIRT=y +CONFIG_XLNX_VERSAL=y +CONFIG_SBSA_REF=y diff --git a/configs/aarch64-softmmu/virt-only.mak b/configs/aarch64-softmmu/virt-only.mak new file mode 100644 index 0000000000..cadacf3e89 --- /dev/null +++ b/configs/aarch64-softmmu/virt-only.mak @@ -0,0 +1,8 @@ +# +# A version of the config that only supports virtual machines. This is +# intended to be combined with options like --disable-tcg for a +# minimal build supporting only machines we can virtualise with a +# hypervisor. +# + +CONFIG_ARM_VIRT=y diff --git a/meson.build b/meson.build index 09c7809d6b..9d25906219 100644 --- a/meson.build +++ b/meson.build @@ -1350,9 +1350,10 @@ foreach target : target_dirs configuration: config_target_data)} if target.endswith('-softmmu') + config_input = meson.get_external_property(target, 'default-configs/devices' / target + '.mak') config_devices_mak = target + '-config-devices.mak' config_devices_mak = configure_file( - input: ['default-configs/devices' / target + '.mak', 'Kconfig'], + input: [config_input, 'Kconfig'], output: config_devices_mak, depfile: config_devices_mak + '.d', capture: true,
While the default config works well enough it does end up enabling a lot of stuff. For more minimal builds we can pass a slimmed down list of devices and let Kconfig work out what we want. For example: ../../configure --without-default-features \ --target-list=arm-softmmu,aarch64-softmmu \ --with-devices-aarch64=(pwd)/../../configs/aarch64-softmmu/64bit-only.mak will override the aarch64-softmmu default devices to one of our own choosing. Currently there are two configs provided: - 64bit-only, to build without any 32 bit boards at all - virt, even more minimal set for --disable-tcg builds Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Message-Id: <20210528163116.31902-1-alex.bennee@linaro.org> --- v2 - remove extraneous cc - dropped pathname from config - add virt.mak config - drop ZYNQMP from the 64bit only build - test -f the --with-devices-FOO file --- configure | 20 ++++++++++++++++++++ configs/aarch64-softmmu/64bit-only.mak | 10 ++++++++++ configs/aarch64-softmmu/virt-only.mak | 8 ++++++++ meson.build | 3 ++- 4 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 configs/aarch64-softmmu/64bit-only.mak create mode 100644 configs/aarch64-softmmu/virt-only.mak -- 2.20.1