diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-08-10 10:05:29 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-08-10 10:05:29 +0100 |
| commit | 8a6be122e4eec029501a0d61f104fca3a5ae6f30 (patch) | |
| tree | a47e36f4fe6dad3c0361032ff552ebb0ce9eb1b6 /tests/acpi-test-data/q35/DSDT | |
| parent | 54affb3a3623b1d36c95e34faa722a5831323a74 (diff) | |
| parent | 24dd1e17696fbd11b3df50718dddcbdfe2c45f24 (diff) | |
| download | qemu-8a6be122e4eec029501a0d61f104fca3a5ae6f30.zip qemu-8a6be122e4eec029501a0d61f104fca3a5ae6f30.tar.gz qemu-8a6be122e4eec029501a0d61f104fca3a5ae6f30.tar.bz2 | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pc, vhost: fixes for rc3
Fix up bugs and warnings in tests. Revert an experimental commit that I
put in by mistake: harmless but useless.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Wed 09 Aug 2017 02:23:17 BST
# gpg: using RSA key 0x281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67
# Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469
* remotes/mst/tags/for_upstream:
libqtest: always set up signal handler for SIGABRT
libvhost-user: quit when no more data received
net: fix -netdev socket,fd= for UDP sockets
Revert "cpu: add APIs to allocate/free CPU environment"
acpi-test: update expected DSDT files
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/acpi-test-data/q35/DSDT')
| -rw-r--r-- | tests/acpi-test-data/q35/DSDT | bin | 7782 -> 7782 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/acpi-test-data/q35/DSDT b/tests/acpi-test-data/q35/DSDT Binary files differindex a6138c8..a080e2a 100644 --- a/tests/acpi-test-data/q35/DSDT +++ b/tests/acpi-test-data/q35/DSDT |