softmmu: move include files to include/sysemu/

[qemu.git] / qemu-char.h

diff --git a/qemu-char.h b/qemu-char.h
index 486644b3bdf273e80de8ec2e4b964dc87a147199..baa5d035fddadfa2fbc2a6787a98da30ae9000e9 100644 (file)
--- a/qemu-char.h
+++ b/qemu-char.h
@@ -2,12 +2,13 @@
 #define QEMU_CHAR_H
 
 #include "qemu-common.h"
-#include "qemu-queue.h"
-#include "qemu-option.h"
-#include "qemu-config.h"
-#include "qobject.h"
-#include "qstring.h"
-#include "main-loop.h"
+#include "qemu/queue.h"
+#include "qemu/option.h"
+#include "qemu/config-file.h"
+#include "block/aio.h"
+#include "qapi/qmp/qobject.h"
+#include "qapi/qmp/qstring.h"
+#include "qemu/main-loop.h"
 
 /* character device */
 
@@ -69,7 +70,7 @@ struct CharDriverState {
     void (*chr_guest_open)(struct CharDriverState *chr);
     void (*chr_guest_close)(struct CharDriverState *chr);
     void *opaque;
-    QEMUBH *bh;
+    QEMUTimer *open_timer;
     char *label;
     char *filename;
     int opened;