Commit b5803aa3 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents fe677fd1 0c1cd0ae

hw/i386/kvmvapic.c

+6 −0
Original line number Diff line number Diff line
@@ -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,

};