diff options
| author | Peter Maydell | 2014-08-28 18:08:13 +0200 |
|---|---|---|
| committer | Peter Maydell | 2014-08-28 18:08:13 +0200 |
| commit | a6aebb38ba4682951ab04fe6d6e6b169bd9e4dca (patch) | |
| tree | 7431ca40c5bc6882e9122326c7a2d6b140c5ba56 /include/hw/usb.h | |
| parent | Merge remote-tracking branch 'remotes/kvm/tags/for-upstream' into staging (diff) | |
| parent | memory: Lazy init name from QOM name as needed (diff) | |
| download | qemu-a6aebb38ba4682951ab04fe6d6e6b169bd9e4dca.tar.gz qemu-a6aebb38ba4682951ab04fe6d6e6b169bd9e4dca.tar.xz qemu-a6aebb38ba4682951ab04fe6d6e6b169bd9e4dca.zip | |
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 <pbonzini@redhat.com>"
# gpg: aka "Paolo Bonzini <bonzini@gnu.org>"
* 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 <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/usb.h')
0 files changed, 0 insertions, 0 deletions