diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-08-28 17:08:13 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-08-28 17:08:13 +0100 |
| commit | a6aebb38ba4682951ab04fe6d6e6b169bd9e4dca (patch) | |
| tree | 7431ca40c5bc6882e9122326c7a2d6b140c5ba56 /hw/display/qxl-render.c | |
| parent | 38a01e55d268aeba68c84eea425252e7f810feaf (diff) | |
| parent | d1dd32af6f37e5bb8e6b2024d07fce74f510a668 (diff) | |
| download | focaccia-qemu-a6aebb38ba4682951ab04fe6d6e6b169bd9e4dca.tar.gz focaccia-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 'hw/display/qxl-render.c')
0 files changed, 0 insertions, 0 deletions