OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

-----BEGIN PGP SIGNATURE-----

Browse Source 
iQIcBAABAgAGBQJacpICAAoJEL2+eyfA3jBXNoIP/11neaZupwJWWBeOm/87LPgY
 AzZU0fmFBLW0aSJBJAW4vVx+dsmriuSLGz6E4gPqI2yakBksqUeFN5noDfSZVz3F
 tQA5t9FrX3SvRaKIQ4S0SMmHDmmJjcFHl0ta3Bf0ZhNjtULaAvxrSXGzJdjyKAk1
 he2MjARECWwI5htvJ2s4f7VKDiy5x2PrNwEJdR+7BRRwbXaKJLoKrz111a5KMzF0
 7oiqzp+jmSNK1zs+LduOR/YkXoK+TKkPDesMSEyV32uoGXHEAV5xWI5FE6mPoYcZ
 kRZPiCyOWs4YKrBS8GtrY1jvIyQ1ftGPyEisgdYi7c5Tz6Ulhy+zWH9LNmaR5vT3
 1FEXFXI3gc1l1IYVYrWLbM9sTQgXePM39Jt/VgdGQ/YLtHD8npgooNXHKo5IYA5j
 8E9gHe0jzG2JyKrYGbQQb6J6eMMunWkclo/xo6fUNeGAvaEEHutNzn40EijTz0N5
 Qdn+sbPAjcnCo06F7pqc3TQMuoduC2GvP0cysG1ZP6BE03UIbIIerb8POQfpUtor
 7S11IKcAIQc+1asPKev/f7x65Jak3Bpch6Hwj966t6poQ/iOiSmp6J/GKcw6IwuE
 qx6tCdEqYE9FizYQlhaKGIqKLEcQHHf03tJN5D07ztBqmJdCvGfri15pFktjcdvE
 CqsDJ2m7s9+8HQzPKGeL
 =Digz
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2018-02-02 09:53:15 +00:00
commit 707eafb8b0
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
block/ssh.c
View File

@ -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 */ }
},
};

2
tests/qemu-iotests/200
View File

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