]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'remotes/kvaneesh/for-upstream' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Sat, 8 Mar 2014 12:38:43 +0000 (12:38 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Sat, 8 Mar 2014 12:38:43 +0000 (12:38 +0000)
* 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>

Trivial merge