diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-07-18 09:35:51 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-07-18 09:35:51 +0100 |
| commit | 4d121a549869b93475ccf8b9a0d3e693011d1abb (patch) | |
| tree | d188f95c7c8c4297361bf80d033b71b67dbabec9 /net | |
| parent | 5734d031aa2fdb442410ca958ca5382d54fd71ff (diff) | |
| parent | cd98639f673d92836b6b5fd60279b411748f2f1e (diff) | |
| download | qemu-4d121a549869b93475ccf8b9a0d3e693011d1abb.tar.gz | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pc,vhost,test fixes
Minor bugfixes all over the place.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Fri 18 Jul 2014 00:43:04 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:
vhost-user: minor cleanups
qtest: Adapt vhost-user-test to latest vhost-user changes
vhost-user: Fix VHOST_SET_MEM_TABLE processing
qtest: fix vhost-user-test compilation with old GLib
fix typo: apci -> acpi
pc_piix: Reuse pc_compat_1_2() for pc-0.1[0123]
pc: fix qemu exiting with error when -m X < 128 with old machines types
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions