david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qemu-iotests: Add missing -machine accel=qtest

Browse Source 
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 <kwolf@redhat.com>
Tested-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
Kevin Wolf 2017-09-07 10:50:00 +02:00
parent 1e3ee83408
commit 05b4cd5d3c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/qemu-iotests/172
View File

@ -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
}

6
tests/qemu-iotests/186
View File

@ -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
}