7 files changed, 20 insertions, 20 deletions

diff --git a/src/arch/alpha/freebsd/system.hh b/src/arch/alpha/freebsd/system.hh
index 48f6238c0..1a8bb9366 100644
--- a/src/arch/alpha/freebsd/system.hh
+++ b/src/arch/alpha/freebsd/system.hh
@@ -42,9 +42,9 @@ class FreebsdAlphaSystem : public AlphaSystem
     class SkipCalibrateClocksEvent : public SkipFuncEvent
     {
       public:
-        SkipCalibrateClocksEvent(PCEventQueue *q, const std::string &desc,
+        SkipCalibrateClocksEvent(PCEventScope *s, const std::string &desc,
                                  Addr addr)
-            : SkipFuncEvent(q, desc, addr) {}
+            : SkipFuncEvent(s, desc, addr) {}
         virtual void process(ThreadContext *tc);
     };
 
diff --git a/src/arch/alpha/idle_event.hh b/src/arch/alpha/idle_event.hh
index 97d5bdd6e..b3b53daea 100644
--- a/src/arch/alpha/idle_event.hh
+++ b/src/arch/alpha/idle_event.hh
@@ -38,8 +38,8 @@
 class IdleStartEvent : public PCEvent
 {
   public:
-    IdleStartEvent(PCEventQueue *q, const std::string &desc, Addr addr)
-        : PCEvent(q, desc, addr)
+    IdleStartEvent(PCEventScope *s, const std::string &desc, Addr addr)
+        : PCEvent(s, desc, addr)
     {}
     virtual void process(ThreadContext *tc);
 };
diff --git a/src/arch/alpha/linux/system.hh b/src/arch/alpha/linux/system.hh
index 8ea387e74..2477d426e 100644
--- a/src/arch/alpha/linux/system.hh
+++ b/src/arch/alpha/linux/system.hh
@@ -53,15 +53,15 @@ class LinuxAlphaSystem : public AlphaSystem
   private:
     struct SkipDelayLoopEvent : public SkipFuncEvent
     {
-        SkipDelayLoopEvent(PCEventQueue *q, const std::string &desc, Addr addr)
-            : SkipFuncEvent(q, desc, addr) {}
+        SkipDelayLoopEvent(PCEventScope *s, const std::string &desc, Addr addr)
+            : SkipFuncEvent(s, desc, addr) {}
         virtual void process(ThreadContext *tc);
     };
 
     struct PrintThreadInfo : public PCEvent
     {
-        PrintThreadInfo(PCEventQueue *q, const std::string &desc, Addr addr)
-            : PCEvent(q, desc, addr) {}
+        PrintThreadInfo(PCEventScope *s, const std::string &desc, Addr addr)
+            : PCEvent(s, desc, addr) {}
         virtual void process(ThreadContext *tc);
     };
 
diff --git a/src/arch/arm/linux/system.hh b/src/arch/arm/linux/system.hh
index 247ebae13..098ceda2e 100644
--- a/src/arch/arm/linux/system.hh
+++ b/src/arch/arm/linux/system.hh
@@ -127,8 +127,8 @@ class LinuxArmSystem : public GenericArmSystem
 class DumpStatsPCEvent : public PCEvent
 {
   public:
-    DumpStatsPCEvent(PCEventQueue *q, const std::string &desc, Addr addr)
-        : PCEvent(q, desc, addr)
+    DumpStatsPCEvent(PCEventScope *s, const std::string &desc, Addr addr)
+        : PCEvent(s, desc, addr)
     {}
 
     virtual void process(ThreadContext* tc);
@@ -140,8 +140,8 @@ class DumpStatsPCEvent : public PCEvent
 
 class DumpStatsPCEvent64 : public DumpStatsPCEvent {
   public:
-    DumpStatsPCEvent64(PCEventQueue *q, const std::string &desc, Addr addr)
-        : DumpStatsPCEvent(q, desc, addr)
+    DumpStatsPCEvent64(PCEventScope *s, const std::string &desc, Addr addr)
+        : DumpStatsPCEvent(s, desc, addr)
     {}
   private:
     void getTaskDetails(ThreadContext *tc, uint32_t &pid, uint32_t &tgid,
diff --git a/src/arch/mips/idle_event.hh b/src/arch/mips/idle_event.hh
index 3f96ce3e0..c65be0d0c 100644
--- a/src/arch/mips/idle_event.hh
+++ b/src/arch/mips/idle_event.hh
@@ -38,8 +38,8 @@
 class IdleStartEvent : public PCEvent
 {
   public:
-    IdleStartEvent(PCEventQueue *q, const std::string &desc, Addr addr)
-        : PCEvent(q, desc, addr)
+    IdleStartEvent(PCEventScope *s, const std::string &desc, Addr addr)
+        : PCEvent(s, desc, addr)
     {}
     virtual void process(ThreadContext *tc);
 };
diff --git a/src/arch/mips/linux/system.hh b/src/arch/mips/linux/system.hh
index 55e47bbb2..2b8526b63 100644
--- a/src/arch/mips/linux/system.hh
+++ b/src/arch/mips/linux/system.hh
@@ -54,16 +54,16 @@ class LinuxMipsSystem : public MipsSystem
     class SkipDelayLoopEvent : public SkipFuncEvent
     {
       public:
-        SkipDelayLoopEvent(PCEventQueue *q, const std::string &desc, Addr addr)
-            : SkipFuncEvent(q, desc, addr) {}
+        SkipDelayLoopEvent(PCEventScope *s, const std::string &desc, Addr addr)
+            : SkipFuncEvent(s, desc, addr) {}
         virtual void process(ThreadContext *tc);
     };
 
     class PrintThreadInfo : public PCEvent
     {
       public:
-        PrintThreadInfo(PCEventQueue *q, const std::string &desc, Addr addr)
-            : PCEvent(q, desc, addr) {}
+        PrintThreadInfo(PCEventScope *s, const std::string &desc, Addr addr)
+            : PCEvent(s, desc, addr) {}
         virtual void process(ThreadContext *tc);
     };
 
diff --git a/src/arch/riscv/idle_event.hh b/src/arch/riscv/idle_event.hh
index e77ae59f5..bcba05bf1 100644
--- a/src/arch/riscv/idle_event.hh
+++ b/src/arch/riscv/idle_event.hh
@@ -38,8 +38,8 @@
 class IdleStartEvent : public PCEvent
 {
   public:
-    IdleStartEvent(PCEventQueue *q, const std::string &desc, Addr addr)
-        : PCEvent(q, desc, addr)
+    IdleStartEvent(PCEventScope *s, const std::string &desc, Addr addr)
+        : PCEvent(s, desc, addr)
     {}
     virtual void process(ThreadContext *tc);
 };