Branch: refs/heads/master Home: https://github.com/qemu/qemu Commit: 799fe087e491e17ff02658d34e5fc696c79f6db5 https://github.com/qemu/qemu/commit/799fe087e491e17ff02658d34e5fc696c79f6db5 Author: Greg Kurz <gr...@kaod.org> Date: 2016-09-16 (Fri, 16 Sep 2016)
Changed paths: M hw/9pfs/9p-proxy.c Log Message: ----------- 9pfs: drop unused fmt strings in the proxy backend The v9fs_request() function doesn't use its fmt argument: it passes literal format strings to proxy_marshal() for all commands. This patch simply drops the unused fmt argument and updates all callers accordingly. Signed-off-by: Greg Kurz <gr...@kaod.org> Reviewed-by: Cédric Le Goater <c...@kaod.org> Commit: da4bc86c540991902e32e4e840c6ada573240254 https://github.com/qemu/qemu/commit/da4bc86c540991902e32e4e840c6ada573240254 Author: Greg Kurz <gr...@kaod.org> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M hw/9pfs/9p-proxy.c Log Message: ----------- 9pfs: drop duplicate line in proxy backend This double free did not cause harm because v9fs_string_free() sets str->data to NULL and g_free(NULL) is valid. Signed-off-by: Greg Kurz <gr...@kaod.org> Reviewed-by: Cédric Le Goater <c...@kaod.org> Commit: abdf008640b7ff59ac4c08c85f76ed861290c60e https://github.com/qemu/qemu/commit/abdf008640b7ff59ac4c08c85f76ed861290c60e Author: Greg Kurz <gr...@kaod.org> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M fsdev/9p-marshal.c M fsdev/9p-marshal.h M hw/9pfs/9p.c Log Message: ----------- 9pfs: drop useless v9fs_string_null() function The v9fs_string_null() function just calls v9fs_string_free(). Also it only has 4 users, whereas v9fs_string_free() has 87. This patch converts users to call directly v9fs_string_free() and drops the useless function. Signed-off-by: Greg Kurz <gr...@kaod.org> Reviewed-by: Cédric Le Goater <c...@kaod.org> Commit: e3e83f2e2130a3afbd41a2893d23397f03f6d9d0 https://github.com/qemu/qemu/commit/e3e83f2e2130a3afbd41a2893d23397f03f6d9d0 Author: Greg Kurz <gr...@kaod.org> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M hw/9pfs/9p-local.c M hw/9pfs/9p-proxy.c M hw/9pfs/9p.c M hw/9pfs/9p.h Log Message: ----------- 9pfs: introduce v9fs_path_sprintf() helper This helper is similar to v9fs_string_sprintf(), but it includes the terminating NUL character in the size field. This is to avoid doing v9fs_string_sprintf((V9fsString *) &path) and then bumping the size. Affected users are changed to use this new helper. Signed-off-by: Greg Kurz <gr...@kaod.org> Reviewed-by: Cédric Le Goater <c...@kaod.org> Commit: 993f8054d1152439e81dc382ff73b4b52bf71673 https://github.com/qemu/qemu/commit/993f8054d1152439e81dc382ff73b4b52bf71673 Author: Greg Kurz <gr...@kaod.org> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M tests/virtio-9p-test.c Log Message: ----------- tests: virtio-9p: introduce start/stop functions First step to be able to run several functional steps. Signed-off-by: Greg Kurz <gr...@kaod.org> Acked-by: Cornelia Huck <cornelia.h...@de.ibm.com> Commit: 557a4cc04a7cd092e8b5d6ef5a1e6799ed10b163 https://github.com/qemu/qemu/commit/557a4cc04a7cd092e8b5d6ef5a1e6799ed10b163 Author: Greg Kurz <gr...@kaod.org> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M tests/Makefile.include M tests/virtio-9p-test.c Log Message: ----------- tests: virtio-9p: add basic configuration test This adds PCI init code and a basic test that checks the device config matches what is passed on the command line. Signed-off-by: Greg Kurz <gr...@kaod.org> Acked-by: Cornelia Huck <cornelia.h...@de.ibm.com> Commit: 13fd08e631ec0c3ff5ad1bdcb6a4474c7d9a024f https://github.com/qemu/qemu/commit/13fd08e631ec0c3ff5ad1bdcb6a4474c7d9a024f Author: Greg Kurz <gr...@kaod.org> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M hw/9pfs/9p.c Log Message: ----------- 9pfs: fix potential segfault during walk If the call to fid_to_qid() returns an error, we will call v9fs_path_free() on uninitialized paths. It is a regression introduced by the following commit: 56f101ecce0e 9pfs: handle walk of ".." in the root directory Let's fix this by initializing dpath and path before calling fid_to_qid(). Signed-off-by: Greg Kurz <gr...@kaod.org> Reviewed-by: Cédric Le Goater <c...@kaod.org> [groug: updated the changelog to indicate this is regression and to provide the offending commit SHA1] Signed-off-by: Greg Kurz <gr...@kaod.org> Commit: 55b90fc7660399d6c7ff0bddc509e4f622a80d0a https://github.com/qemu/qemu/commit/55b90fc7660399d6c7ff0bddc509e4f622a80d0a Author: Peter Maydell <peter.mayd...@linaro.org> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M fsdev/9p-marshal.c M fsdev/9p-marshal.h M hw/9pfs/9p-local.c M hw/9pfs/9p-proxy.c M hw/9pfs/9p.c M hw/9pfs/9p.h M tests/Makefile.include M tests/virtio-9p-test.c Log Message: ----------- Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging This pull request contains: - a fix for a regression introduced in 2.7 - basic functional testing for virtio-9p - some code cleanups for 9pfs # gpg: Signature made Mon 19 Sep 2016 10:40:17 BST # gpg: using DSA key 0x02FC3AEB0101DBC2 # gpg: Good signature from "Greg Kurz <gr...@kaod.org>" # gpg: aka "Greg Kurz <gr...@free.fr>" # gpg: aka "Greg Kurz <gk...@fr.ibm.com>" # gpg: aka "Greg Kurz <gk...@linux.vnet.ibm.com>" # gpg: aka "Gregory Kurz (Groug) <gr...@free.fr>" # gpg: aka "Gregory Kurz (Cimai Technology) <gk...@cimai.com>" # gpg: aka "Gregory Kurz (Meiosys Technology) <gk...@meiosys.com>" # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 2BD4 3B44 535E C0A7 9894 DBA2 02FC 3AEB 0101 DBC2 * remotes/gkurz/tags/for-upstream: 9pfs: fix potential segfault during walk tests: virtio-9p: add basic configuration test tests: virtio-9p: introduce start/stop functions 9pfs: introduce v9fs_path_sprintf() helper 9pfs: drop useless v9fs_string_null() function 9pfs: drop duplicate line in proxy backend 9pfs: drop unused fmt strings in the proxy backend Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> Compare: https://github.com/qemu/qemu/compare/6e98670feb71...55b90fc76603