From: Stephan Diestelhorst <stephan.diestelhorst@ARM.com>
Date: Thu, 17 Oct 2013 15:20:45 +0000 (-0500)
Subject: mem: De-virtualise interfaces in the CoherentBus
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4e9d91016a9f23b2ec6a73c01713e4a363d2593a;p=gem5.git

mem: De-virtualise interfaces in the CoherentBus

The CoherentBus eventually got virtual methods for its interface. The
"virtuality" of the CoherentBus, however, comes already from the virtual
interface of the bus' ports. There is no need to add another layer of virtual
functions, here.
---

diff --git a/src/mem/coherent_bus.hh b/src/mem/coherent_bus.hh
index 034b855ec..8dde66d37 100644
--- a/src/mem/coherent_bus.hh
+++ b/src/mem/coherent_bus.hh
@@ -272,19 +272,19 @@ class CoherentBus : public BaseBus
 
     /** Function called by the port when the bus is recieving a Timing
       request packet.*/
-    virtual bool recvTimingReq(PacketPtr pkt, PortID slave_port_id);
+    bool recvTimingReq(PacketPtr pkt, PortID slave_port_id);
 
     /** Function called by the port when the bus is recieving a Timing
       response packet.*/
-    virtual bool recvTimingResp(PacketPtr pkt, PortID master_port_id);
+    bool recvTimingResp(PacketPtr pkt, PortID master_port_id);
 
     /** Function called by the port when the bus is recieving a timing
         snoop request.*/
-    virtual void recvTimingSnoopReq(PacketPtr pkt, PortID master_port_id);
+    void recvTimingSnoopReq(PacketPtr pkt, PortID master_port_id);
 
     /** Function called by the port when the bus is recieving a timing
         snoop response.*/
-    virtual bool recvTimingSnoopResp(PacketPtr pkt, PortID slave_port_id);
+    bool recvTimingSnoopResp(PacketPtr pkt, PortID slave_port_id);
 
     /** Timing function called by port when it is once again able to process
      * requests. */