diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-02-02 09:53:15 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-02-02 09:53:15 +0000 |
| commit | 707eafb8b082b45504e95c1705816fc190e23247 (patch) | |
| tree | fb7e6eecf74087e5d53f36a13efda624384f9489 | |
| parent | b05631954d6dfe93340d516660397e2c1a2a5dd6 (diff) | |
| parent | 45a79646ea746fa3f32083d0aa70512aae29f6b3 (diff) | |
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Thu 01 Feb 2018 04:05:22 GMT
# gpg: using RSA key BDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg: aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg: aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98 D624 BDBE 7B27 C0DE 3057
* remotes/cody/tags/block-pull-request:
iotests: Make 200 run on tmpfs
block/ssh: fix possible segmentation fault when .desc is not null-terminated
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | block/ssh.c | 1 | ||||
| -rwxr-xr-x | tests/qemu-iotests/200 | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/block/ssh.c b/block/ssh.c index b049a16eb9..8890a0c4ba 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -556,6 +556,7 @@ static QemuOptsList ssh_runtime_opts = { .type = QEMU_OPT_STRING, .help = "Defines how and what to check the host key against", }, + { /* end of list */ } }, }; diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200 index d8787ddb46..ddbdedc476 100755 --- a/tests/qemu-iotests/200 +++ b/tests/qemu-iotests/200 @@ -60,7 +60,7 @@ qemu_comm_method="qmp" _launch_qemu -device pci-bridge,id=bridge1,chassis_nr=1,bus=pci.0 \ -object iothread,id=iothread0 \ -device virtio-scsi-pci,bus=bridge1,addr=0x1f,id=scsi0,iothread=iothread0 \ - -drive file="${TEST_IMG}",media=disk,if=none,cache=none,id=drive_sysdisk,aio=native,format=$IMGFMT \ + -drive file="${TEST_IMG}",media=disk,if=none,cache=$CACHEMODE,id=drive_sysdisk,format=$IMGFMT \ -device scsi-hd,drive=drive_sysdisk,bus=scsi0.0,id=sysdisk,bootindex=0 h1=$QEMU_HANDLE |