diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-08-04 11:07:50 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-08-04 11:07:50 +0100 |
| commit | 413ff8be2fcb5e5c4422f5c1bacdb7e5b5915e5e (patch) | |
| tree | 46d91274360ae4adcf4dd21ea30fd39e00ce7cf5 /qemu-io.c | |
| parent | aaaec6acad7cf97372d48c1b09126a09697519c8 (diff) | |
| parent | 413d463f43fbc4dd3a601e80a5724aa384a265a0 (diff) | |
| download | qemu-413ff8be2fcb5e5c4422f5c1bacdb7e5b5915e5e.zip qemu-413ff8be2fcb5e5c4422f5c1bacdb7e5b5915e5e.tar.gz qemu-413ff8be2fcb5e5c4422f5c1bacdb7e5b5915e5e.tar.bz2 | |
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging
slirp updates
# gpg: Signature made Wed 02 Aug 2017 23:27:41 BST
# gpg: using RSA key 0x9E511E01C737F075
# gpg: Good signature from "Samuel Thibault <samuel.thibault@aquilenet.fr>"
# gpg: aka "Samuel Thibault <sthibault@debian.org>"
# gpg: aka "Samuel Thibault <samuel.thibault@gnu.org>"
# gpg: aka "Samuel Thibault <samuel.thibault@inria.fr>"
# gpg: aka "Samuel Thibault <samuel.thibault@labri.fr>"
# gpg: aka "Samuel Thibault <samuel.thibault@ens-lyon.org>"
# gpg: aka "Samuel Thibault <samuel.thibault@u-bordeaux.fr>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 900C B024 B679 31D4 0F82 304B D017 8C76 7D06 9EE6
# Subkey fingerprint: 9A37 3D36 64A8 DC62 DA0A 34FD 9E51 1E01 C737 F075
* remotes/thibault/tags/samuel-thibault:
slirp: check len against dhcp options array end
slirp: fill error when failing to initialize user network
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-io.c')
0 files changed, 0 insertions, 0 deletions