CPU: Make sure the system parameter gets set in the cpu builders. Other parameters...

--HG--
extra : convert_revision : 0401970a79855ee0a96eb29305346ce07b5c98ea

diff --git a/src/cpu/o3/alpha/cpu_builder.cc b/src/cpu/o3/alpha/cpu_builder.cc
index 1aa3d161803b9c27c6f1a9fa52ac9deed096dca6..f569c048b6f043c2257267c635ca2e0aed601e4e 100644 (file)
--- a/src/cpu/o3/alpha/cpu_builder.cc
+++ b/src/cpu/o3/alpha/cpu_builder.cc
@@ -80,8 +80,8 @@ DerivO3CPUParams::create()
     params->itb = itb;
     params->dtb = dtb;
 
-#if FULL_SYSTEM
     params->system = system;
+#if FULL_SYSTEM
     params->profile = profile;
 
     params->do_quiesce = do_quiesce;

diff --git a/src/cpu/o3/checker_builder.cc b/src/cpu/o3/checker_builder.cc
index 0799b9cb55beb1e98f28aecb40303dcb3aaea00f..baa604962b0fb370a5aea71a1654ae5e56eb6888 100644 (file)
--- a/src/cpu/o3/checker_builder.cc
+++ b/src/cpu/o3/checker_builder.cc
@@ -88,8 +88,8 @@ O3CheckerParams::create()
 
     params->itb = itb;
     params->dtb = dtb;
-#if FULL_SYSTEM
     params->system = system;
+#if FULL_SYSTEM
     params->cpu_id = cpu_id;
     params->profile = profile;
 #else

diff --git a/src/cpu/o3/sparc/cpu_builder.cc b/src/cpu/o3/sparc/cpu_builder.cc
index b7c6844315b839ce41d81709f07265b01e3535b1..b08845b4e8f873a5dfd4b525c89e823dd26f579e 100644 (file)
--- a/src/cpu/o3/sparc/cpu_builder.cc
+++ b/src/cpu/o3/sparc/cpu_builder.cc
@@ -81,8 +81,8 @@ DerivO3CPUParams::create()
     params->itb = itb;
     params->dtb = dtb;
 
-#if FULL_SYSTEM
     params->system = system;
+#if FULL_SYSTEM
     params->profile = profile;
 
     params->do_quiesce = do_quiesce;

diff --git a/src/cpu/ozone/checker_builder.cc b/src/cpu/ozone/checker_builder.cc
index 625b2a39a6fa96ea61d37f09de77e5b03133523e..eacec64618a04943362cc7a9a50840decdd6a878 100644 (file)
--- a/src/cpu/ozone/checker_builder.cc
+++ b/src/cpu/ozone/checker_builder.cc
@@ -89,8 +89,8 @@ OzoneCheckerParams::create()
 
     params->itb = itb;
     params->dtb = dtb;
-#if FULL_SYSTEM
     params->system = system;
+#if FULL_SYSTEM
     params->cpu_id = cpu_id;
     params->profile = profile;
 #else

diff --git a/src/cpu/ozone/cpu_builder.cc b/src/cpu/ozone/cpu_builder.cc
index 7edbe41c9b543a6ba333c3b3d841bde38dfb6ae3..9273703399d2af7026b922032d301f0616953376 100644 (file)
--- a/src/cpu/ozone/cpu_builder.cc
+++ b/src/cpu/ozone/cpu_builder.cc
@@ -82,8 +82,8 @@ DerivOzoneCPUParams::create()
     params->itb = itb;
     params->dtb = dtb;
 
-#if FULL_SYSTEM
     params->system = system;
+#if FULL_SYSTEM
     params->cpu_id = cpu_id;
     params->profile = profile;
     params->do_quiesce = do_quiesce;

diff --git a/src/cpu/ozone/simple_cpu_builder.cc b/src/cpu/ozone/simple_cpu_builder.cc
index ca55cdca45564b666b0951b07528fdfc8ed3b658..23f5455e482c1ff83ff7b63bb531ac6c05314ca4 100644 (file)
--- a/src/cpu/ozone/simple_cpu_builder.cc
+++ b/src/cpu/ozone/simple_cpu_builder.cc
@@ -85,8 +85,8 @@ SimpleOzoneCPUParams::create()
     params->itb = itb;
     params->dtb = dtb;
 
-#if FULL_SYSTEM
     params->system = system;
+#if FULL_SYSTEM
     params->cpu_id = cpu_id;
 #else
     params->workload = workload;