diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-08-10 15:59:08 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-08-10 15:59:08 +0100 |
| commit | 4b3e5c06a15298d870e81c2d3a5a16dc2a93f5cc (patch) | |
| tree | 7b52e327678a89a0baf99ef2405deb67bf4a2df0 /tests | |
| parent | d578cca333168ada7f9421beb3f07abe8990e7e3 (diff) | |
| parent | 141de8865488189ad9d75408b3e0ad24c6fff2bb (diff) | |
| download | qemu-4b3e5c06a15298d870e81c2d3a5a16dc2a93f5cc.zip qemu-4b3e5c06a15298d870e81c2d3a5a16dc2a93f5cc.tar.gz qemu-4b3e5c06a15298d870e81c2d3a5a16dc2a93f5cc.tar.bz2 | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* pc-bios/optionrom/Makefile fixes
* warning fixes for __atomic_load and -1 << x in clang
* missed interrupt fix from Gonglei
* checkpatch fix from Radim and myself
# gpg: Signature made Wed 10 Aug 2016 14:54:31 BST
# gpg: using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini/tags/for-upstream:
checkpatch: default to success if only warnings
checkpatch: bump most warnings to errors
CODING_STYLE, checkpatch: update line length rules
checkpatch: check for CVS keywords on all sources
checkpatch: tweak the files in which TABs are checked
timer: set vm_clock disabled default
checkpatch: ignore automatically imported Linux headers
clang: Fix warning reg. expansion to 'defined'
Disable warn about left shifts of negative values
atomic: strip "const" from variables declared with typeof
optionrom: fix compilation with mingw docker target
optionrom: add -fno-stack-protector
build-sys: fix building with make CFLAGS=.. argument
linuxboot_dma: avoid guest ABI breakage on gcc vs. clang compilation
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test-aio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/test-aio.c b/tests/test-aio.c index 982339c..03aa846 100644 --- a/tests/test-aio.c +++ b/tests/test-aio.c @@ -452,7 +452,7 @@ static void test_timer_schedule(void) { TimerTestData data = { .n = 0, .ctx = ctx, .ns = SCALE_MS * 750LL, .max = 2, - .clock_type = QEMU_CLOCK_VIRTUAL }; + .clock_type = QEMU_CLOCK_REALTIME }; EventNotifier e; /* aio_poll will not block to wait for timers to complete unless it has @@ -782,7 +782,7 @@ static void test_source_timer_schedule(void) { TimerTestData data = { .n = 0, .ctx = ctx, .ns = SCALE_MS * 750LL, .max = 2, - .clock_type = QEMU_CLOCK_VIRTUAL }; + .clock_type = QEMU_CLOCK_REALTIME }; EventNotifier e; int64_t expiry; |