From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35900) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmPyr-0001pn-Nm for qemu-devel@nongnu.org; Fri, 29 Nov 2013 10:27:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VmPyl-0001O7-Nj for qemu-devel@nongnu.org; Fri, 29 Nov 2013 10:27:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:62937) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmPyl-0001O3-GJ for qemu-devel@nongnu.org; Fri, 29 Nov 2013 10:27:39 -0500 Message-ID: <5298B266.5010700@redhat.com> Date: Fri, 29 Nov 2013 16:27:34 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1385737124-13964-1-git-send-email-marcandre.lureau@gmail.com> <1385737124-13964-11-git-send-email-marcandre.lureau@gmail.com> In-Reply-To: <1385737124-13964-11-git-send-email-marcandre.lureau@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 10/13] nbd: pass export name as init argument List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= Cc: =?UTF-8?B?TWFyYy1BbmRyw6kgTA==?= =?UTF-8?B?dXJlYXU=?= , qemu-devel@nongnu.org, kraxel@redhat.com Il 29/11/2013 15:58, Marc-Andr=C3=A9 Lureau ha scritto: > From: Marc-Andr=C3=A9 Lureau >=20 > There is no need to keep the export name around, and it seems a better > fit as an argument in the init() call. >=20 > Signed-off-by: Marc-Andr=C3=A9 Lureau > --- > block/nbd-client.c | 10 ++++------ > block/nbd-client.h | 5 ++--- > block/nbd.c | 13 ++++++++----- > 3 files changed, 14 insertions(+), 14 deletions(-) >=20 > 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(NbdClientSess= ion *client) > void nbd_client_session_close(NbdClientSession *client) > { > nbd_teardown_connection(client); > - g_free(client->export_name); > - client->export_name =3D NULL; > } > =20 > -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; > =20 > - /* NBD handshake */ > - ret =3D nbd_receive_negotiate(sock, client->export_name, > + logout("session init %s\n", export); > + ret =3D 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; > =20 > - char *export_name; /* An NBD server may export several devices */ > bool is_unix; > =20 > BlockDriverState *bs; > } NbdClientSession; > =20 > -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); > =20 > int nbd_client_session_co_discard(NbdClientSession *client, int64_t se= ctor_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); > } > =20 > -static int nbd_config(BDRVNBDState *s, QDict *options) > +static int nbd_config(BDRVNBDState *s, QDict *options, char **export) > { > Error *local_err =3D NULL; > =20 > @@ -218,8 +218,8 @@ static int nbd_config(BDRVNBDState *s, QDict *optio= ns) > qemu_opt_set_number(s->socket_opts, "port", NBD_DEFAULT_PORT); > } > =20 > - s->client.export_name =3D g_strdup(qdict_get_try_str(options, "exp= ort")); > - if (s->client.export_name) { > + *export =3D g_strdup(qdict_get_try_str(options, "export")); > + if (*export) { > qdict_del(options, "export"); > } > =20 > @@ -253,10 +253,11 @@ static int nbd_open(BlockDriverState *bs, QDict *= options, int flags, > Error **errp) > { > BDRVNBDState *s =3D bs->opaque; > + char *export =3D NULL; > int result, sock; > =20 > /* Pop the config into our state object. Exit if invalid. */ > - result =3D nbd_config(s, options); > + result =3D nbd_config(s, options, &export); > if (result !=3D 0) { > return result; > } > @@ -270,7 +271,9 @@ static int nbd_open(BlockDriverState *bs, QDict *op= tions, int flags, > } > =20 > /* NBD handshake */ > - return nbd_client_session_init(&s->client, bs, sock); > + result =3D nbd_client_session_init(&s->client, bs, sock, export); > + g_free(export); > + return result; > } > =20 > static int nbd_co_readv(BlockDriverState *bs, int64_t sector_num, >=20 Reviewed-by: Paolo Bonzini