The following changes since commit b312532fd03413d0e6ae6767ec793a3e30f487b8:
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2018-10-19 19:01:07 +0100) are available in the Git repository at: https://people.debian.org/~sthibault/qemu.git tags/samuel-thibault for you to fetch changes up to 0fca92b9077af9817c04545cdfc519fe95c6fde9: slirp: Implement RFC2132 TFTP server name (2018-10-21 21:24:55 +0200) ---------------------------------------------------------------- Fam Zheng (2): slirp: Add sanity check for str option length slirp: Implement RFC2132 TFTP server name ---------------------------------------------------------------- Fam Zheng (2): slirp: Add sanity check for str option length slirp: Implement RFC2132 TFTP server name net/slirp.c | 21 +++++++++++++++++++-- qapi/net.json | 5 ++++- qemu-options.hx | 7 ++++++- slirp/bootp.c | 45 +++++++++++++++++++++++++++++++++++---------- slirp/bootp.h | 1 + slirp/libslirp.h | 1 + slirp/slirp.c | 2 ++ slirp/slirp.h | 1 + 8 files changed, 69 insertions(+), 14 deletions(-)
