From: Peter Maydell Date: Sat, 8 Mar 2014 12:38:43 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/kvaneesh/for-upstream' into staging X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~1012 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f53f3d0a00b6df39ce8dfca942608e5b6a9a4f71;p=sdk%2Femulator%2Fqemu.git 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 --- f53f3d0a00b6df39ce8dfca942608e5b6a9a4f71