ISA code can set this to indicate what ISA KVM can target.

Gabe Black has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/63752?usp=email ) Change subject: scons: Fix the default KVM_ISA setting. ...................................................................... scons: Fix the default KVM_ISA setting. The KVM_ISA setting was moved into a CONF dict, but the code which ensured it had a default if there was no possible KVM hosting ISA was still setting that variable in the base environment dict. This moves the setting into the CONF dict instead. Change-Id: I067c969dd761b2cdb098bcba6cd6a4b643d2d427 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/63752 Reviewed-by: Earl Ou <shunhsingou@google.com> Tested-by: kokoro <noreply+kokoro@google.com> Maintainer: Gabe Black <gabeblack@google.com> --- M src/cpu/kvm/SConsopts 1 file changed, 19 insertions(+), 1 deletion(-) Approvals: kokoro: Regressions pass Gabe Black: Looks good to me, approved Earl Ou: Looks good to me, approved diff --git a/src/cpu/kvm/SConsopts b/src/cpu/kvm/SConsopts index e5818e0..275eeda 100644 --- a/src/cpu/kvm/SConsopts +++ b/src/cpu/kvm/SConsopts @@ -30,7 +30,7 @@ import gem5_scons # ISA code can set this to indicate what ISA KVM can target. -main.SetDefault(KVM_ISA='') +main['CONF'].setdefault('KVM_ISA', '') with gem5_scons.Configure(main) as conf: # Check if we should enable KVM-based hardware virtualization. The -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/63752?usp=email To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: develop Gerrit-Change-Id: I067c969dd761b2cdb098bcba6cd6a4b643d2d427 Gerrit-Change-Number: 63752 Gerrit-PatchSet: 2 Gerrit-Owner: Gabe Black <gabe.black@gmail.com> Gerrit-Reviewer: Earl Ou <shunhsingou@google.com> Gerrit-Reviewer: Gabe Black <gabeblack@google.com> Gerrit-Reviewer: kokoro <noreply+kokoro@google.com> Gerrit-MessageType: merged