[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC][PATCH v2 16/19] virtproxy: qemu integration, add virt
From: |
Michael Roth |
Subject: |
[Qemu-devel] [RFC][PATCH v2 16/19] virtproxy: qemu integration, add virtproxy chardev |
Date: |
Wed, 10 Nov 2010 16:28:12 -0600 |
This allows us to create a virtproxy instance via a chardev. It can now
be created with something like:
qemu -chardev virtproxy,id=vp1 \
-device virtio-serial \
-device virtserialport,chardev=vp1
In the future the ability to add oforwards/iforwards in the command-line
invocation and the monitor will be added. For now we leave it to users
of virtproxy (currently only virtagent) to set up the forwarding
sockets/ports they need via direct virtproxy API calls.
Signed-off-by: Michael Roth <address@hidden>
---
qemu-char.c | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index 88997f9..e318acb 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -1902,6 +1902,48 @@ return_err:
}
/***********************************************************/
+/* Virtproxy chardev driver */
+
+#include "virtproxy.h"
+
+static int vp_chr_write(CharDriverState *chr, const uint8_t *buf, int len)
+{
+ VPDriver *drv = chr->opaque;
+ int ret;
+
+ fprintf(stderr, "called, opaque: %p\n", chr);
+
+ ret = vp_handle_packet_buf(drv, buf, len);
+ if (ret == -1) {
+ fprintf(stderr, "error handling data from virtproxy channel");
+ }
+
+ return 0;
+}
+
+static CharDriverState *qemu_chr_open_virtproxy(QemuOpts *opts)
+{
+ CharDriverState *chr = qemu_mallocz(sizeof(CharDriverState));
+ VPDriver *drv = vp_new(VP_CTX_CHARDEV, chr, 0, 0);
+
+ chr->opaque = drv;
+ chr->chr_write = vp_chr_write;
+
+ qemu_chr_generic_open(chr);
+
+ /* TODO: eventually we will parse opts here to configure
+ * basic host/guest socket/port forwarding functionality.
+ * for now we exist solely for use by the virtagent RPC
+ * client/server, which will add it's oforwards/iforwards
+ * using using virtproxy API calls directly
+ */
+
+ /* for "info chardev" monitor command */
+ chr->filename = NULL;
+ return chr;
+}
+
+/***********************************************************/
/* TCP Net console */
typedef struct {
@@ -2408,6 +2450,7 @@ static const struct {
{ .name = "udp", .open = qemu_chr_open_udp },
{ .name = "msmouse", .open = qemu_chr_open_msmouse },
{ .name = "vc", .open = text_console_init },
+ { .name = "virtproxy", .open = qemu_chr_open_virtproxy },
#ifdef _WIN32
{ .name = "file", .open = qemu_chr_open_win_file_out },
{ .name = "pipe", .open = qemu_chr_open_win_pipe },
--
1.7.0.4
- [Qemu-devel] [RFC][PATCH v2 00/19] virtproxy: host/guest communication layer, Michael Roth, 2010/11/10
- [Qemu-devel] [RFC][PATCH v2 19/19] virtproxy: Makefile/configure changes to build qemu-vp, Michael Roth, 2010/11/10
- [Qemu-devel] [RFC][PATCH v2 18/19] virtproxy: qemu-vp, main logic, Michael Roth, 2010/11/10
- [Qemu-devel] [RFC][PATCH v2 17/19] virtproxy: qemu integration, add virtproxy to Makefile.targets, Michael Roth, 2010/11/10
- [Qemu-devel] [RFC][PATCH v2 15/19] virtproxy: add virtproxy-builtin.c for compat defs, Michael Roth, 2010/11/10
- [Qemu-devel] [RFC][PATCH v2 16/19] virtproxy: qemu integration, add virtproxy chardev,
Michael Roth <=
- [Qemu-devel] [RFC][PATCH v2 14/19] virtproxy: add read handler for proxied connections, Michael Roth, 2010/11/10
- [Qemu-devel] [RFC][PATCH v2 13/19] virtproxy: interfaces to set/remove VPIForwards, Michael Roth, 2010/11/10
- [Qemu-devel] [RFC][PATCH v2 09/19] virtproxy: interfaces to set/remove/handle VPOForwards, Michael Roth, 2010/11/10
- [Qemu-devel] [RFC][PATCH v2 11/19] virtproxy: add handler for control packet, Michael Roth, 2010/11/10
- [Qemu-devel] [RFC][PATCH v2 08/19] virtproxy: add vp_new() VPDriver constructor, Michael Roth, 2010/11/10
- [Qemu-devel] [RFC][PATCH v2 06/19] virtproxy: add accept handler for communication channel, Michael Roth, 2010/11/10
- [Qemu-devel] [RFC][PATCH v2 07/19] virtproxy: add read handler for communication channel, Michael Roth, 2010/11/10
- [Qemu-devel] [RFC][PATCH v2 05/19] virtproxy, add vp_channel_send_all, Michael Roth, 2010/11/10
- [Qemu-devel] [RFC][PATCH v2 10/19] virtproxy: add handler for data packets, Michael Roth, 2010/11/10
- [Qemu-devel] [RFC][PATCH v2 03/19] virtproxy: add debug functions for virtproxy core, Michael Roth, 2010/11/10