Skip to contentSkip to conversation

kvm tools, 9p: Test for tuncation result

PATCH In review Cyrill Gorcunov 3 participants 3 messages May 21, 2011 KVM

lore
Share & tools
lore

Cyrill Gorcunov

author
#0 lore raw

PATCH 1/1 kvm tools, 9p: Test for tuncation result

Without 'ret' usage I get

 | cyrill@sun kvm $ make
 |  CC       virtio/9p.o
 | virtio/9p.c: In function ‘virtio_p9_wstat’:
 | virtio/9p.c:448:6: error: variable ‘res’ set but not used [-Werror=unused-but-set-variable]
 | cc1: all warnings being treated as errors
 | make: *** [virtio/9p.o] Error 1

so add a basic check for ftruncate result, this eliminate warning and we might need to use 'res' status later in caller code.

Signed-off-by Cyrill Gorcunov <[email protected]>
CC Sasha Levin <[email protected]>

---

Pekka, are you fine with 'kvm-tools,9p' prefix?

 tools/kvm/virtio/9p.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
tools/kvm/virtio/9p.c +3 -2
Index: linux-2.6.git/tools/kvm/virtio/9p.c
===================================================================
@@ -445,7 +445,7 @@ static bool virtio_p9_wstat(struct p9_ms
 	struct p9_twstat *twstat = (struct p9_twstat *)msg->msg;
 	struct p9_str *str;
 	struct p9_fid *fid = &p9dev.fids[twstat->fid];
-	int res;
+	int res = 0;
 
 	if (twstat->stat.length != -1UL)
 		res = ftruncate(fid->fd, twstat->stat.length);

@@ -472,7 +472,8 @@ static bool virtio_p9_wstat(struct p9_ms
 
 	*outlen = VIRTIO_P9_HDR_LEN;
 	set_p9msg_hdr(outmsg, *outlen, P9_RWSTAT, msg->tag);
-	return true;
+
+	return res == 0;
 }
 
 static bool virtio_p9_remove(struct p9_msg *msg, u32 len, struct iovec *iov, u32 *outlen)
#1 lore raw
Quoted 9 lines · Cyrill Gorcunov

Without 'ret' usage I get

 | cyrill@sun kvm $ make
 |  CC       virtio/9p.o
 | virtio/9p.c: In function ‘virtio_p9_wstat’:
 | virtio/9p.c:448:6: error: variable ‘res’ set but not used [-Werror=unused-but-set-variable]
 | cc1: all warnings being treated as errors
 | make: *** [virtio/9p.o] Error 1
Quoted 5 lines

so add a basic check for ftruncate result, this eliminate warning and we might need to use 'res' status later in caller code.

Signed-off-by Cyrill Gorcunov <[email protected]>
CC Sasha Levin <[email protected]>

Sasha?

Quoted 3 lines

---

Pekka, are you fine with 'kvm-tools,9p' prefix?

Sure.

Acked-by
#2 lore raw
Quoted 10 lines · Pekka Enberg
Quoted 9 lines · Cyrill Gorcunov

Without 'ret' usage I get

 | cyrill@sun kvm $ make
 |  CC       virtio/9p.o
 | virtio/9p.c: In function ‘virtio_p9_wstat’:
 | virtio/9p.c:448:6: error: variable ‘res’ set but not used [-Werror=unused-but-set-variable]
 | cc1: all warnings being treated as errors
 | make: *** [virtio/9p.o] Error 1
Quoted 7 lines
Quoted 5 lines

so add a basic check for ftruncate result, this eliminate warning and we might need to use 'res' status later in caller code.

Signed-off-by Cyrill Gorcunov <[email protected]>
CC Sasha Levin <[email protected]>

Sasha?

Looks good to me.

Acked-by Sasha Levin <[email protected]>
Quoted 5 lines
Quoted 3 lines

---

Pekka, are you fine with 'kvm-tools,9p' prefix?

Sure.

Signature · 1 line
Sasha.