53c53
< class MemBus(Bus):
---
> class MemBus(CoherentBus):
70,71c70,71
< self.iobus = Bus(bus_id=0)
< self.membus = MemBus(bus_id=1)
---
> self.iobus = NoncoherentBus()
> self.membus = MemBus()
120c120
< self.piobus = Bus(bus_id=0)
---
> self.piobus = NoncoherentBus()
175,176c175,176
< self.iobus = Bus(bus_id=0)
< self.membus = MemBus(bus_id=1)
---
> self.iobus = NoncoherentBus()
> self.membus = MemBus()
240,241c240,241
< self.iobus = Bus(bus_id=0)
< self.membus = MemBus(bus_id=1)
---
> self.iobus = NoncoherentBus()
> self.membus = MemBus()
323,324c323,324
< self.iobus = Bus(bus_id=0)
< self.membus = MemBus(bus_id=1)
---
> self.iobus = NoncoherentBus()
> self.membus = MemBus()
366c366
< x86_sys.membus = MemBus(bus_id=1)
---
> x86_sys.membus = MemBus()
370c370
< x86_sys.iobus = Bus(bus_id=0)
---
> x86_sys.iobus = NoncoherentBus()
405c405
< x86_sys.piobus = Bus(bus_id=0)
---
> x86_sys.piobus = NoncoherentBus()