From 621c4f4eabff26493494909fc91aeac7e8205438 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Fri, 7 Jul 2017 15:30:44 -0500 Subject: nbd: Simplify trace of client flags in negotiation Simplify the tracing of client flags in the server, and return -EINVAL instead of -EIO if we successfully read but don't like those flags. Signed-off-by: Eric Blake Message-Id: <20170707203049.534-5-eblake@redhat.com> Signed-off-by: Paolo Bonzini --- nbd/trace-events | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'nbd/trace-events') diff --git a/nbd/trace-events b/nbd/trace-events index 5e2f961257..8db05008a0 100644 --- a/nbd/trace-events +++ b/nbd/trace-events @@ -35,9 +35,7 @@ nbd_negotiate_handle_export_name(void) "Checking length" nbd_negotiate_handle_export_name_request(const char *name) "Client requested export '%s'" nbd_negotiate_handle_starttls(void) "Setting up TLS" nbd_negotiate_handle_starttls_handshake(void) "Starting TLS handshake" -nbd_negotiate_options_flags(void) "Checking client flags" -nbd_negotiate_options_newstyle(void) "Client supports fixed newstyle handshake" -nbd_negotiate_options_no_zeroes(void) "Client supports no zeroes at handshake end" +nbd_negotiate_options_flags(uint32_t flags) "Received client flags 0x%" PRIx32 nbd_negotiate_options_check_magic(uint64_t magic) "Checking opts magic 0x%" PRIx64 nbd_negotiate_options_check_option(uint32_t option, const char *name) "Checking option 0x%" PRIx32 " (%s)" nbd_negotiate_begin(void) "Beginning negotiation" -- cgit v1.2.3-55-g7522