[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/7] sockets: move qapi_copy_SocketAddress into qemu-
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PULL 2/7] sockets: move qapi_copy_SocketAddress into qemu-sockets.c |
Date: |
Tue, 20 Oct 2015 16:33:57 +0100 |
The qapi_copy_SocketAddress method is going to be useful
in more places than just qemu-char.c, so move it into
the qemu-sockets.c file to allow its reuse.
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
---
include/qemu/sockets.h | 4 ++++
qemu-char.c | 25 -------------------------
util/qemu-sockets.c | 30 ++++++++++++++++++++++++++++++
3 files changed, 34 insertions(+), 25 deletions(-)
diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h
index 3ea7cc9..5a183c5 100644
--- a/include/qemu/sockets.h
+++ b/include/qemu/sockets.h
@@ -118,4 +118,8 @@ SocketAddress *socket_local_address(int fd, Error **errp);
*/
SocketAddress *socket_remote_address(int fd, Error **errp);
+
+void qapi_copy_SocketAddress(SocketAddress **p_dest,
+ SocketAddress *src);
+
#endif /* QEMU_SOCKET_H */
diff --git a/qemu-char.c b/qemu-char.c
index 13371c4..908e712 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -92,31 +92,6 @@
/***********************************************************/
/* Socket address helpers */
-static void qapi_copy_SocketAddress(SocketAddress **p_dest,
- SocketAddress *src)
-{
- QmpOutputVisitor *qov;
- QmpInputVisitor *qiv;
- Visitor *ov, *iv;
- QObject *obj;
-
- *p_dest = NULL;
-
- qov = qmp_output_visitor_new();
- ov = qmp_output_get_visitor(qov);
- visit_type_SocketAddress(ov, &src, NULL, &error_abort);
- obj = qmp_output_get_qobject(qov);
- qmp_output_visitor_cleanup(qov);
- if (!obj) {
- return;
- }
-
- qiv = qmp_input_visitor_new(obj);
- iv = qmp_input_get_visitor(qiv);
- visit_type_SocketAddress(iv, p_dest, NULL, &error_abort);
- qmp_input_visitor_cleanup(qiv);
- qobject_decref(obj);
-}
static int SocketAddress_to_str(char *dest, int max_len,
const char *prefix, SocketAddress *addr,
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index 24b7b73..3338452 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -25,6 +25,9 @@
#include "monitor/monitor.h"
#include "qemu/sockets.h"
#include "qemu/main-loop.h"
+#include "qapi/qmp-input-visitor.h"
+#include "qapi/qmp-output-visitor.h"
+#include "qapi-visit.h"
#ifndef AI_ADDRCONFIG
# define AI_ADDRCONFIG 0
@@ -1128,3 +1131,30 @@ SocketAddress *socket_remote_address(int fd, Error
**errp)
return socket_sockaddr_to_address(&ss, sslen, errp);
}
+
+
+void qapi_copy_SocketAddress(SocketAddress **p_dest,
+ SocketAddress *src)
+{
+ QmpOutputVisitor *qov;
+ QmpInputVisitor *qiv;
+ Visitor *ov, *iv;
+ QObject *obj;
+
+ *p_dest = NULL;
+
+ qov = qmp_output_visitor_new();
+ ov = qmp_output_get_visitor(qov);
+ visit_type_SocketAddress(ov, &src, NULL, &error_abort);
+ obj = qmp_output_get_qobject(qov);
+ qmp_output_visitor_cleanup(qov);
+ if (!obj) {
+ return;
+ }
+
+ qiv = qmp_input_visitor_new(obj);
+ iv = qmp_input_get_visitor(qiv);
+ visit_type_SocketAddress(iv, p_dest, NULL, &error_abort);
+ qmp_input_visitor_cleanup(qiv);
+ qobject_decref(obj);
+}
--
2.4.3
- [Qemu-devel] [PULL 0/7] Misc refactoring to util codebase, Daniel P. Berrange, 2015/10/20
- [Qemu-devel] [PULL 1/7] sockets: add helpers for creating SocketAddress from a socket, Daniel P. Berrange, 2015/10/20
- [Qemu-devel] [PULL 4/7] ui: convert VNC startup code to use SocketAddress, Daniel P. Berrange, 2015/10/20
- [Qemu-devel] [PULL 5/7] osdep: add qemu_fork() wrapper for safely handling signals, Daniel P. Berrange, 2015/10/20
- [Qemu-devel] [PULL 3/7] sockets: allow port to be NULL when listening on IP address, Daniel P. Berrange, 2015/10/20
- [Qemu-devel] [PULL 2/7] sockets: move qapi_copy_SocketAddress into qemu-sockets.c,
Daniel P. Berrange <=
- [Qemu-devel] [PULL 6/7] coroutine: move into libqemuutil.a library, Daniel P. Berrange, 2015/10/20
- [Qemu-devel] [PULL 7/7] util: pull Buffer code out of VNC module, Daniel P. Berrange, 2015/10/20
- Re: [Qemu-devel] [PULL 0/7] Misc refactoring to util codebase, Peter Maydell, 2015/10/20
- Re: [Qemu-devel] [PULL 0/7] Misc refactoring to util codebase, Daniel P. Berrange, 2015/10/20