gem5-dev@gem5.org

The gem5 Developer List

View all threads

[S] Change in gem5/gem5[develop]: scons: Fix the default KVM_ISA setting.

GB
Gabe Black (Gerrit)
Wed, Sep 21, 2022 11:51 PM

Gabe Black has uploaded this change for review. (
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

M src/cpu/kvm/SConsopts
1 file changed, 15 insertions(+), 1 deletion(-)

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: 1
Gerrit-Owner: Gabe Black gabe.black@gmail.com
Gerrit-CC: Gabe Black gabeblack@google.com
Gerrit-MessageType: newchange

Gabe Black has uploaded this change for review. ( 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 --- M src/cpu/kvm/SConsopts 1 file changed, 15 insertions(+), 1 deletion(-) 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: 1 Gerrit-Owner: Gabe Black <gabe.black@gmail.com> Gerrit-CC: Gabe Black <gabeblack@google.com> Gerrit-MessageType: newchange