tree 1fda6a6482b69da84db90e151c3250a7fd9c7482
parent d7c698af8a5c7330a5ba70de0ff70904a661c20e
parent 993c91a0e996346c7ee8fa2ca310cc76edb59e17
author Peter Maydell <peter.maydell@linaro.org> 1394282323 +0000
committer Peter Maydell <peter.maydell@linaro.org> 1394282323 +0000

Merge remote-tracking branch 'remotes/kvaneesh/for-upstream' into staging

* remotes/kvaneesh/for-upstream:
  hw/9pfs: Include virtio-9p-device.o in build
  hw/9pfs: use g_strdup_printf() instead of PATH_MAX limitation
  hw/9pfs/virtio-9p-local.c: use snprintf() instead of sprintf()
  hw/9pfs/virtio-9p-local.c: move v9fs_string_free() to below "err_out:"
  fsdev: Fix overrun after readlink() fills buffer completely

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>