[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 09/16] nbd: make client request fixed new style i
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v6 09/16] nbd: make client request fixed new style if advertized |
Date: |
Wed, 10 Feb 2016 18:41:07 +0000 |
If the server advertizes support for the fixed new style
negotiation, the client should in turn enable new style.
This will allow the client to negotiate further NBD
options besides the export name.
Signed-off-by: Daniel P. Berrange <address@hidden>
---
nbd/client.c | 27 +++++++++++++++++----------
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/nbd/client.c b/nbd/client.c
index 5064788..88f2ada 100644
--- a/nbd/client.c
+++ b/nbd/client.c
@@ -76,7 +76,6 @@ int nbd_receive_negotiate(QIOChannel *ioc, const char *name,
uint32_t *flags,
{
char buf[256];
uint64_t magic, s;
- uint16_t tmp;
int rc;
TRACE("Receiving negotiation.");
@@ -117,19 +116,26 @@ int nbd_receive_negotiate(QIOChannel *ioc, const char
*name, uint32_t *flags,
TRACE("Magic is 0x%" PRIx64, magic);
if (magic == NBD_OPTS_MAGIC) {
- uint32_t reserved = 0;
+ uint32_t clientflags = 0;
uint32_t opt;
uint32_t namesize;
+ uint16_t globalflags;
+ uint16_t exportflags;
- if (read_sync(ioc, &tmp, sizeof(tmp)) != sizeof(tmp)) {
+ if (read_sync(ioc, &globalflags, sizeof(globalflags)) !=
+ sizeof(globalflags)) {
error_setg(errp, "Failed to read server flags");
goto fail;
}
- *flags = be16_to_cpu(tmp) << 16;
- /* reserved for future use */
- if (write_sync(ioc, &reserved, sizeof(reserved)) !=
- sizeof(reserved)) {
- error_setg(errp, "Failed to read reserved field");
+ *flags = be16_to_cpu(globalflags) << 16;
+ if (globalflags & NBD_FLAG_FIXED_NEWSTYLE) {
+ TRACE("Server supports fixed new style");
+ clientflags |= NBD_FLAG_C_FIXED_NEWSTYLE;
+ }
+ /* client requested flags */
+ if (write_sync(ioc, &clientflags, sizeof(clientflags)) !=
+ sizeof(clientflags)) {
+ error_setg(errp, "Failed to send clientflags field");
goto fail;
}
/* write the export name */
@@ -165,11 +171,12 @@ int nbd_receive_negotiate(QIOChannel *ioc, const char
*name, uint32_t *flags,
*size = be64_to_cpu(s);
TRACE("Size is %" PRIu64, *size);
- if (read_sync(ioc, &tmp, sizeof(tmp)) != sizeof(tmp)) {
+ if (read_sync(ioc, &exportflags, sizeof(exportflags)) !=
+ sizeof(exportflags)) {
error_setg(errp, "Failed to read export flags");
goto fail;
}
- *flags |= be16_to_cpu(tmp);
+ *flags |= be16_to_cpu(exportflags);
} else if (magic == NBD_CLIENT_MAGIC) {
if (name) {
error_setg(errp, "Server does not support export names");
--
2.5.0
- [Qemu-devel] [PATCH v6 00/16] Implement TLS support to QEMU NBD server & client, Daniel P. Berrange, 2016/02/10
- [Qemu-devel] [PATCH v6 02/16] qemu-nbd: add support for --object command line arg, Daniel P. Berrange, 2016/02/10
- [Qemu-devel] [PATCH v6 01/16] qom: add helpers for UserCreatable object types, Daniel P. Berrange, 2016/02/10
- [Qemu-devel] [PATCH v6 03/16] nbd: convert block client to use I/O channels for connection setup, Daniel P. Berrange, 2016/02/10
- [Qemu-devel] [PATCH v6 04/16] nbd: convert qemu-nbd server to use I/O channels for connection setup, Daniel P. Berrange, 2016/02/10
- [Qemu-devel] [PATCH v6 05/16] nbd: convert blockdev NBD server to use I/O channels for connection setup, Daniel P. Berrange, 2016/02/10
- [Qemu-devel] [PATCH v6 07/16] nbd: invert client logic for negotiating protocol version, Daniel P. Berrange, 2016/02/10
- [Qemu-devel] [PATCH v6 08/16] nbd: make server compliant with fixed newstyle spec, Daniel P. Berrange, 2016/02/10
- [Qemu-devel] [PATCH v6 09/16] nbd: make client request fixed new style if advertized,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v6 10/16] nbd: allow setting of an export name for qemu-nbd server, Daniel P. Berrange, 2016/02/10
- [Qemu-devel] [PATCH v6 12/16] nbd: use "" as a default export name if none provided, Daniel P. Berrange, 2016/02/10
- [Qemu-devel] [PATCH v6 11/16] nbd: always query export list in fixed new style protocol, Daniel P. Berrange, 2016/02/10
- [Qemu-devel] [PATCH v6 06/16] nbd: convert to using I/O channels for actual socket I/O, Daniel P. Berrange, 2016/02/10
- [Qemu-devel] [PATCH v6 14/16] nbd: enable use of TLS with NBD block driver, Daniel P. Berrange, 2016/02/10
- [Qemu-devel] [PATCH v6 15/16] nbd: enable use of TLS with qemu-nbd server, Daniel P. Berrange, 2016/02/10
- [Qemu-devel] [PATCH v6 13/16] nbd: implement TLS support in the protocol negotiation, Daniel P. Berrange, 2016/02/10
- [Qemu-devel] [PATCH v6 16/16] nbd: enable use of TLS with nbd-server-start command, Daniel P. Berrange, 2016/02/10
- Re: [Qemu-devel] [PATCH v6 00/16] Implement TLS support to QEMU NBD server & client, Kashyap Chamarthy, 2016/02/12