projects / sdk / emulator / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d7c698a 993c91a)
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)
commitf53f3d0a00b6df39ce8dfca942608e5b6a9a4f71
tree1fda6a6482b69da84db90e151c3250a7fd9c7482tree | snapshot
parentd7c698af8a5c7330a5ba70de0ff70904a661c20ecommit | diff
parent993c91a0e996346c7ee8fa2ca310cc76edb59e17commit | diff
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>
Domain: SDK / Emulator;