qemu-kvm.git uq/master queue

Anthony please pull if it is not too later for 1.5.

The following changes since commit 467b34689d277fa56c09ad07ca0f08d7d7539f6d:

Update OpenBIOS images (2013-05-05 09:53:22 +0000)

are available in the git repository at:

git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git uq/master

for you to fetch changes up to 0c1cd0ae2a4faabeb948b9a07ea1696e853de174:

kvmvapic: add ioport read accessor (2013-05-06 14:52:26 +0300)

----------------------------------------------------------------
Marcelo Tosatti (1):
kvmvapic: add ioport read accessor

 hw/i386/kvmvapic.c |    6 ++++++
 1 file changed, 6 insertions(+)

From: Marcelo Tosatti <[email protected]>

Necessary since memory region accessor assumes read and write methods are registered. Otherwise reading I/O port 0x7e segfaults.

https://bugzilla.redhat.com/show_bug.cgi?id=954306

---
 hw/i386/kvmvapic.c |    6 ++++++
 1 file changed, 6 insertions(+)

index 5b558aa..655483b 100644
@@ -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,
 };
 

1.7.10.4