[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/24] qemu-iotests: Add missing -machine accel=qtest
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 01/24] qemu-iotests: Add missing -machine accel=qtest |
Date: |
Tue, 26 Sep 2017 16:21:10 +0200 |
A basic set of qemu options is initialised in ./common:
export QEMU_OPTIONS="-nodefaults -machine accel=qtest"
However, two test cases (172 and 186) overwrite QEMU_OPTIONS and neglect
to manually set '-machine accel=qtest'. Add the missing option for 172.
186 probably only copied the code from 172, it doesn't actually need to
overwrite QEMU_OPTIONS, so remove that in 186.
Signed-off-by: Kevin Wolf <address@hidden>
Tested-by: Cornelia Huck <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
---
tests/qemu-iotests/172 | 2 +-
tests/qemu-iotests/186 | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172
index 826d6fecd3..02c5f79bab 100755
--- a/tests/qemu-iotests/172
+++ b/tests/qemu-iotests/172
@@ -56,7 +56,7 @@ function do_run_qemu()
done
fi
echo quit
- ) | $QEMU -nographic -monitor stdio -serial none "$@"
+ ) | $QEMU -machine accel=qtest -nographic -monitor stdio -serial none "$@"
echo
}
diff --git a/tests/qemu-iotests/186 b/tests/qemu-iotests/186
index 2b9f618f90..44cc01ed87 100755
--- a/tests/qemu-iotests/186
+++ b/tests/qemu-iotests/186
@@ -56,15 +56,15 @@ function do_run_qemu()
done
fi
echo quit
- ) | $QEMU -S -nodefaults -display none -device virtio-scsi-pci -monitor
stdio "$@" 2>&1
+ ) | $QEMU -S -display none -device virtio-scsi-pci -monitor stdio "$@" 2>&1
echo
}
function check_info_block()
{
echo "info block" |
- QEMU_OPTIONS="" do_run_qemu "$@" | _filter_win32 | _filter_hmp |
- _filter_qemu | _filter_generated_node_ids
+ do_run_qemu "$@" | _filter_win32 | _filter_hmp | _filter_qemu |
+ _filter_generated_node_ids
}
--
2.13.5
- [Qemu-devel] [PULL 00/24] Block layer patches, Kevin Wolf, 2017/09/26
- [Qemu-devel] [PULL 01/24] qemu-iotests: Add missing -machine accel=qtest,
Kevin Wolf <=
- [Qemu-devel] [PULL 02/24] qemu-img: Clarify about relative backing file options, Kevin Wolf, 2017/09/26
- [Qemu-devel] [PULL 06/24] iotests: use -ccw on s390x for 051, Kevin Wolf, 2017/09/26
- [Qemu-devel] [PULL 08/24] iotests: Print full path of bad output if mismatch, Kevin Wolf, 2017/09/26
- [Qemu-devel] [PULL 05/24] iotests: use -ccw on s390x for 040, 139, and 182, Kevin Wolf, 2017/09/26
- [Qemu-devel] [PULL 03/24] file-posix: Clear out first sector in hdev_create, Kevin Wolf, 2017/09/26
- [Qemu-devel] [PULL 10/24] block/throttle-groups.c: allocate RestartData on the heap, Kevin Wolf, 2017/09/26
- [Qemu-devel] [PULL 13/24] block: Add reopen_queue to bdrv_child_perm(), Kevin Wolf, 2017/09/26
- [Qemu-devel] [PULL 12/24] qemu-io: Drop write permissions before read-only reopen, Kevin Wolf, 2017/09/26