aboutsummaryrefslogtreecommitdiff
path: root/nbd/trace-events
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2019-01-17 13:36:49 -0600
committerEric Blake <eblake@redhat.com>2019-01-21 15:49:52 -0600
commit0182c1aed9e6a9314023c7264c5c264da2f4a4ce (patch)
tree4dac04b8a559a32756a6618ebf4a78a0c382d82b /nbd/trace-events
parent757b3ab989dea1c3143dd0d499441415ac7fcbc0 (diff)
downloadqemu-0182c1aed9e6a9314023c7264c5c264da2f4a4ce.zip
qemu-0182c1aed9e6a9314023c7264c5c264da2f4a4ce.tar.gz
qemu-0182c1aed9e6a9314023c7264c5c264da2f4a4ce.tar.bz2
nbd/client: Split out nbd_receive_one_meta_context()
Extract portions of nbd_negotiate_simple_meta_context() to a new function nbd_receive_one_meta_context() that copies the pattern of nbd_receive_list() for performing the argument validation of one reply. The error message when the server replies with more than one context changes slightly, but that shouldn't happen in the common case. Signed-off-by: Eric Blake <eblake@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Message-Id: <20190117193658.16413-13-eblake@redhat.com>
Diffstat (limited to 'nbd/trace-events')
-rw-r--r--nbd/trace-events2
1 files changed, 1 insertions, 1 deletions
diff --git a/nbd/trace-events b/nbd/trace-events
index 59521e4..b4802c1 100644
--- a/nbd/trace-events
+++ b/nbd/trace-events
@@ -13,7 +13,7 @@ nbd_receive_query_exports_success(const char *wantname) "Found desired export na
nbd_receive_starttls_new_client(void) "Setting up TLS"
nbd_receive_starttls_tls_handshake(void) "Starting TLS handshake"
nbd_opt_meta_request(const char *optname, const char *context, const char *export) "Requesting %s %s for export %s"
-nbd_opt_meta_reply(const char *context, uint32_t id) "Received mapping of context %s to id %" PRIu32
+nbd_opt_meta_reply(const char *optname, const char *context, uint32_t id) "Received %s mapping of %s to id %" PRIu32
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