|
 |
383d26 |
From 9dc089506f5893e309c458e5466566d112a7bb62 Mon Sep 17 00:00:00 2001
|
|
|
383d26 |
From: John Snow <jsnow@redhat.com>
|
|
|
383d26 |
Date: Wed, 27 Mar 2019 17:22:17 +0100
|
|
|
383d26 |
Subject: [PATCH 078/163] nbd: publish _lookup functions
|
|
|
383d26 |
|
|
|
383d26 |
RH-Author: John Snow <jsnow@redhat.com>
|
|
|
383d26 |
Message-id: <20190327172308.31077-5-jsnow@redhat.com>
|
|
|
383d26 |
Patchwork-id: 85172
|
|
|
383d26 |
O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH 04/55] nbd: publish _lookup functions
|
|
|
383d26 |
Bugzilla: 1691009
|
|
|
383d26 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
383d26 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
383d26 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
383d26 |
|
|
|
383d26 |
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
|
383d26 |
|
|
|
383d26 |
These functions are used for formatting pretty trace points. We are
|
|
|
383d26 |
going to add some in block/nbd-client, so, let's publish all these
|
|
|
383d26 |
functions at once. Note, that nbd_reply_type_lookup is already
|
|
|
383d26 |
published, and constants, "named" by these functions live in
|
|
|
383d26 |
include/block/nbd.h too.
|
|
|
383d26 |
|
|
|
383d26 |
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
|
383d26 |
Message-Id: <20181102151152.288399-3-vsementsov@virtuozzo.com>
|
|
|
383d26 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
383d26 |
Signed-off-by: Eric Blake <eblake@redhat.com>
|
|
|
383d26 |
(cherry picked from commit 757a0d05ea22d63e667db08a80b6ec6f1d53a12f)
|
|
|
383d26 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
383d26 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
383d26 |
---
|
|
|
383d26 |
include/block/nbd.h | 5 +++++
|
|
|
383d26 |
nbd/nbd-internal.h | 5 -----
|
|
|
383d26 |
2 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
383d26 |
|
|
|
383d26 |
diff --git a/include/block/nbd.h b/include/block/nbd.h
|
|
|
383d26 |
index 6a5bfe5..65402d3 100644
|
|
|
383d26 |
--- a/include/block/nbd.h
|
|
|
383d26 |
+++ b/include/block/nbd.h
|
|
|
383d26 |
@@ -343,5 +343,10 @@ static inline bool nbd_reply_is_structured(NBDReply *reply)
|
|
|
383d26 |
}
|
|
|
383d26 |
|
|
|
383d26 |
const char *nbd_reply_type_lookup(uint16_t type);
|
|
|
383d26 |
+const char *nbd_opt_lookup(uint32_t opt);
|
|
|
383d26 |
+const char *nbd_rep_lookup(uint32_t rep);
|
|
|
383d26 |
+const char *nbd_info_lookup(uint16_t info);
|
|
|
383d26 |
+const char *nbd_cmd_lookup(uint16_t info);
|
|
|
383d26 |
+const char *nbd_err_lookup(int err);
|
|
|
383d26 |
|
|
|
383d26 |
#endif
|
|
|
383d26 |
diff --git a/nbd/nbd-internal.h b/nbd/nbd-internal.h
|
|
|
383d26 |
index eeff78d..f38be9e 100644
|
|
|
383d26 |
--- a/nbd/nbd-internal.h
|
|
|
383d26 |
+++ b/nbd/nbd-internal.h
|
|
|
383d26 |
@@ -100,11 +100,6 @@ struct NBDTLSHandshakeData {
|
|
|
383d26 |
|
|
|
383d26 |
void nbd_tls_handshake(QIOTask *task,
|
|
|
383d26 |
void *opaque);
|
|
|
383d26 |
-const char *nbd_opt_lookup(uint32_t opt);
|
|
|
383d26 |
-const char *nbd_rep_lookup(uint32_t rep);
|
|
|
383d26 |
-const char *nbd_info_lookup(uint16_t info);
|
|
|
383d26 |
-const char *nbd_cmd_lookup(uint16_t info);
|
|
|
383d26 |
-const char *nbd_err_lookup(int err);
|
|
|
383d26 |
|
|
|
383d26 |
int nbd_drop(QIOChannel *ioc, size_t size, Error **errp);
|
|
|
383d26 |
|
|
|
383d26 |
--
|
|
|
383d26 |
1.8.3.1
|
|
|
383d26 |
|