Merge branch 'upstream-merge'qemu-kvm-1.2.0-rc2

* upstream-merge: (47 commits)
  w32: Fix broken build
  Update version for 1.2.0-rc2
  scsi-disk: Fix typo (uint32 -> uint32_t)
  msix: make [un]use vectors on reset/load optional
  kvm: get/set PV EOI MSR
  linux-headers: update to 3.6-rc3
  target-i386: disable pv eoi to fix migration across QEMU versions
  reset PMBA and PMREGMISC PIIX4 registers.
  qemu-ga: Fix null pointer passed to unlink in failure branch
  memory: Fix copy&paste mistake in memory_region_iorange_write
  ivshmem: remove redundant ioeventfd configuration
  hw/arm_gic.c: Define .class_size in arm_gic_info TypeInfo
  tcg/mips: fix broken CONFIG_TCG_PASS_AREG0 code
  Update OpenBIOS PPC image
  target-ppc: fix altivec instructions
  audio/winwave: previous audio buffer should be flushed
  iscsi: Set number of blocks to 0 for blank CDROM devices
  scsi: more fixes to properties for passthrough devices
  esp: support 24-bit DMA
  megasas: Add 'hba_serial' property
  ...

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/memory.c b/memory.c
index 643871baf..d528d1f7f 100644
--- a/memory.c
+++ b/memory.c
@@ -426,7 +426,7 @@ static void memory_region_iorange_write(IORange *iorange,
         if (mrp) {
             mrp->write(mr->opaque, offset, data);
         } else if (width == 2) {
-            mrp = find_portio(mr, offset - mrio->offset, 1, false);
+            mrp = find_portio(mr, offset - mrio->offset, 1, true);
             assert(mrp);
             mrp->write(mr->opaque, offset, data & 0xff);
             mrp->write(mr->opaque, offset + 1, data >> 8);