diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-06 15:45:08 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-06 15:45:08 -0500 |
commit | b5803aa3583e82e5133f7621121bc15ee694f4a1 (patch) | |
tree | 19d4e3b139e7b4e30e24fc807e816b27010a9602 /hw | |
parent | fe677fd1b3fde96110898fde5101bea4cfe6e063 (diff) | |
parent | 0c1cd0ae2a4faabeb948b9a07ea1696e853de174 (diff) | |
download | qemu-b5803aa3583e82e5133f7621121bc15ee694f4a1.zip qemu-b5803aa3583e82e5133f7621121bc15ee694f4a1.tar.gz qemu-b5803aa3583e82e5133f7621121bc15ee694f4a1.tar.bz2 |
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>
Diffstat (limited to 'hw')
-rw-r--r-- | hw/i386/kvmvapic.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c index 5b558aa..655483b 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, }; |