diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-11-17 11:33:38 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-11-17 11:33:38 +0000 |
| commit | 9be060f5278dc0d732ebfcf2bf0a293f88b833eb (patch) | |
| tree | 12f5982ed12b580bb6475ac0263f5a47310320eb /tests | |
| parent | 361cb26827ffd5f24af05b0e473ecd82d6a33bde (diff) | |
| parent | 10f5a72f70862d299ddbdf226d6dc71fa4ae34dd (diff) | |
| download | hqemu-9be060f5278dc0d732ebfcf2bf0a293f88b833eb.zip hqemu-9be060f5278dc0d732ebfcf2bf0a293f88b833eb.tar.gz | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Tue 17 Nov 2015 11:13:05 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
* remotes/stefanha/tags/block-pull-request:
virtio-blk: Fix double completion for werror=stop
block: make 'stats-interval' an array of ints instead of a string
aio-epoll: Fix use-after-free of node
disas/arm: avoid clang shifting negative signed warning
tpm: avoid clang shifting negative signed warning
tests: Ignore recent test binaries
docs: update bitmaps.md
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/.gitignore | 2 | ||||
| -rw-r--r-- | tests/qemu-iotests/136 | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/.gitignore b/tests/.gitignore index e96f569..1e55722 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -9,6 +9,7 @@ check-qom-proplist rcutorture test-aio test-bitops +test-blockjob-txn test-coroutine test-crypto-cipher test-crypto-hash @@ -45,6 +46,7 @@ test-string-input-visitor test-string-output-visitor test-thread-pool test-throttle +test-timed-average test-visitor-serialization test-vmstate test-write-threshold diff --git a/tests/qemu-iotests/136 b/tests/qemu-iotests/136 index f574d83..e8c6937 100644 --- a/tests/qemu-iotests/136 +++ b/tests/qemu-iotests/136 @@ -69,7 +69,7 @@ sector = "%d" def setUp(self): drive_args = [] - drive_args.append("stats-intervals=%d" % interval_length) + drive_args.append("stats-intervals.0=%d" % interval_length) drive_args.append("stats-account-invalid=%s" % (self.account_invalid and "on" or "off")) drive_args.append("stats-account-failed=%s" % |
