commit 622311e8dfe485ba588b570c69d66e71d9624104
author David Turner <digit@android.com> Fri Sep 10 12:05:01 2010 +0200
committer David 'Digit' Turner <digit@android.com> Mon Sep 13 00:30:34 2010 -0700
tree 7d95effde02f4854600259c059b2b795768c4874
parent b91980562344f6a3b719bfe4be007fa9406e585f

upstream: qemu-char.h update

qemu-char.h

diff --git a/qemu-char.h b/qemu-char.h
index bf88af2..0d05fd0 100644
--- a/qemu-char.h
+++ b/qemu-char.h
@@ -3,6 +3,9 @@
 
 #include "qemu-common.h"
 #include "qemu-queue.h"
+#include "qemu-option.h"
+#include "qemu-config.h"
+#include "qobject.h"
 
 /* character device */
 
@@ -52,6 +55,7 @@
     int (*chr_write)(struct CharDriverState *s, const uint8_t *buf, int len);
     void (*chr_update_read_handler)(struct CharDriverState *s);
     int (*chr_ioctl)(struct CharDriverState *s, int cmd, void *arg);
+    int (*get_msgfd)(struct CharDriverState *s);
     IOEventHandler *chr_event;
     IOCanReadHandler *chr_can_read;
     IOReadHandler *chr_read;
@@ -64,9 +68,13 @@
     QEMUBH *bh;
     char *label;
     char *filename;
+    int opened;
     QTAILQ_ENTRY(CharDriverState) next;
 };
 
+QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename);
+CharDriverState *qemu_chr_open_opts(QemuOpts *opts,
+                                    void (*init)(struct CharDriverState *s));
 CharDriverState *qemu_chr_open(const char *label, const char *filename, void (*init)(struct CharDriverState *s));
 void qemu_chr_close(CharDriverState *chr);
 void qemu_chr_printf(CharDriverState *s, const char *fmt, ...);
@@ -80,10 +88,17 @@
 int qemu_chr_ioctl(CharDriverState *s, int cmd, void *arg);
 void qemu_chr_reset(CharDriverState *s);
 void qemu_chr_initial_reset(void);
+void qemu_chr_generic_open(CharDriverState *s);
 int qemu_chr_can_read(CharDriverState *s);
 void qemu_chr_read(CharDriverState *s, uint8_t *buf, int len);
+int qemu_chr_get_msgfd(CharDriverState *s);
 void qemu_chr_accept_input(CharDriverState *s);
+void qemu_chr_info_print(Monitor *mon, const QObject *ret_data);
 void qemu_chr_info(Monitor *mon);
+CharDriverState *qemu_chr_find(const char *name);
+
+/* add an eventfd to the qemu devices that are polled */
+CharDriverState *qemu_chr_open_eventfd(int eventfd);
 
 extern int term_escape_char;