The following changes since commit 2656eb7c599e306b95bad82b1372fc49ba3088f6:
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20140819' into staging (2014-08-20 09:55:42 +0100) are available in the git repository at: git://github.com/bonzini/qemu.git tags/for-upstream for you to fetch changes up to d1dd32af6f37e5bb8e6b2024d07fce74f510a668: memory: Lazy init name from QOM name as needed (2014-08-28 16:09:44 +0200) ---------------------------------------------------------------- SCSI patches include bug fixes from Fam and Peter, improved error reporting from Fam and a fix for DPRINTF bitrot. Memory patches try again to initialize name from the QOM name. ---------------------------------------------------------------- Fam Zheng (3): block: Pass errp in blkconf_geometry scsi-bus: Convert DeviceClass init to realize virtio-scsi: Report error if num_queues is 0 or too large Gonglei (1): scsi-generic: remove superfluous DPRINTF avoid to break compiling Peter Crosthwaite (3): xen-hvm: Constify string xen: hvm: Abstract away memory region name ref memory: Lazy init name from QOM name as needed Peter Lieven (1): block/iscsi: fix memory corruption on iscsi resize block/iscsi.c | 3 +- hw/block/block.c | 18 +++++----- hw/block/virtio-blk.c | 7 ++-- hw/ide/qdev.c | 11 ++++-- hw/scsi/lsi53c895a.c | 1 + hw/scsi/scsi-bus.c | 70 +++++++++++++++++++------------------- hw/scsi/scsi-disk.c | 83 +++++++++++++++++++++++++--------------------- hw/scsi/scsi-generic.c | 40 ++++++++++------------ hw/scsi/virtio-scsi.c | 6 ++++ include/hw/block/block.h | 6 ++-- include/hw/scsi/scsi.h | 4 +-- memory.c | 4 +++ tests/qemu-iotests/051.out | 2 -- xen-hvm.c | 11 +++--- 14 files changed, 143 insertions(+), 123 deletions(-) -- 1.8.3.1