[10/13] nbd: pass export name as init argument

From: Marc-André Lureau <marcandre.lureau@redhat.com>

There is no need to keep the export name around, and it seems a better
fit as an argument in the init() call.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 block/nbd-client.c | 10 ++++------
 block/nbd-client.h |  5 ++---
 block/nbd.c        | 13 ++++++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)

Il 29/11/2013 15:58, Marc-André Lureau ha scritto:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> There is no need to keep the export name around, and it seems a better
> fit as an argument in the init() call.
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  block/nbd-client.c | 10 ++++------
>  block/nbd-client.h |  5 ++---
>  block/nbd.c        | 13 ++++++++-----
>  3 files changed, 14 insertions(+), 14 deletions(-)
> 
> diff --git a/block/nbd-client.c b/block/nbd-client.c
> index 1abfc6a..e29227b 100644
> --- a/block/nbd-client.c
> +++ b/block/nbd-client.c
> @@ -338,17 +338,15 @@ static void nbd_teardown_connection(NbdClientSession *client)
>  void nbd_client_session_close(NbdClientSession *client)
>  {
>      nbd_teardown_connection(client);
> -    g_free(client->export_name);
> -    client->export_name = NULL;
>  }
>  
> -int nbd_client_session_init(NbdClientSession *client,
> -    BlockDriverState *bs, int sock)
> +int nbd_client_session_init(NbdClientSession *client, BlockDriverState *bs,
> +    int sock, const char *export)
>  {
>      int ret;
>  
> -    /* NBD handshake */
> -    ret = nbd_receive_negotiate(sock, client->export_name,
> +    logout("session init %s\n", export);
> +    ret = nbd_receive_negotiate(sock, export,
>                                  &client->nbdflags, &client->size,
>                                  &client->blocksize);
>      if (ret < 0) {
> diff --git a/block/nbd-client.h b/block/nbd-client.h
> index c271236..f2a6337 100644
> --- a/block/nbd-client.h
> +++ b/block/nbd-client.h
> @@ -30,14 +30,13 @@ typedef struct NbdClientSession {
>      Coroutine *recv_coroutine[MAX_NBD_REQUESTS];
>      struct nbd_reply reply;
>  
> -    char *export_name; /* An NBD server may export several devices */
>      bool is_unix;
>  
>      BlockDriverState *bs;
>  } NbdClientSession;
>  
> -int nbd_client_session_init(NbdClientSession *client,
> -                            BlockDriverState *bs, int sock);
> +int nbd_client_session_init(NbdClientSession *client, BlockDriverState *bs,
> +                            int sock, const char *export_name);
>  void nbd_client_session_close(NbdClientSession *client);
>  
>  int nbd_client_session_co_discard(NbdClientSession *client, int64_t sector_num,
> diff --git a/block/nbd.c b/block/nbd.c
> index be75ba0..4455a13 100644
> --- a/block/nbd.c
> +++ b/block/nbd.c
> @@ -188,7 +188,7 @@ out:
>      g_free(file);
>  }
>  
> -static int nbd_config(BDRVNBDState *s, QDict *options)
> +static int nbd_config(BDRVNBDState *s, QDict *options, char **export)
>  {
>      Error *local_err = NULL;
>  
> @@ -218,8 +218,8 @@ static int nbd_config(BDRVNBDState *s, QDict *options)
>          qemu_opt_set_number(s->socket_opts, "port", NBD_DEFAULT_PORT);
>      }
>  
> -    s->client.export_name = g_strdup(qdict_get_try_str(options, "export"));
> -    if (s->client.export_name) {
> +    *export = g_strdup(qdict_get_try_str(options, "export"));
> +    if (*export) {
>          qdict_del(options, "export");
>      }
>  
> @@ -253,10 +253,11 @@ static int nbd_open(BlockDriverState *bs, QDict *options, int flags,
>                      Error **errp)
>  {
>      BDRVNBDState *s = bs->opaque;
> +    char *export = NULL;
>      int result, sock;
>  
>      /* Pop the config into our state object. Exit if invalid. */
> -    result = nbd_config(s, options);
> +    result = nbd_config(s, options, &export);
>      if (result != 0) {
>          return result;
>      }
> @@ -270,7 +271,9 @@ static int nbd_open(BlockDriverState *bs, QDict *options, int flags,
>      }
>  
>      /* NBD handshake */
> -    return nbd_client_session_init(&s->client, bs, sock);
> +    result = nbd_client_session_init(&s->client, bs, sock, export);
> +    g_free(export);
> +    return result;
>  }
>  
>  static int nbd_co_readv(BlockDriverState *bs, int64_t sector_num,
> 

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>