[Qemu-devel] [PULL 0/4] 9pfs/virtfs patches for 2.11 20170905

[Qemu-devel] [PULL 0/4] 9pfs/virtfs patches for 2.11 20170905

[Greg Kurz]

The following changes since commit 53e2c48d3f0db6a1598f49baf0b56dd4975e53a7:

  Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-signed' into staging (2017-09-04 18:53:46 +0100)

are available in the git repository at:

  https://github.com/gkurz/qemu.git tags/for-upstream

for you to fetch changes up to 449bdbfa5463fb5ef79ebb69219e0e58183a6d9c:

  virtfs: error out gracefully when mandatory suboptions are missing (2017-09-05 14:01:16 +0200)

----------------------------------------------------------------
Some trivial fixes/cleanup and a fix to cause QEMU to error out gracefully
instead of aborting.

----------------------------------------------------------------
Greg Kurz (2):
      9pfs: local: clarify fchmodat_nofollow() implementation
      virtfs: error out gracefully when mandatory suboptions are missing

Philippe Mathieu-Daudé (1):
      9pfs: avoid sign conversion error simplifying the code

ZhiPeng Lu (1):
      fsdev: fix memory leak in main()

 fsdev/virtfs-proxy-helper.c |  2 ++
 hw/9pfs/9p-local.c          | 12 ++++++++----
 hw/9pfs/9p.c                |  6 ++----
 vl.c                        | 16 ++++++++++------
 4 files changed, 22 insertions(+), 14 deletions(-)
-- 
2.13.5

[Qemu-devel] [PULL 1/4] 9pfs: avoid sign conversion error simplifying the code

[Greg Kurz]

From: Philippe Mathieu-Daudé <f4bug@amsat.org>

(note this is how other functions also handle the errors).

hw/9pfs/9p.c:948:18: warning: Loss of sign in implicit conversion
        offset = err;
                 ^~~

Reported-by: Clang Static Analyzer
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Greg Kurz <groug@kaod.org>
---
 hw/9pfs/9p.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index 333dbb6f8ee2..0a37c8bd1361 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -945,7 +945,6 @@ static void coroutine_fn v9fs_version(void *opaque)
     v9fs_string_init(&version);
     err = pdu_unmarshal(pdu, offset, "ds", &s->msize, &version);
     if (err < 0) {
-        offset = err;
         goto out;
     }
     trace_v9fs_version(pdu->tag, pdu->id, s->msize, version.data);
@@ -962,13 +961,12 @@ static void coroutine_fn v9fs_version(void *opaque)
 
     err = pdu_marshal(pdu, offset, "ds", s->msize, &version);
     if (err < 0) {
-        offset = err;
         goto out;
     }
-    offset += err;
+    err += offset;
     trace_v9fs_version_return(pdu->tag, pdu->id, s->msize, version.data);
 out:
-    pdu_complete(pdu, offset);
+    pdu_complete(pdu, err);
     v9fs_string_free(&version);
 }
 
-- 
2.13.5

Re: [Qemu-devel] [PULL 0/4] 9pfs/virtfs patches for 2.11 20170905

[Greg Kurz]

[-- Attachment #1: Type: text/plain, Size: 1719 bytes --]

Peter,

You can ignore this pull request, I hadn't realized that Zhipeng's patch has
an ill-formed Signed-off-by tag:

Signed-off-by: Zhipeng Lu lu.zhipeng@zte.com.cn

The missing <> around the email address breaks the dialog between git send-email
and the mail relay... I'll fix that and send a v2.

Cheers,

--
Greg

On Tue,  5 Sep 2017 17:38:29 +0200
Greg Kurz <groug@kaod.org> wrote:

> The following changes since commit 53e2c48d3f0db6a1598f49baf0b56dd4975e53a7:
> 
>   Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-signed' into staging (2017-09-04 18:53:46 +0100)
> 
> are available in the git repository at:
> 
>   https://github.com/gkurz/qemu.git tags/for-upstream
> 
> for you to fetch changes up to 449bdbfa5463fb5ef79ebb69219e0e58183a6d9c:
> 
>   virtfs: error out gracefully when mandatory suboptions are missing (2017-09-05 14:01:16 +0200)
> 
> ----------------------------------------------------------------
> Some trivial fixes/cleanup and a fix to cause QEMU to error out gracefully
> instead of aborting.
> 
> ----------------------------------------------------------------
> Greg Kurz (2):
>       9pfs: local: clarify fchmodat_nofollow() implementation
>       virtfs: error out gracefully when mandatory suboptions are missing
> 
> Philippe Mathieu-Daudé (1):
>       9pfs: avoid sign conversion error simplifying the code
> 
> ZhiPeng Lu (1):
>       fsdev: fix memory leak in main()
> 
>  fsdev/virtfs-proxy-helper.c |  2 ++
>  hw/9pfs/9p-local.c          | 12 ++++++++----
>  hw/9pfs/9p.c                |  6 ++----
>  vl.c                        | 16 ++++++++++------
>  4 files changed, 22 insertions(+), 14 deletions(-)


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 195 bytes --]