From: Peter Maydell Date: Thu, 28 Aug 2014 16:08:13 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~636 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a6aebb38ba4682951ab04fe6d6e6b169bd9e4dca;p=sdk%2Femulator%2Fqemu.git Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging 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. # gpg: Signature made Thu 28 Aug 2014 15:10:31 BST using RSA key ID 9B4D86F2 # gpg: Good signature from "Paolo Bonzini " # gpg: aka "Paolo Bonzini " * remotes/bonzini/tags/for-upstream: memory: Lazy init name from QOM name as needed xen: hvm: Abstract away memory region name ref xen-hvm: Constify string virtio-scsi: Report error if num_queues is 0 or too large scsi-generic: remove superfluous DPRINTF avoid to break compiling block/iscsi: fix memory corruption on iscsi resize scsi-bus: Convert DeviceClass init to realize block: Pass errp in blkconf_geometry Signed-off-by: Peter Maydell --- a6aebb38ba4682951ab04fe6d6e6b169bd9e4dca