Commit 6c5c0351 authored by Eric Blake's avatar Eric Blake
Browse files

nbd/client: More consistent error messages 



Consolidate on using decimal (not hex), on outputting the
option reply name (not just value), and a consistent comma between
clauses, when the client reports protocol discrepancies from the
server.  While it won't affect normal operation, it makes
debugging additions easier.

Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarRichard W.M. Jones <rjones@redhat.com>
Reviewed-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20181215135324.152629-6-eblake@redhat.com>
parent ba2d3b3a

nbd/client.c

+12 −9
Original line number Diff line number Diff line
@@ -132,8 +132,9 @@ static int nbd_receive_option_reply(QIOChannel *ioc, uint32_t opt, 
        return -1;

    }

    if (reply->option != opt) {

        error_setg(errp, "Unexpected option type %x expected %x",

                   reply->option, opt);

        error_setg(errp, "Unexpected option type %u (%s), expected %u (%s)",

                   reply->option, nbd_opt_lookup(reply->option),

                   opt, nbd_opt_lookup(opt));

        nbd_send_opt_abort(ioc);

        return -1;

    }
@@ -267,8 +268,9 @@ static int nbd_receive_list(QIOChannel *ioc, const char *want, bool *match, 
        }

        return 0;

    } else if (reply.type != NBD_REP_SERVER) {

        error_setg(errp, "Unexpected reply type %" PRIx32 " expected %x",

                   reply.type, NBD_REP_SERVER);

        error_setg(errp, "Unexpected reply type %u (%s), expected %u (%s)",

                   reply.type, nbd_rep_lookup(reply.type),

                   NBD_REP_SERVER, nbd_rep_lookup(NBD_REP_SERVER));

        nbd_send_opt_abort(ioc);

        return -1;

    }
@@ -380,9 +382,9 @@ static int nbd_opt_go(QIOChannel *ioc, const char *wantname, 
            return 1;

        }

        if (reply.type != NBD_REP_INFO) {

            error_setg(errp, "unexpected reply type %" PRIu32

                       " (%s), expected %u",

                       reply.type, nbd_rep_lookup(reply.type), NBD_REP_INFO);

            error_setg(errp, "unexpected reply type %u (%s), expected %u (%s)",

                       reply.type, nbd_rep_lookup(reply.type),

                       NBD_REP_INFO, nbd_rep_lookup(NBD_REP_INFO));

            nbd_send_opt_abort(ioc);

            return -1;

        }
@@ -706,8 +708,9 @@ static int nbd_negotiate_simple_meta_context(QIOChannel *ioc, 
    }



    if (reply.type != NBD_REP_ACK) {

        error_setg(errp, "Unexpected reply type %" PRIx32 " expected %x",

                   reply.type, NBD_REP_ACK);

        error_setg(errp, "Unexpected reply type %u (%s), expected %u (%s)",

                   reply.type, nbd_rep_lookup(reply.type),

                   NBD_REP_ACK, nbd_rep_lookup(NBD_REP_ACK));

        nbd_send_opt_abort(ioc);

        return -1;

    }