[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/7] nbd/server: fix trace
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PULL 2/7] nbd/server: fix trace |
Date: |
Wed, 20 Jun 2018 22:19:52 -0500 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
Return code = 1 doesn't mean that we parsed base:allocation. Use
correct traces in both -parsed and -skipped cases.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
[eblake: comment tweaks]
Signed-off-by: Eric Blake <address@hidden>
---
nbd/server.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/nbd/server.c b/nbd/server.c
index 9e1f2271784..e71301b8cd7 100644
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -736,12 +736,16 @@ static int nbd_negotiate_send_meta_context(NBDClient
*client,
/* nbd_meta_base_query
*
- * Handle query to 'base' namespace. For now, only base:allocation context is
- * available in it. 'len' is the amount of text remaining to be read from
+ * Handle queries to 'base' namespace. For now, only the base:allocation
+ * context is available. 'len' is the amount of text remaining to be read from
* the current name, after the 'base:' portion has been stripped.
*
* Return -errno on I/O error, 0 if option was completely handled by
- * sending a reply about inconsistent lengths, or 1 on success. */
+ * sending a reply about inconsistent lengths, or 1 on success.
+ *
+ * Note: return code = 1 doesn't mean that we've parsed the "base:allocation"
+ * namespace. It only means that there are no errors.
+ */
static int nbd_meta_base_query(NBDClient *client, NBDExportMetaContexts *meta,
uint32_t len, Error **errp)
{
@@ -768,10 +772,12 @@ static int nbd_meta_base_query(NBDClient *client,
NBDExportMetaContexts *meta,
}
if (strncmp(query, "allocation", alen) == 0) {
+ trace_nbd_negotiate_meta_query_parse("base:allocation");
meta->base_allocation = true;
+ } else {
+ trace_nbd_negotiate_meta_query_skip("not base:allocation");
}
- trace_nbd_negotiate_meta_query_parse("base:allocation");
return 1;
}
--
2.14.4
- [Qemu-devel] [PULL 0/7] bitmap export over NBD, Eric Blake, 2018/06/20
- [Qemu-devel] [PULL 1/7] tests: Simplify .gitignore, Eric Blake, 2018/06/20
- [Qemu-devel] [PULL 3/7] nbd/server: refactor NBDExportMetaContexts, Eric Blake, 2018/06/20
- [Qemu-devel] [PULL 2/7] nbd/server: fix trace,
Eric Blake <=
- [Qemu-devel] [PULL 4/7] nbd/server: add nbd_meta_empty_or_pattern helper, Eric Blake, 2018/06/20
- [Qemu-devel] [PULL 6/7] qapi: new qmp command nbd-server-add-bitmap, Eric Blake, 2018/06/20
- [Qemu-devel] [PULL 7/7] docs/interop: add nbd.txt, Eric Blake, 2018/06/20
- [Qemu-devel] [PULL 5/7] nbd/server: implement dirty bitmap export, Eric Blake, 2018/06/20
- Re: [Qemu-devel] [PULL 0/7] bitmap export over NBD, no-reply, 2018/06/21
- Re: [Qemu-devel] [PULL 0/7] bitmap export over NBD, no-reply, 2018/06/21
- Re: [Qemu-devel] [PULL 0/7] bitmap export over NBD, Peter Maydell, 2018/06/21