diff options
| author | Peter Maydell | 2014-09-30 14:09:39 +0200 |
|---|---|---|
| committer | Peter Maydell | 2014-09-30 14:09:40 +0200 |
| commit | 2e456b2b606aef488de27f8212e22382141fa022 (patch) | |
| tree | 39184cd190bedef458e5d9c698e9915ea49932b0 /hw/scsi/scsi-generic.c | |
| parent | Merge remote-tracking branch 'remotes/rth/tags/tcg-next-201400729' into staging (diff) | |
| parent | vl: Adjust the place of calling mlockall to speedup VM's startup (diff) | |
| download | qemu-2e456b2b606aef488de27f8212e22382141fa022.tar.gz qemu-2e456b2b606aef488de27f8212e22382141fa022.tar.xz qemu-2e456b2b606aef488de27f8212e22382141fa022.zip | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pci, pc, virtio, misc bugfixes
A bunch of bugfixes.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Mon 29 Sep 2014 17:59:57 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
* remotes/mst/tags/for_upstream:
vl: Adjust the place of calling mlockall to speedup VM's startup
pc-dimm: Don't check dimm->node when there is non-NUMA config
pci-hotplug-old: avoid losing error message
Revert "virtio-pci: fix migration for pci bus master"
loader: g_realloc(p, 0) frees and returns NULL, simplify
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/scsi/scsi-generic.c')
0 files changed, 0 insertions, 0 deletions