Skip to contentSkip to conversation

qemu-iotests: Add missing -machine accel=qtest

PATCH In review Kevin Wolf 2 participants 2 messages Sep 7, 2017

lore
Share & tools
lore

Kevin Wolf

author
#0 lore raw

PATCH 1/1 qemu-iotests: Add missing -machine accel=qtest

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 <[email protected]>
---
 tests/qemu-iotests/172 | 2 +-
 tests/qemu-iotests/186 | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
tests/qemu-iotests/172 +1 -1
index 826d6fecd3..02c5f79bab 100755
@@ -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
 }
tests/qemu-iotests/186 +3 -3
index 2b9f618f90..44cc01ed87 100755
@@ -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
 }
Signature · 1 line
2.13.5
Tested-by Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · On Thu, 7 Sep 2017 10:53:10 +0200 Kevin Wolf <[email protected]> wrote:

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.

Quoted 5 lines
Signed-off-by Kevin Wolf <[email protected]>
---
 tests/qemu-iotests/172 | 2 +-
 tests/qemu-iotests/186 | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

I tested this on top of my change switching the default machine to "tcg:kvm:xen:hax", and this now passes on x86_64 builds both with and without tcg.

Tested-by Cornelia Huck <[email protected]>
Reviewed-by Cornelia Huck <[email protected]>