[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 12/16] nbd: use "" as a default export name if no
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v5 12/16] nbd: use "" as a default export name if none provided |
Date: |
Thu, 4 Feb 2016 13:50:18 +0000 |
If the user does not provide an export name and the server
is running the new style protocol, where export names are
mandatory, use "" as the default export name if the user
has not specified any. "" is defined in the NBD protocol
as the default name to use in such scenarios.
Signed-off-by: Daniel P. Berrange <address@hidden>
---
nbd/client.c | 4 ++--
nbd/server.c | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/nbd/client.c b/nbd/client.c
index e91821a..89e172e 100644
--- a/nbd/client.c
+++ b/nbd/client.c
@@ -314,8 +314,8 @@ int nbd_receive_negotiate(QIOChannel *ioc, const char
*name, uint32_t *flags,
goto fail;
}
if (!name) {
- error_setg(errp, "Server requires an export name");
- goto fail;
+ TRACE("Using default NBD export name \"\"");
+ name = "";
}
if (fixedNewStyle) {
/* Check our desired export is present in the
diff --git a/nbd/server.c b/nbd/server.c
index 8bc083e..270cf39 100644
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -219,6 +219,7 @@ static int nbd_negotiate_send_rep_list(QIOChannel *ioc,
NBDExport *exp)
uint64_t magic, name_len;
uint32_t opt, type, len;
+ TRACE("Advertizing export name '%s'", exp->name ? exp->name : "");
name_len = strlen(exp->name);
magic = cpu_to_be64(NBD_REP_MAGIC);
if (nbd_negotiate_write(ioc, &magic, sizeof(magic)) != sizeof(magic)) {
--
2.5.0
- [Qemu-devel] [PATCH v5 00/16] Implement TLS support to QEMU NBD server & client, Daniel P. Berrange, 2016/02/04
- [Qemu-devel] [PATCH v5 01/16] qom: add helpers for UserCreatable object types, Daniel P. Berrange, 2016/02/04
- [Qemu-devel] [PATCH v5 04/16] nbd: convert qemu-nbd server to use I/O channels for connection setup, Daniel P. Berrange, 2016/02/04
- [Qemu-devel] [PATCH v5 02/16] qemu-nbd: add support for --object command line arg, Daniel P. Berrange, 2016/02/04
- [Qemu-devel] [PATCH v5 03/16] nbd: convert block client to use I/O channels for connection setup, Daniel P. Berrange, 2016/02/04
- [Qemu-devel] [PATCH v5 07/16] nbd: invert client logic for negotiating protocol version, Daniel P. Berrange, 2016/02/04
- [Qemu-devel] [PATCH v5 05/16] nbd: convert blockdev NBD server to use I/O channels for connection setup, Daniel P. Berrange, 2016/02/04
- [Qemu-devel] [PATCH v5 08/16] nbd: make server compliant with fixed newstyle spec, Daniel P. Berrange, 2016/02/04
- [Qemu-devel] [PATCH v5 11/16] nbd: always query export list in fixed new style protocol, Daniel P. Berrange, 2016/02/04
- [Qemu-devel] [PATCH v5 12/16] nbd: use "" as a default export name if none provided,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v5 09/16] nbd: make client request fixed new style if advertized, Daniel P. Berrange, 2016/02/04
- [Qemu-devel] [PATCH v5 06/16] nbd: convert to using I/O channels for actual socket I/O, Daniel P. Berrange, 2016/02/04
- [Qemu-devel] [PATCH v5 13/16] nbd: implement TLS support in the protocol negotiation, Daniel P. Berrange, 2016/02/04
- [Qemu-devel] [PATCH v5 10/16] nbd: allow setting of an export name for qemu-nbd server, Daniel P. Berrange, 2016/02/04
- [Qemu-devel] [PATCH v5 14/16] nbd: enable use of TLS with NBD block driver, Daniel P. Berrange, 2016/02/04
- [Qemu-devel] [PATCH v5 15/16] nbd: enable use of TLS with qemu-nbd server, Daniel P. Berrange, 2016/02/04
- [Qemu-devel] [PATCH v5 16/16] nbd: enable use of TLS with nbd-server-start command, Daniel P. Berrange, 2016/02/04