aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-05-06 15:45:08 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2013-05-06 15:45:08 -0500
commitb5803aa3583e82e5133f7621121bc15ee694f4a1 (patch)
tree19d4e3b139e7b4e30e24fc807e816b27010a9602
parentfe677fd1b3fde96110898fde5101bea4cfe6e063 (diff)
parent0c1cd0ae2a4faabeb948b9a07ea1696e853de174 (diff)
downloadqemu-arm-b5803aa3583e82e5133f7621121bc15ee694f4a1.tar.gz
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
# By Marcelo Tosatti # Via Gleb Natapov * qemu-kvm/uq/master: kvmvapic: add ioport read accessor Message-id: cover.1367844188.git.gleb@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--hw/i386/kvmvapic.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c
index 5b558aa180..655483bd1d 100644
--- a/hw/i386/kvmvapic.c
+++ b/hw/i386/kvmvapic.c
@@ -687,8 +687,14 @@ static void vapic_write(void *opaque, hwaddr addr, uint64_t data,
}
}
+static uint64_t vapic_read(void *opaque, hwaddr addr, unsigned size)
+{
+ return 0xffffffff;
+}
+
static const MemoryRegionOps vapic_ops = {
.write = vapic_write,
+ .read = vapic_read,
.endianness = DEVICE_NATIVE_ENDIAN,
};