[v3,04/26] vhost-user: simplify vhost_user_init/vhost_user_cleanup

Commit Message

Tiwei Bie June 21, 2018, 1:27 p.m. UTC

On Thu, Jun 21, 2018 at 02:48:08PM +0200, Marc-André Lureau wrote:
> On Thu, Jun 21, 2018 at 2:33 PM, Tiwei Bie <[e-mail]> wrote:
> > On Mon, Jun 18, 2018 at 06:17:07PM +0200, Marc-André Lureau wrote:
> > [...]
> >> diff --git a/hw/virtio/vhost-stub.c b/hw/virtio/vhost-stub.c
> >> index 049089b5e2..323dfcc46a 100644
> >> --- a/hw/virtio/vhost-stub.c
> >> +++ b/hw/virtio/vhost-stub.c
> >> @@ -7,7 +7,7 @@ bool vhost_has_free_slot(void)
> >>      return true;
> >>  }
> >>
> >> -VhostUserState *vhost_user_init(void)
> >> +bool vhost_user_init(VhostUserState *user, CharBackend *chr, Error **errp)
> >>  {
> >>      return NULL;
> >
> > It would be better to return false.
> >
> 
> Good catch, fixed.
> 
> Except that, would you give a reviewed-by?

Sorry, I missed something previously. In below diff:


It might be better to change the error message
to something like:

"failed to allocate vhost-user state".

Except that, it looks good to me and you can add
my reviewed-by.

Best regards,
Tiwei Bie

> 
> > Best regards,
> > Tiwei Bie
> >
> >>  }
> > [...]
> >
> 
> 
> 
> -- 
> Marc-André Lureau

Comments

Marc-André Lureau June 26, 2018, 12:24 p.m. UTC | #1

Hi

On Thu, Jun 21, 2018 at 3:27 PM, Tiwei Bie <[e-mail]> wrote:
> On Thu, Jun 21, 2018 at 02:48:08PM +0200, Marc-André Lureau wrote:
>> On Thu, Jun 21, 2018 at 2:33 PM, Tiwei Bie <[e-mail]> wrote:
>> > On Mon, Jun 18, 2018 at 06:17:07PM +0200, Marc-André Lureau wrote:
>> > [...]
>> >> diff --git a/hw/virtio/vhost-stub.c b/hw/virtio/vhost-stub.c
>> >> index 049089b5e2..323dfcc46a 100644
>> >> --- a/hw/virtio/vhost-stub.c
>> >> +++ b/hw/virtio/vhost-stub.c
>> >> @@ -7,7 +7,7 @@ bool vhost_has_free_slot(void)
>> >>      return true;
>> >>  }
>> >>
>> >> -VhostUserState *vhost_user_init(void)
>> >> +bool vhost_user_init(VhostUserState *user, CharBackend *chr, Error **errp)
>> >>  {
>> >>      return NULL;
>> >
>> > It would be better to return false.
>> >
>>
>> Good catch, fixed.
>>
>> Except that, would you give a reviewed-by?
>
> Sorry, I missed something previously. In below diff:
>
> diff --git a/net/vhost-user.c b/net/vhost-user.c
> index a39f9c9974..5e5b8f3fc9 100644
> --- a/net/vhost-user.c
> +++ b/net/vhost-user.c
> @@ -291,14 +291,14 @@ static int net_vhost_user_init(NetClientState *peer, const char *device,
>  {
>      Error *err = NULL;
>      NetClientState *nc, *nc0 = NULL;
> -    VhostUserState *user = NULL;
>      NetVhostUserState *s = NULL;
> +    VhostUserState *user;
>      int i;
>
>      assert(name);
>      assert(queues > 0);
>
> -    user = vhost_user_init();
> +    user = g_new0(struct VhostUserState, 1);
>      if (!user) {
>          error_report("failed to init vhost_user");
>          goto err;
>
> It might be better to change the error message
> to something like:
>
> "failed to allocate vhost-user state".
>
> Except that, it looks good to me and you can add
> my reviewed-by.

Good point, g_new() aborts on failure, so we can simply remove the error report.

Thanks

>
> Best regards,
> Tiwei Bie
>
>>
>> > Best regards,
>> > Tiwei Bie
>> >
>> >>  }
>> > [...]
>> >
>>
>>
>>
>> --
>> Marc-André Lureau

Patch

diff --git a/net/vhost-user.c b/net/vhost-user.c
index a39f9c9974..5e5b8f3fc9 100644
--- a/net/vhost-user.c
+++ b/net/vhost-user.c
@@ -291,14 +291,14 @@  static int net_vhost_user_init(NetClientState *peer, const char *device,
 {
     Error *err = NULL;
     NetClientState *nc, *nc0 = NULL;
-    VhostUserState *user = NULL;
     NetVhostUserState *s = NULL;
+    VhostUserState *user;
     int i;
 
     assert(name);
     assert(queues > 0);
 
-    user = vhost_user_init();
+    user = g_new0(struct VhostUserState, 1);
     if (!user) {
         error_report("failed to init vhost_user");
         goto err;