From patchwork Fri Nov 29 14:58:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 295427 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6AE652C011C for ; Sat, 30 Nov 2013 02:02:00 +1100 (EST) Received: from localhost ([::1]:47731 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmPZt-0007Zv-Sm for incoming@patchwork.ozlabs.org; Fri, 29 Nov 2013 10:01:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56103) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmPXr-0005Vl-Ah for qemu-devel@nongnu.org; Fri, 29 Nov 2013 09:59:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VmPXi-0008LF-T5 for qemu-devel@nongnu.org; Fri, 29 Nov 2013 09:59:51 -0500 Received: from mail-ie0-x232.google.com ([2607:f8b0:4001:c03::232]:36901) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmPXi-0008L6-NM for qemu-devel@nongnu.org; Fri, 29 Nov 2013 09:59:42 -0500 Received: by mail-ie0-f178.google.com with SMTP id lx4so16106846iec.23 for ; Fri, 29 Nov 2013 06:59:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=K+VNRhranj1zb5dcXkwc++NEUsmXPmc3V7F0LX2CvnY=; b=hnjVW5TQCLZTa5VXIbSnbOs20sm1qzcyF5zwNsLLlnJf9Yfk7oGRB0qMpn2rOFiX+Z ppuhgvkKFtAnuq+OazevtJBQg4AsBQ22dRoB49r999SQp6q0gSi/8jDb0hNu5J7Mz/l+ 97IWzf7uaUzLW3lQ/DO/9MN4oL5v6kAAYoQqz7mqpweK9/worMJgz2x7HWzz6HqDtWrA xVKEQ315TjlaEm+nYzUBfyRJWDSRrDPHXTJLiPQqGYvVzFxetB1Vr914VE5BEqtQeahJ /IMz8Bhi/x/bbqUb0WM3r7wbyUXUqNtKGo/T0A8LbZV1oiBSidw5R5p3NJ8pPVv1W4NH eCGQ== X-Received: by 10.43.170.130 with SMTP id nq2mr1274657icc.69.1385737182157; Fri, 29 Nov 2013 06:59:42 -0800 (PST) Received: from localhost (13.pool62-37-66.dynamic.orange.es. [62.37.66.13]) by mx.google.com with ESMTPSA id ri5sm50653200igc.1.2013.11.29.06.59.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Nov 2013 06:59:41 -0800 (PST) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Fri, 29 Nov 2013 15:58:41 +0100 Message-Id: <1385737124-13964-11-git-send-email-marcandre.lureau@gmail.com> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1385737124-13964-1-git-send-email-marcandre.lureau@gmail.com> References: <1385737124-13964-1-git-send-email-marcandre.lureau@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4001:c03::232 Cc: pbonzini@redhat.com, kraxel@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [Qemu-devel] [PATCH 10/13] nbd: pass export name as init argument X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Marc-André Lureau 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 Reviewed-by: Paolo Bonzini --- 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,