haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

nbd: More debug typo fixes, use correct formats

Browse source 
Clean up some debug message oddities missed earlier; this includes
some typos, and recognizing that %d is not necessarily compatible
with uint32_t. Also add a couple messages that I found useful
while debugging things.

Signed-off-by: Eric Blake <eblake@redhat.com>

Message-Id: <1463006384-7734-3-git-send-email-eblake@redhat.com>
[Do not use PRIx16, clang complains. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Eric Blake 2016-05-11 16:39:35 -06:00 committed by Paolo Bonzini
parent a0c303693e
commit 2cb347493c
2 changed files with 49 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
nbd/client.c
View file

@ -109,25 +109,27 @@ static int nbd_handle_reply_err(QIOChannel *ioc, uint32_t opt, uint32_t type,
switch (type) { switch (type) {
case NBD_REP_ERR_UNSUP: case NBD_REP_ERR_UNSUP:
TRACE("server doesn't understand request %d, attempting fallback", TRACE("server doesn't understand request %" PRIx32
opt); ", attempting fallback", opt);
result = 0; result = 0;
goto cleanup; goto cleanup;
case NBD_REP_ERR_POLICY: case NBD_REP_ERR_POLICY:
error_setg(errp, "Denied by server for option %x", opt); error_setg(errp, "Denied by server for option %" PRIx32, opt);
break; break;
case NBD_REP_ERR_INVALID: case NBD_REP_ERR_INVALID:
error_setg(errp, "Invalid data length for option %x", opt); error_setg(errp, "Invalid data length for option %" PRIx32, opt);
break; break;
case NBD_REP_ERR_TLS_REQD: case NBD_REP_ERR_TLS_REQD:
error_setg(errp, "TLS negotiation required before option %x", opt); error_setg(errp, "TLS negotiation required before option %" PRIx32,
opt);
break; break;
default: default:
error_setg(errp, "Unknown error code when asking for option %x", opt); error_setg(errp, "Unknown error code when asking for option %" PRIx32,
opt);
break; break;
} }
@ -165,7 +167,7 @@ static int nbd_receive_list(QIOChannel *ioc, char **name, Error **errp)
} }
opt = be32_to_cpu(opt); opt = be32_to_cpu(opt);
if (opt != NBD_OPT_LIST) { if (opt != NBD_OPT_LIST) {
error_setg(errp, "Unexpected option type %x expected %x", error_setg(errp, "Unexpected option type %" PRIx32 " expected %x",
opt, NBD_OPT_LIST); opt, NBD_OPT_LIST);
return -1; return -1;
} }
@ -207,7 +209,7 @@ static int nbd_receive_list(QIOChannel *ioc, char **name, Error **errp)
return -1; return -1;
} }
if (namelen > 255) { if (namelen > 255) {
error_setg(errp, "export name length too long %d", namelen); error_setg(errp, "export name length too long %" PRIu32, namelen);
return -1; return -1;
} }
@ -234,7 +236,7 @@ static int nbd_receive_list(QIOChannel *ioc, char **name, Error **errp)
g_free(buf); g_free(buf);
} }
} else { } else {
error_setg(errp, "Unexpected reply type %x expected %x", error_setg(errp, "Unexpected reply type %" PRIx32 " expected %x",
type, NBD_REP_SERVER); type, NBD_REP_SERVER);
return -1; return -1;
} }
@ -349,7 +351,7 @@ static QIOChannel *nbd_receive_starttls(QIOChannel *ioc,
} }
opt = be32_to_cpu(opt); opt = be32_to_cpu(opt);
if (opt != NBD_OPT_STARTTLS) { if (opt != NBD_OPT_STARTTLS) {
error_setg(errp, "Unexpected option type %x expected %x", error_setg(errp, "Unexpected option type %" PRIx32 " expected %x",
opt, NBD_OPT_STARTTLS); opt, NBD_OPT_STARTTLS);
return NULL; return NULL;
} }
@ -361,7 +363,7 @@ static QIOChannel *nbd_receive_starttls(QIOChannel *ioc,
} }
type = be32_to_cpu(type); type = be32_to_cpu(type);
if (type != NBD_REP_ACK) { if (type != NBD_REP_ACK) {
error_setg(errp, "Server rejected request to start TLS %x", error_setg(errp, "Server rejected request to start TLS %" PRIx32,
type); type);
return NULL; return NULL;
} }
@ -373,7 +375,7 @@ static QIOChannel *nbd_receive_starttls(QIOChannel *ioc,
} }
length = be32_to_cpu(length); length = be32_to_cpu(length);
if (length != 0) { if (length != 0) {
error_setg(errp, "Start TLS response was not zero %x", error_setg(errp, "Start TLS response was not zero %" PRIu32,
length); length);
return NULL; return NULL;
} }
@ -384,7 +386,7 @@ static QIOChannel *nbd_receive_starttls(QIOChannel *ioc,
return NULL; return NULL;
} }
data.loop = g_main_loop_new(g_main_context_default(), FALSE); data.loop = g_main_loop_new(g_main_context_default(), FALSE);
TRACE("Starting TLS hanshake"); TRACE("Starting TLS handshake");
qio_channel_tls_handshake(tioc, qio_channel_tls_handshake(tioc,
nbd_tls_handshake, nbd_tls_handshake,
&data, &data,
@ -474,7 +476,7 @@ int nbd_receive_negotiate(QIOChannel *ioc, const char *name, uint32_t *flags,
} }
globalflags = be16_to_cpu(globalflags); globalflags = be16_to_cpu(globalflags);
*flags = globalflags << 16; *flags = globalflags << 16;
TRACE("Global flags are %x", globalflags); TRACE("Global flags are %" PRIx32, globalflags);
if (globalflags & NBD_FLAG_FIXED_NEWSTYLE) { if (globalflags & NBD_FLAG_FIXED_NEWSTYLE) {
fixedNewStyle = true; fixedNewStyle = true;
TRACE("Server supports fixed new style"); TRACE("Server supports fixed new style");
@ -550,7 +552,7 @@ int nbd_receive_negotiate(QIOChannel *ioc, const char *name, uint32_t *flags,
} }
exportflags = be16_to_cpu(exportflags); exportflags = be16_to_cpu(exportflags);
*flags |= exportflags; *flags |= exportflags;
TRACE("Export flags are %x", exportflags); TRACE("Export flags are %" PRIx16, exportflags);
} else if (magic == NBD_CLIENT_MAGIC) { } else if (magic == NBD_CLIENT_MAGIC) {
if (name) { if (name) {
error_setg(errp, "Server does not support export names"); error_setg(errp, "Server does not support export names");
@ -683,7 +685,8 @@ ssize_t nbd_send_request(QIOChannel *ioc, struct nbd_request *request)
ssize_t ret; ssize_t ret;
TRACE("Sending request to server: " TRACE("Sending request to server: "
"{ .from = %" PRIu64", .len = %u, .handle = %" PRIu64", .type=%i}", "{ .from = %" PRIu64", .len = %" PRIu32 ", .handle = %" PRIu64
", .type=%" PRIu16 " }",
request->from, request->len, request->handle, request->type); request->from, request->len, request->handle, request->type);
stl_be_p(buf, NBD_REQUEST_MAGIC); stl_be_p(buf, NBD_REQUEST_MAGIC);
@ -732,12 +735,12 @@ ssize_t nbd_receive_reply(QIOChannel *ioc, struct nbd_reply *reply)
reply->error = nbd_errno_to_system_errno(reply->error); reply->error = nbd_errno_to_system_errno(reply->error);
TRACE("Got reply: " TRACE("Got reply: { magic = 0x%" PRIx32 ", .error = % " PRId32
"{ magic = 0x%x, .error = %d, handle = %" PRIu64" }", ", handle = %" PRIu64" }",
magic, reply->error, reply->handle); magic, reply->error, reply->handle);
if (magic != NBD_REPLY_MAGIC) { if (magic != NBD_REPLY_MAGIC) {
LOG("invalid magic (got 0x%x)", magic); LOG("invalid magic (got 0x%" PRIx32 ")", magic);
return -EINVAL; return -EINVAL;
} }
return 0; return 0;

48
nbd/server.c
View file

@ -196,7 +196,7 @@ static int nbd_negotiate_send_rep(QIOChannel *ioc, uint32_t type, uint32_t opt)
uint64_t magic; uint64_t magic;
uint32_t len; uint32_t len;
TRACE("Reply opt=%x type=%x", type, opt); TRACE("Reply opt=%" PRIx32 " type=%" PRIx32, type, opt);
magic = cpu_to_be64(NBD_REP_MAGIC); magic = cpu_to_be64(NBD_REP_MAGIC);
if (nbd_negotiate_write(ioc, &magic, sizeof(magic)) != sizeof(magic)) { if (nbd_negotiate_write(ioc, &magic, sizeof(magic)) != sizeof(magic)) {
@ -226,7 +226,7 @@ static int nbd_negotiate_send_rep_list(QIOChannel *ioc, NBDExport *exp)
uint64_t magic, name_len; uint64_t magic, name_len;
uint32_t opt, type, len; uint32_t opt, type, len;
TRACE("Advertizing export name '%s'", exp->name ? exp->name : ""); TRACE("Advertising export name '%s'", exp->name ? exp->name : "");
name_len = strlen(exp->name); name_len = strlen(exp->name);
magic = cpu_to_be64(NBD_REP_MAGIC); magic = cpu_to_be64(NBD_REP_MAGIC);
if (nbd_negotiate_write(ioc, &magic, sizeof(magic)) != sizeof(magic)) { if (nbd_negotiate_write(ioc, &magic, sizeof(magic)) != sizeof(magic)) {
@ -392,12 +392,12 @@ static int nbd_negotiate_options(NBDClient *client)
TRACE("Checking client flags"); TRACE("Checking client flags");
be32_to_cpus(&flags); be32_to_cpus(&flags);
if (flags & NBD_FLAG_C_FIXED_NEWSTYLE) { if (flags & NBD_FLAG_C_FIXED_NEWSTYLE) {
TRACE("Support supports fixed newstyle handshake"); TRACE("Client supports fixed newstyle handshake");
fixedNewstyle = true; fixedNewstyle = true;
flags &= ~NBD_FLAG_C_FIXED_NEWSTYLE; flags &= ~NBD_FLAG_C_FIXED_NEWSTYLE;
} }
if (flags != 0) { if (flags != 0) {
TRACE("Unknown client flags 0x%x received", flags); TRACE("Unknown client flags 0x%" PRIx32 " received", flags);
return -EIO; return -EIO;
} }
@ -431,12 +431,12 @@ static int nbd_negotiate_options(NBDClient *client)
} }
length = be32_to_cpu(length); length = be32_to_cpu(length);
TRACE("Checking option 0x%x", clientflags); TRACE("Checking option 0x%" PRIx32, clientflags);
if (client->tlscreds && if (client->tlscreds &&
client->ioc == (QIOChannel *)client->sioc) { client->ioc == (QIOChannel *)client->sioc) {
QIOChannel *tioc; QIOChannel *tioc;
if (!fixedNewstyle) { if (!fixedNewstyle) {
TRACE("Unsupported option 0x%x", clientflags); TRACE("Unsupported option 0x%" PRIx32, clientflags);
return -EINVAL; return -EINVAL;
} }
switch (clientflags) { switch (clientflags) {
@ -455,7 +455,8 @@ static int nbd_negotiate_options(NBDClient *client)
return -EINVAL; return -EINVAL;
default: default:
TRACE("Option 0x%x not permitted before TLS", clientflags); TRACE("Option 0x%" PRIx32 " not permitted before TLS",
clientflags);
if (nbd_negotiate_drop_sync(client->ioc, length) != length) { if (nbd_negotiate_drop_sync(client->ioc, length) != length) {
return -EIO; return -EIO;
} }
@ -493,7 +494,7 @@ static int nbd_negotiate_options(NBDClient *client)
} }
break; break;
default: default:
TRACE("Unsupported option 0x%x", clientflags); TRACE("Unsupported option 0x%" PRIx32, clientflags);
if (nbd_negotiate_drop_sync(client->ioc, length) != length) { if (nbd_negotiate_drop_sync(client->ioc, length) != length) {
return -EIO; return -EIO;
} }
@ -511,7 +512,7 @@ static int nbd_negotiate_options(NBDClient *client)
return nbd_negotiate_handle_export_name(client, length); return nbd_negotiate_handle_export_name(client, length);
default: default:
TRACE("Unsupported option 0x%x", clientflags); TRACE("Unsupported option 0x%" PRIx32, clientflags);
return -EINVAL; return -EINVAL;
} }
} }
@ -560,6 +561,8 @@ static coroutine_fn int nbd_negotiate(NBDClientNewData *data)
oldStyle = client->exp != NULL && !client->tlscreds; oldStyle = client->exp != NULL && !client->tlscreds;
if (oldStyle) { if (oldStyle) {
assert ((client->exp->nbdflags & ~65535) == 0); assert ((client->exp->nbdflags & ~65535) == 0);
TRACE("advertising size %" PRIu64 " and flags %x",
client->exp->size, client->exp->nbdflags | myflags);
stq_be_p(buf + 8, NBD_CLIENT_MAGIC); stq_be_p(buf + 8, NBD_CLIENT_MAGIC);
stq_be_p(buf + 16, client->exp->size); stq_be_p(buf + 16, client->exp->size);
stw_be_p(buf + 26, client->exp->nbdflags | myflags); stw_be_p(buf + 26, client->exp->nbdflags | myflags);
@ -589,6 +592,8 @@ static coroutine_fn int nbd_negotiate(NBDClientNewData *data)
} }
assert ((client->exp->nbdflags & ~65535) == 0); assert ((client->exp->nbdflags & ~65535) == 0);
TRACE("advertising size %" PRIu64 " and flags %x",
client->exp->size, client->exp->nbdflags | myflags);
stq_be_p(buf + 18, client->exp->size); stq_be_p(buf + 18, client->exp->size);
stw_be_p(buf + 26, client->exp->nbdflags | myflags); stw_be_p(buf + 26, client->exp->nbdflags | myflags);
if (nbd_negotiate_write(client->ioc, buf + 18, sizeof(buf) - 18) != if (nbd_negotiate_write(client->ioc, buf + 18, sizeof(buf) - 18) !=
@ -652,12 +657,12 @@ static ssize_t nbd_receive_request(QIOChannel *ioc, struct nbd_request *request)
request->from = ldq_be_p(buf + 16); request->from = ldq_be_p(buf + 16);
request->len = ldl_be_p(buf + 24); request->len = ldl_be_p(buf + 24);
TRACE("Got request: " TRACE("Got request: { magic = 0x%" PRIx32 ", .type = %" PRIx32
"{ magic = 0x%x, .type = %d, from = %" PRIu64" , len = %u }", ", from = %" PRIu64 " , len = %" PRIu32 " }",
magic, request->type, request->from, request->len); magic, request->type, request->from, request->len);
if (magic != NBD_REQUEST_MAGIC) { if (magic != NBD_REQUEST_MAGIC) {
LOG("invalid magic (got 0x%x)", magic); LOG("invalid magic (got 0x%" PRIx32 ")", magic);
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
@ -670,7 +675,8 @@ static ssize_t nbd_send_reply(QIOChannel *ioc, struct nbd_reply *reply)
reply->error = system_errno_to_nbd_errno(reply->error); reply->error = system_errno_to_nbd_errno(reply->error);
TRACE("Sending response to client: { .error = %d, handle = %" PRIu64 " }", TRACE("Sending response to client: { .error = %" PRId32
", handle = %" PRIu64 " }",
reply->error, reply->handle); reply->error, reply->handle);
/* Reply /* Reply
@ -999,7 +1005,7 @@ static ssize_t nbd_co_receive_request(NBDRequest *req, struct nbd_request *reque
command = request->type & NBD_CMD_MASK_COMMAND; command = request->type & NBD_CMD_MASK_COMMAND;
if (command == NBD_CMD_READ || command == NBD_CMD_WRITE) { if (command == NBD_CMD_READ || command == NBD_CMD_WRITE) {
if (request->len > NBD_MAX_BUFFER_SIZE) { if (request->len > NBD_MAX_BUFFER_SIZE) {
LOG("len (%u) is larger than max len (%u)", LOG("len (%" PRIu32" ) is larger than max len (%u)",
request->len, NBD_MAX_BUFFER_SIZE); request->len, NBD_MAX_BUFFER_SIZE);
rc = -EINVAL; rc = -EINVAL;
goto out; goto out;
@ -1012,7 +1018,7 @@ static ssize_t nbd_co_receive_request(NBDRequest *req, struct nbd_request *reque
} }
} }
if (command == NBD_CMD_WRITE) { if (command == NBD_CMD_WRITE) {
TRACE("Reading %u byte(s)", request->len); TRACE("Reading %" PRIu32 " byte(s)", request->len);
if (read_sync(client->ioc, req->data, request->len) != request->len) { if (read_sync(client->ioc, req->data, request->len) != request->len) {
LOG("reading from socket failed"); LOG("reading from socket failed");
@ -1063,10 +1069,10 @@ static void nbd_trip(void *opaque)
} }
command = request.type & NBD_CMD_MASK_COMMAND; command = request.type & NBD_CMD_MASK_COMMAND;
if (command != NBD_CMD_DISC && (request.from + request.len) > exp->size) { if (command != NBD_CMD_DISC && (request.from + request.len) > exp->size) {
LOG("From: %" PRIu64 ", Len: %u, Size: %" PRIu64 LOG("From: %" PRIu64 ", Len: %" PRIu32", Size: %" PRIu64
", Offset: %" PRIu64 "\n", ", Offset: %" PRIu64 "\n",
request.from, request.len, request.from, request.len,
(uint64_t)exp->size, (uint64_t)exp->dev_offset); (uint64_t)exp->size, (uint64_t)exp->dev_offset);
LOG("requested operation past EOF--bad client?"); LOG("requested operation past EOF--bad client?");
goto invalid_request; goto invalid_request;
} }
@ -1100,7 +1106,7 @@ static void nbd_trip(void *opaque)
goto error_reply; goto error_reply;
} }
TRACE("Read %u byte(s)", request.len); TRACE("Read %" PRIu32" byte(s)", request.len);
if (nbd_co_send_reply(req, &reply, request.len) < 0) if (nbd_co_send_reply(req, &reply, request.len) < 0)
goto out; goto out;
break; break;
@ -1169,7 +1175,7 @@ static void nbd_trip(void *opaque)
} }
break; break;
default: default:
LOG("invalid request type (%u) received", request.type); LOG("invalid request type (%" PRIu32 ") received", request.type);
invalid_request: invalid_request:
reply.error = EINVAL; reply.error = EINVAL;
error_reply: error_reply: