Commit 0a93b359 authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by Eric Blake
Browse files

block/nbd-client: drop stale logout 



Drop one on failure path (we have errp) and turn two others into trace
points.

Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20190611102720.86114-2-vsementsov@virtuozzo.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
parent 416e34bd

block/nbd-client.c

+3 −3
Original line number Diff line number Diff line
@@ -1136,7 +1136,7 @@ static int nbd_client_connect(BlockDriverState *bs, 
    }



    /* NBD handshake */

    logout("session init %s\n", export);

    trace_nbd_client_connect(export);

    qio_channel_set_blocking(QIO_CHANNEL(sioc), true, NULL);



    client->info.request_sizes = true;
@@ -1149,7 +1149,6 @@ static int nbd_client_connect(BlockDriverState *bs, 
    g_free(client->info.x_dirty_bitmap);

    g_free(client->info.name);

    if (ret < 0) {

        logout("Failed to negotiate with the NBD server\n");

        object_unref(OBJECT(sioc));

        return ret;

    }
@@ -1187,7 +1186,8 @@ static int nbd_client_connect(BlockDriverState *bs, 
    bdrv_inc_in_flight(bs);

    nbd_client_attach_aio_context(bs, bdrv_get_aio_context(bs));



    logout("Established connection with NBD server\n");

    trace_nbd_client_connect_success(export);



    return 0;



 fail:

block/nbd-client.h

+0 −9
Original line number Diff line number Diff line
@@ -5,15 +5,6 @@ 
#include "block/block_int.h"

#include "io/channel-socket.h"



/* #define DEBUG_NBD */



#if defined(DEBUG_NBD)

#define logout(fmt, ...) \

    fprintf(stderr, "nbd\t%-24s" fmt, __func__, ##__VA_ARGS__)

#else

#define logout(fmt, ...) ((void)0)

#endif



#define MAX_NBD_REQUESTS    16



typedef struct {

block/trace-events

+2 −0
Original line number Diff line number Diff line
@@ -165,6 +165,8 @@ nbd_parse_blockstatus_compliance(const char *err) "ignoring extra data from non- 
nbd_structured_read_compliance(const char *type) "server sent non-compliant unaligned read %s chunk"

nbd_read_reply_entry_fail(int ret, const char *err) "ret = %d, err: %s"

nbd_co_request_fail(uint64_t from, uint32_t len, uint64_t handle, uint16_t flags, uint16_t type, const char *name, int ret, const char *err) "Request failed { .from = %" PRIu64", .len = %" PRIu32 ", .handle = %" PRIu64 ", .flags = 0x%" PRIx16 ", .type = %" PRIu16 " (%s) } ret = %d, err: %s"

nbd_client_connect(const char *export_name) "export '%s'"

nbd_client_connect_success(const char *export_name) "export '%s'"



# ssh.c

ssh_restart_coroutine(void *co) "co=%p"