From cd9cd85ce9b0f3905ecfcd843d128b0fd754871c Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Thu, 19 Sep 2013 17:55:04 +0200 Subject: [PATCH] kvm: Correctly handle the return value from handleIpr(Read|Write) The KVM base class incorrectly assumed that handleIprRead and handleIprWrite both return ticks. This is not the case, instead they return cycles. This changeset converts the returned cycles to ticks when handling IPR accesses. --- src/cpu/kvm/base.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cpu/kvm/base.cc b/src/cpu/kvm/base.cc index 1631fb54c..594c5b7ae 100644 --- a/src/cpu/kvm/base.cc +++ b/src/cpu/kvm/base.cc @@ -969,10 +969,10 @@ BaseKvmCPU::doMMIOAccess(Addr paddr, void *data, int size, bool write) pkt.dataStatic(data); if (mmio_req.isMmappedIpr()) { - if (write) - return TheISA::handleIprWrite(tc, &pkt); - else - return TheISA::handleIprRead(tc, &pkt); + const Cycles ipr_delay(write ? + TheISA::handleIprWrite(tc, &pkt) : + TheISA::handleIprRead(tc, &pkt)); + return clockEdge(ipr_delay); } else { return dataPort.sendAtomic(&pkt); } -- 2.30.2