diff options
| author | Peter Maydell | 2019-12-17 16:55:20 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-12-17 16:55:20 +0100 |
| commit | aceeaa69d28e6f08a24395d0aa6915b687d0a681 (patch) | |
| tree | d41f95a304e7f984455b8fac4992cf0d2e000dcc /tests/migration-test.c | |
| parent | Merge remote-tracking branch 'remotes/cleber/tags/python-next-pull-request' i... (diff) | |
| parent | tests: use g_test_rand_int (diff) | |
| download | qemu-aceeaa69d28e6f08a24395d0aa6915b687d0a681.tar.gz qemu-aceeaa69d28e6f08a24395d0aa6915b687d0a681.tar.xz qemu-aceeaa69d28e6f08a24395d0aa6915b687d0a681.zip | |
Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-12-17' into staging
* Removal of the deprecated bluetooth code
* Some qtest and misc patches
# gpg: Signature made Tue 17 Dec 2019 08:09:08 GMT
# gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg: issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg: aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5
* remotes/huth-gitlab/tags/pull-request-2019-12-17:
tests: use g_test_rand_int
tests/Makefile: Fix check-report.* targets shown in check-help
glib: use portable g_setenv()
hw/misc/ivshmem: Bury dead legacy INTx code
pseries: disable migration-test if /dev/kvm cannot be used
tests: fix modules-test 'duplicate test case' error
Remove libbluetooth / bluez from the CI tests
Remove the core bluetooth code
hw/usb: Remove the USB bluetooth dongle device
hw/arm/nseries: Replace the bluetooth chardev with a "null" chardev
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/migration-test.c')
| -rw-r--r-- | tests/migration-test.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/migration-test.c b/tests/migration-test.c index ebd77a581a..a5343fdc66 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -1349,7 +1349,8 @@ int main(int argc, char **argv) * some reason) */ if (g_str_equal(qtest_get_arch(), "ppc64") && - access("/sys/module/kvm_hv", F_OK)) { + (access("/sys/module/kvm_hv", F_OK) || + access("/dev/kvm", R_OK | W_OK))) { g_test_message("Skipping test: kvm_hv not available"); return g_test_run(); } |