diff options
| author | Peter Maydell | 2017-08-10 11:05:29 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-08-10 11:05:29 +0200 |
| commit | 8a6be122e4eec029501a0d61f104fca3a5ae6f30 (patch) | |
| tree | a47e36f4fe6dad3c0361032ff552ebb0ce9eb1b6 /tests | |
| parent | Update version for v2.10.0-rc2 release (diff) | |
| parent | libqtest: always set up signal handler for SIGABRT (diff) | |
| download | qemu-8a6be122e4eec029501a0d61f104fca3a5ae6f30.tar.gz qemu-8a6be122e4eec029501a0d61f104fca3a5ae6f30.tar.xz qemu-8a6be122e4eec029501a0d61f104fca3a5ae6f30.zip | |
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')
| -rw-r--r-- | tests/acpi-test-data/q35/DSDT | bin | 7782 -> 7782 bytes | |||
| -rw-r--r-- | tests/acpi-test-data/q35/DSDT.bridge | bin | 7799 -> 7799 bytes | |||
| -rw-r--r-- | tests/acpi-test-data/q35/DSDT.cphp | bin | 8245 -> 8245 bytes | |||
| -rw-r--r-- | tests/acpi-test-data/q35/DSDT.ipmibt | bin | 7857 -> 7857 bytes | |||
| -rw-r--r-- | tests/acpi-test-data/q35/DSDT.memhp | bin | 9147 -> 9147 bytes | |||
| -rw-r--r-- | tests/libqtest.c | 2 |
6 files changed, 1 insertions, 1 deletions
diff --git a/tests/acpi-test-data/q35/DSDT b/tests/acpi-test-data/q35/DSDT Binary files differindex a6138c8291..a080e2ace2 100644 --- a/tests/acpi-test-data/q35/DSDT +++ b/tests/acpi-test-data/q35/DSDT diff --git a/tests/acpi-test-data/q35/DSDT.bridge b/tests/acpi-test-data/q35/DSDT.bridge Binary files differindex 6b90f606f8..31a76732e5 100644 --- a/tests/acpi-test-data/q35/DSDT.bridge +++ b/tests/acpi-test-data/q35/DSDT.bridge diff --git a/tests/acpi-test-data/q35/DSDT.cphp b/tests/acpi-test-data/q35/DSDT.cphp Binary files differindex 976755ef2d..3e23cb638f 100644 --- a/tests/acpi-test-data/q35/DSDT.cphp +++ b/tests/acpi-test-data/q35/DSDT.cphp diff --git a/tests/acpi-test-data/q35/DSDT.ipmibt b/tests/acpi-test-data/q35/DSDT.ipmibt Binary files differindex b3fa4359ff..9c5e03fd2f 100644 --- a/tests/acpi-test-data/q35/DSDT.ipmibt +++ b/tests/acpi-test-data/q35/DSDT.ipmibt diff --git a/tests/acpi-test-data/q35/DSDT.memhp b/tests/acpi-test-data/q35/DSDT.memhp Binary files differindex 7341c405bf..1b7c484a5e 100644 --- a/tests/acpi-test-data/q35/DSDT.memhp +++ b/tests/acpi-test-data/q35/DSDT.memhp diff --git a/tests/libqtest.c b/tests/libqtest.c index 4a5492a603..b9a1f180e1 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -140,8 +140,8 @@ void qtest_add_abrt_handler(GHookFunc fn, const void *data) /* Only install SIGABRT handler once */ if (!abrt_hooks.is_setup) { g_hook_list_init(&abrt_hooks, sizeof(GHook)); - setup_sigabrt_handler(); } + setup_sigabrt_handler(); hook = g_hook_alloc(&abrt_hooks); hook->func = fn; |