[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 1/6] nbd/server: fix trace
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-devel] [PATCH v5 1/6] nbd/server: fix trace |
Date: |
Sat, 9 Jun 2018 18:17:53 +0300 |
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>
---
nbd/server.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/nbd/server.c b/nbd/server.c
index 9e1f227178..8e02e077ec 100644
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -741,7 +741,10 @@ static int nbd_negotiate_send_meta_context(NBDClient
*client,
* 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 "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 +771,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.11.1
- [Qemu-devel] [PATCH v5 3/6] nbd/server: add nbd_meta_empty_or_pattern helper, (continued)
[Qemu-devel] [PATCH v5 2/6] nbd/server: refactor NBDExportMetaContexts, Vladimir Sementsov-Ogievskiy, 2018/06/09
[Qemu-devel] [PATCH v5 1/6] nbd/server: fix trace,
Vladimir Sementsov-Ogievskiy <=
[Qemu-devel] [PATCH v5 4/6] nbd/server: implement dirty bitmap export, Vladimir Sementsov-Ogievskiy, 2018/06/09
Re: [Qemu-devel] [PATCH v5 4/6] nbd/server: implement dirty bitmap export, Eric Blake, 2018/06/20