[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/16] nbd: pass export name as init argument
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 10/16] nbd: pass export name as init argument |
Date: |
Mon, 16 Dec 2013 10:31:11 +0100 |
From: Marc-André Lureau <address@hidden>
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 <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
block/nbd-client.c | 9 ++++-----
block/nbd-client.h | 5 ++---
block/nbd.c | 13 ++++++++-----
3 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/block/nbd-client.c b/block/nbd-client.c
index 693110d..3dfae1d 100644
--- a/block/nbd-client.c
+++ b/block/nbd-client.c
@@ -338,18 +338,17 @@ 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 */
+ logout("session init %s\n", export);
qemu_set_block(sock);
- ret = nbd_receive_negotiate(sock, client->export_name,
+ 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,
--
1.8.3.1
- [Qemu-devel] [PULL 00/16] spice patch queue, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 02/16] vscclient: do not add a socket watch if there is not data to send, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 01/16] spice: flip streaming video mode to off by default, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 03/16] spice-char: remove unused field, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 10/16] nbd: pass export name as init argument,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 08/16] Split nbd block client code, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 09/16] nbd: don't change socket block during negotiate, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 04/16] qmp_change_blockdev() remove unused has_format, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 16/16] spice: stop server for qxl hard reset, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 11/16] nbd: make nbd_client_session_close() idempotent, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 07/16] spice-char: implement chardev port event, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 05/16] include: add missing config-host.h include, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 12/16] nbd: finish any pending coroutine, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 14/16] spice: move qemu_spice_display_*() from spice-graphics to spice-core, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 15/16] spice: move spice_server_vm_{start, stop} calls into qemu_spice_display_*(), Gerd Hoffmann, 2013/12/16