diff options
| author | Eric Blake <eblake@redhat.com> | 2019-01-17 13:36:46 -0600 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2019-01-21 15:49:52 -0600 |
| commit | 6dc1667d6881add34e9bad48ac2a848134ea8a6d (patch) | |
| tree | bed0899a62de2613ea2111aee3de842c9fce619f /nbd/trace-events | |
| parent | 091d0bf3c94737fc451a9b3f4eddf3a4d74c90b8 (diff) | |
nbd/client: Move export name into NBDExportInfo
Refactor the 'name' parameter of nbd_receive_negotiate() from
being a separate parameter into being part of the in-out 'info'.
This also spills over to a simplification of nbd_opt_go().
The main driver for this refactoring is that an upcoming patch
would like to add support to qemu-nbd to list information about
all exports available on a server, where the name(s) will be
provided by the server instead of the client. But another benefit
is that we can now allow the client to explicitly specify the
empty export name "" even when connecting to an oldstyle server
(even if qemu is no longer such a server after commit 7f7dfe2a).
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20190117193658.16413-10-eblake@redhat.com>
Diffstat (limited to 'nbd/trace-events')
| -rw-r--r-- | nbd/trace-events | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nbd/trace-events b/nbd/trace-events index d1e1ca64ee..c3966d2b65 100644 --- a/nbd/trace-events +++ b/nbd/trace-events @@ -17,7 +17,7 @@ nbd_opt_meta_reply(const char *context, uint32_t id) "Received mapping of contex nbd_receive_negotiate(void *tlscreds, const char *hostname) "Receiving negotiation tlscreds=%p hostname=%s" nbd_receive_negotiate_magic(uint64_t magic) "Magic is 0x%" PRIx64 nbd_receive_negotiate_server_flags(uint32_t globalflags) "Global flags are 0x%" PRIx32 -nbd_receive_negotiate_default_name(void) "Using default NBD export name \"\"" +nbd_receive_negotiate_name(const char *name) "Requesting NBD export name '%s'" nbd_receive_negotiate_size_flags(uint64_t size, uint16_t flags) "Size is %" PRIu64 ", export flags 0x%" PRIx16 nbd_init_set_socket(void) "Setting NBD socket" nbd_init_set_block_size(unsigned long block_size) "Setting block size to %lu" |