Commit 707eafb8 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b0563195 45a79646

block/ssh.c

+1 −0
Original line number Diff line number Diff line
@@ -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 */ }

    },

};

tests/qemu-iotests/200

+1 −1
Original line number Diff line number Diff line
@@ -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