Signed-off-by: Michael Roth <[email protected]>
---
virtproxy.c | 40 ++++++++++++++++++++++++++++++++++++++++
virtproxy.h | 6 ++++++
2 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/virtproxy.c b/virtproxy.c
index 091a223..401d51c 100644
--- a/virtproxy.c
+++ b/virtproxy.c
@@ -359,3 +359,43 @@ static void vp_channel_read(void *opaque)
LOG("error handling packet stream");
}
}
+
+VPDriver *vp_new(enum vp_context ctx, CharDriverState *s, int fd, bool listen)
+{
+ VPDriver *drv = NULL;
+
+ drv = qemu_mallocz(sizeof(VPDriver));
+ drv->listen_fd = -1;
+ drv->channel_fd = -1;
+ drv->chr = s;
+ drv->ctx = ctx;
+ QLIST_INIT(&drv->oforwards);
+ QLIST_INIT(&drv->conns);
+
+ if (ctx == VP_CTX_CHARDEV) {
+ if (drv->chr == NULL) {
+ LOG("invalid virtproxy chardev");
+ goto out_bad;
+ }
+ } else if (ctx == VP_CTX_FD) {
+ if (fd <= 0) {
+ LOG("invalid FD");
+ goto out_bad;
+ } else if (listen) {
+ /* provided FD is to be listened on for channel connection */
+ drv->listen_fd = fd;
+ vp_set_fd_handler(drv->listen_fd, vp_channel_accept, NULL, drv);
+ } else {
+ drv->channel_fd = fd;
+ vp_set_fd_handler(drv->channel_fd, vp_channel_read, NULL, drv);
+ }
+ } else {
+ LOG("invalid context");
+ goto out_bad;
+ }
+
+ return drv;
+out_bad:
+ qemu_free(drv);
+ return NULL;
+}
diff --git a/virtproxy.h b/virtproxy.h
index 8fa0142..7cd2f76 100644
--- a/virtproxy.h
+++ b/virtproxy.h
@@ -16,8 +16,13 @@
#include "qemu-common.h"
#include "qemu-queue.h"
+#include "qemu-char.h"
typedef struct VPDriver VPDriver;
+enum vp_context {
+ VP_CTX_CHARDEV, /* in qemu/host, channel is a virtproxy chardev */
+ VP_CTX_FD, /* in guest, channel is an FD */
+};
/* wrappers for s/vp/qemu/ functions we need */
int vp_send_all(int fd, const void *buf, int len1);
@@ -33,6 +38,7 @@ int vp_set_fd_handler(int fd,
void vp_chr_read(CharDriverState *s, uint8_t *buf, int len);
/* virtproxy interface */
+VPDriver *vp_new(enum vp_context ctx, CharDriverState *s, int fd, bool listen);
int vp_handle_packet_buf(VPDriver *drv, const void *buf, int count);
#endif /* VIRTPROXY_H */
--
1.7.0.4
