diff mbox series

[PULL,01/13] tests/9pfs: Factor out do_version() helper

Message ID ccc858509ddfa3f6244cc4caf92c4149b7269b43.1603452058.git.qemu_oss@crudebyte.com
State Superseded
Headers show
Series 9p queue 2020-10-23 | expand

Commit Message

Greg Kurz Oct. 20, 2020, 4:09 p.m. UTC
fs_version() is a top level test function. Factor out the reusable
code to a separate helper instead of hijacking it in other tests.

Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <160321015403.266767.4533967728943968456.stgit@bahia.lan>
Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
---
 tests/qtest/virtio-9p-test.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

Comments

Greg Kurz Oct. 23, 2020, 3:32 p.m. UTC | #1
It feels weird to receive a mail I didn't send with my address
in the top From: header. I would have expected yours instead and
another From: with my address in the changelog...


On Tue, 20 Oct 2020 18:09:14 +0200
Greg Kurz <groug@kaod.org> wrote:

... here.

> fs_version() is a top level test function. Factor out the reusable
> code to a separate helper instead of hijacking it in other tests.
> 

> Signed-off-by: Greg Kurz <groug@kaod.org>
> Message-Id: <160321015403.266767.4533967728943968456.stgit@bahia.lan>
> Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
> ---
>  tests/qtest/virtio-9p-test.c | 14 +++++++++-----
>  1 file changed, 9 insertions(+), 5 deletions(-)
> 
> diff --git a/tests/qtest/virtio-9p-test.c b/tests/qtest/virtio-9p-test.c
> index c15908f27b..59bcea4c30 100644
> --- a/tests/qtest/virtio-9p-test.c
> +++ b/tests/qtest/virtio-9p-test.c
> @@ -567,10 +567,8 @@ static void v9fs_rflush(P9Req *req)
>      v9fs_req_free(req);
>  }
>  
> -static void fs_version(void *obj, void *data, QGuestAllocator *t_alloc)
> +static void do_version(QVirtio9P *v9p)
>  {
> -    QVirtio9P *v9p = obj;
> -    alloc = t_alloc;
>      const char *version = "9P2000.L";
>      uint16_t server_len;
>      char *server_version;
> @@ -585,13 +583,19 @@ static void fs_version(void *obj, void *data, QGuestAllocator *t_alloc)
>      g_free(server_version);
>  }
>  
> +static void fs_version(void *obj, void *data, QGuestAllocator *t_alloc)
> +{
> +    alloc = t_alloc;
> +    do_version(obj);
> +}
> +
>  static void fs_attach(void *obj, void *data, QGuestAllocator *t_alloc)
>  {
>      QVirtio9P *v9p = obj;
>      alloc = t_alloc;
>      P9Req *req;
>  
> -    fs_version(v9p, NULL, t_alloc);
> +    do_version(v9p);
>      req = v9fs_tattach(v9p, 0, getuid(), 0);
>      v9fs_req_wait_for_reply(req, NULL);
>      v9fs_rattach(req, NULL);
> @@ -831,7 +835,7 @@ static void fs_walk_dotdot(void *obj, void *data, QGuestAllocator *t_alloc)
>      v9fs_qid root_qid, *wqid;
>      P9Req *req;
>  
> -    fs_version(v9p, NULL, t_alloc);
> +    do_version(v9p);
>      req = v9fs_tattach(v9p, 0, getuid(), 0);
>      v9fs_req_wait_for_reply(req, NULL);
>      v9fs_rattach(req, &root_qid);
Christian Schoenebeck Oct. 23, 2020, 3:40 p.m. UTC | #2
On Freitag, 23. Oktober 2020 17:32:02 CEST Greg Kurz wrote:
> It feels weird to receive a mail I didn't send with my address

> in the top From: header. I would have expected yours instead and

> another From: with my address in the changelog...

> 

> 

> On Tue, 20 Oct 2020 18:09:14 +0200

> Greg Kurz <groug@kaod.org> wrote:

> 

> ... here.


Yep, I noticed that too late. I'll take care about it next time. Sorry!

Best regards,
Christian Schoenebeck
diff mbox series

Patch

diff --git a/tests/qtest/virtio-9p-test.c b/tests/qtest/virtio-9p-test.c
index c15908f27b..59bcea4c30 100644
--- a/tests/qtest/virtio-9p-test.c
+++ b/tests/qtest/virtio-9p-test.c
@@ -567,10 +567,8 @@  static void v9fs_rflush(P9Req *req)
     v9fs_req_free(req);
 }
 
-static void fs_version(void *obj, void *data, QGuestAllocator *t_alloc)
+static void do_version(QVirtio9P *v9p)
 {
-    QVirtio9P *v9p = obj;
-    alloc = t_alloc;
     const char *version = "9P2000.L";
     uint16_t server_len;
     char *server_version;
@@ -585,13 +583,19 @@  static void fs_version(void *obj, void *data, QGuestAllocator *t_alloc)
     g_free(server_version);
 }
 
+static void fs_version(void *obj, void *data, QGuestAllocator *t_alloc)
+{
+    alloc = t_alloc;
+    do_version(obj);
+}
+
 static void fs_attach(void *obj, void *data, QGuestAllocator *t_alloc)
 {
     QVirtio9P *v9p = obj;
     alloc = t_alloc;
     P9Req *req;
 
-    fs_version(v9p, NULL, t_alloc);
+    do_version(v9p);
     req = v9fs_tattach(v9p, 0, getuid(), 0);
     v9fs_req_wait_for_reply(req, NULL);
     v9fs_rattach(req, NULL);
@@ -831,7 +835,7 @@  static void fs_walk_dotdot(void *obj, void *data, QGuestAllocator *t_alloc)
     v9fs_qid root_qid, *wqid;
     P9Req *req;
 
-    fs_version(v9p, NULL, t_alloc);
+    do_version(v9p);
     req = v9fs_tattach(v9p, 0, getuid(), 0);
     v9fs_req_wait_for_reply(req, NULL);
     v9fs_rattach(req, &root_qid);