Merge branch 'upstream-merge'

Merge branch 'upstream-merge'

* upstream-merge: (159 commits)
  crisv10: Prettify.
  sparc32 fix spurious dma interrupts v2
  Revert "Sparc32: improve DMA controller IRQ debugging"
  cris: Add support for CRISv10 translation.
  cris: Use tcg_gen_movi_tl.
  cris: Add v10 style interrupts.
  crisv10: Always clear the V and C flags on btst.
  cris: Prepare for CRISv10.
  dec: use PCI accessors
  sparc64: use PCI accessors for APB/PBM
  Remove conditional rom loading support
  Fix incorrect exception_index use
  pci: fix info pci with host bridge.
  ide: add topology support
  scsi: add topology support
  virtio-blk: add topology support
  block: add topology qdev properties
  virtio-blk: revert serial number support
  Increase VNC_MAX_WIDTH
  qemu-img: use the heap instead of the huge stack array for win32
  ...

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