The following changes since commit 5f473241ac595452ae0638dc63e7af2a2294f5ec:
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2016-09-15 18:12:40 +0100) are available in the git repository at: https://github.com/gkurz/qemu.git tags/for-upstream for you to fetch changes up to 5c574f1bf92cfaf4aae6cbb66b79066c654920e1: 9pfs: fix potential segfault during walk (2016-09-16 12:16:29 +0200) ---------------------------------------------------------------- This pull request contains: - a fix for a regression introduced in 2.7 - basic functional testing for virtio-9p - some code cleanups for 9pfs ---------------------------------------------------------------- Greg Kurz (8): 9pfs: drop unused fmt strings in the proxy backend 9pfs: drop duplicate line in proxy backend 9pfs: drop useless v9fs_string_null() function 9pfs: introduce v9fs_path_sprintf() helper tests: virtio-9p: introduce start/stop functions tests: virtio-9p: add basic configuration test tests: virtio-9p: add basic transaction test 9pfs: fix potential segfault during walk fsdev/9p-marshal.c | 5 -- fsdev/9p-marshal.h | 1 - hw/9pfs/9p-local.c | 7 +- hw/9pfs/9p-proxy.c | 75 +++++++++------------ hw/9pfs/9p.c | 32 ++++++--- hw/9pfs/9p.h | 1 + tests/Makefile.include | 2 +- tests/virtio-9p-test.c | 179 ++++++++++++++++++++++++++++++++++++++++++++----- 8 files changed, 222 insertions(+), 80 deletions(-) -- 2.5.5
