[gem5-dev] Change in gem5/gem5[master]: dev: Terminal output's dump name conflicts
Andrea Mondelli has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/20959 )
Change subject: dev: Terminal output's dump name conflicts
..
dev: Terminal output's dump name conflicts
The recently Terminal dump options name introduced
in patch 1c72e90 conflict with MacOS stdio.h header.
From stdio.h:
#define stdin __stdinp
#define stdout __stdoutp
#define stderr __stderrp
To remove this conflict, the TerminalDump options are renamed.
Change-Id: I1b60fa1031328fc32d6a58bf7889b6e479d95219
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/20959
Reviewed-by: Giacomo Travaglini
Reviewed-by: Jason Lowe-Power
Maintainer: Jason Lowe-Power
Tested-by: kokoro
---
M src/dev/serial/Terminal.py
M src/dev/serial/terminal.cc
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
Giacomo Travaglini: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/dev/serial/Terminal.py b/src/dev/serial/Terminal.py
index 5340104..e6cc6a9 100644
--- a/src/dev/serial/Terminal.py
+++ b/src/dev/serial/Terminal.py
@@ -44,7 +44,7 @@
from m5.objects.Serial import SerialDevice
-class TerminalDump(Enum): vals = ["none", "stdout", "stderr", "file"]
+class TerminalDump(Enum): vals = ["none", "stdoutput", "stderror", "file"]
class Terminal(SerialDevice):
type = 'Terminal'
diff --git a/src/dev/serial/terminal.cc b/src/dev/serial/terminal.cc
index 002a2eb..ce8e214 100644
--- a/src/dev/serial/terminal.cc
+++ b/src/dev/serial/terminal.cc
@@ -151,9 +151,9 @@
switch (p->outfile) {
case Enums::TerminalDump::none:
return nullptr;
- case Enums::TerminalDump::stdout:
+ case Enums::TerminalDump::stdoutput:
return simout.findOrCreate("stdout");
- case Enums::TerminalDump::stderr:
+ case Enums::TerminalDump::stderror:
return simout.findOrCreate("stderr");
case Enums::TerminalDump::file:
return simout.findOrCreate(p->name);
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/20959
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I1b60fa1031328fc32d6a58bf7889b6e479d95219
Gerrit-Change-Number: 20959
Gerrit-PatchSet: 4
Gerrit-Owner: Andrea Mondelli
Gerrit-Reviewer: Andrea Mondelli
Gerrit-Reviewer: Giacomo Travaglini
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: kokoro
Gerrit-MessageType: merged
___
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev
[gem5-dev] Change in gem5/gem5[master]: dev: Terminal output's dump name conflicts
Andrea Mondelli has uploaded a new patch set (#2). ( https://gem5-review.googlesource.com/c/public/gem5/+/20959 ) Change subject: dev: Terminal output's dump name conflicts .. dev: Terminal output's dump name conflicts The recently Terminal dump options name introduced in patch 1c72e90 conflict with MacOS stdio.h header. From stdio.h: #define stdin __stdinp #define stdout __stdoutp #define stderr __stderrp To remove this conflict, the TerminalDump options are renamed. Change-Id: I1b60fa1031328fc32d6a58bf7889b6e479d95219 --- M src/dev/serial/Terminal.py M src/dev/serial/terminal.cc 2 files changed, 3 insertions(+), 3 deletions(-) -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/20959 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: master Gerrit-Change-Id: I1b60fa1031328fc32d6a58bf7889b6e479d95219 Gerrit-Change-Number: 20959 Gerrit-PatchSet: 2 Gerrit-Owner: Andrea Mondelli Gerrit-MessageType: newpatchset ___ gem5-dev mailing list gem5-dev@gem5.org http://m5sim.org/mailman/listinfo/gem5-dev
[gem5-dev] Change in gem5/gem5[master]: dev: Terminal output's dump name conflicts
Andrea Mondelli has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/20959 )
Change subject: dev: Terminal output's dump name conflicts
..
dev: Terminal output's dump name conflicts
The recently Terminal dump options name introduced
in patch 1c72e90 conflict with MacOS stdio.h header.
From stdio.h:
To remove this conflict, the TerminalDump options are renamed.
Change-Id: I1b60fa1031328fc32d6a58bf7889b6e479d95219
---
M src/dev/serial/Terminal.py
M src/dev/serial/terminal.cc
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/dev/serial/Terminal.py b/src/dev/serial/Terminal.py
index 5340104..e6cc6a9 100644
--- a/src/dev/serial/Terminal.py
+++ b/src/dev/serial/Terminal.py
@@ -44,7 +44,7 @@
from m5.objects.Serial import SerialDevice
-class TerminalDump(Enum): vals = ["none", "stdout", "stderr", "file"]
+class TerminalDump(Enum): vals = ["none", "stdoutput", "stderror", "file"]
class Terminal(SerialDevice):
type = 'Terminal'
diff --git a/src/dev/serial/terminal.cc b/src/dev/serial/terminal.cc
index 002a2eb..ce8e214 100644
--- a/src/dev/serial/terminal.cc
+++ b/src/dev/serial/terminal.cc
@@ -151,9 +151,9 @@
switch (p->outfile) {
case Enums::TerminalDump::none:
return nullptr;
- case Enums::TerminalDump::stdout:
+ case Enums::TerminalDump::stdoutput:
return simout.findOrCreate("stdout");
- case Enums::TerminalDump::stderr:
+ case Enums::TerminalDump::stderror:
return simout.findOrCreate("stderr");
case Enums::TerminalDump::file:
return simout.findOrCreate(p->name);
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/20959
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I1b60fa1031328fc32d6a58bf7889b6e479d95219
Gerrit-Change-Number: 20959
Gerrit-PatchSet: 1
Gerrit-Owner: Andrea Mondelli
Gerrit-MessageType: newchange
___
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev
