Changeset 36175 in vbox for trunk/src/recompiler/qemu-common.h

Timestamp:

Mar 4, 2011 4:21:09 PM (14 years ago)

Author:

vboxsync

Message:

rem: Synced up to v0.11.1 (35bfc7324e2e6946c4113ada5db30553a1a7c40b) from ​git://git.savannah.nongnu.org/qemu.git.

File:

• trunk/src/recompiler/qemu-common.h (modified) (8 diffs)

trunk/src/recompiler/qemu-common.h

@@ -31 +31 @@
 #define qemu_toascii(c)         RT_C_TO_ASCII((unsigned char)(c))
 
+#define qemu_init_vcpu(env)     do { } while (0) /* we don't need this :-) */
+
+
 #else /* !VBOX */
 #ifdef _WIN32
@@ -59 +62 @@
 #include <fcntl.h>
 #include <sys/stat.h>
+#include <assert.h>
 #include "config-host.h"
 
@@ -143 +147 @@
 int strstart(const char *str, const char *val, const char **ptr);
 int stristart(const char *str, const char *val, const char **ptr);
+int qemu_strnlen(const char *s, int max_len);
 time_t mktimegm(struct tm *tm);
 int qemu_fls(int i);
@@ -198 +203 @@
 typedef struct DisplayChangeListener DisplayChangeListener;
 typedef struct DisplaySurface DisplaySurface;
+typedef struct DisplayAllocator DisplayAllocator;
 typedef struct PixelFormat PixelFormat;
 typedef struct TextConsole TextConsole;
@@ -212 +218 @@
 typedef struct SerialState SerialState;
 typedef struct IRQState *qemu_irq;
-struct pcmcia_card_s;
+typedef struct PCMCIACardState PCMCIACardState;
+typedef struct MouseTransformInfo MouseTransformInfo;
+typedef struct uWireSlave uWireSlave;
+typedef struct I2SCodec I2SCodec;
+typedef struct DeviceState DeviceState;
+typedef struct SSIBus SSIBus;
 
 /* CPU save/load.  */
@@ -220 +231 @@
 /* Force QEMU to stop what it's doing and service IO */
 void qemu_service_io(void);
+
+/* Force QEMU to process pending events */
+void qemu_notify_event(void);
+
+/* Unblock cpu */
+void qemu_cpu_kick(void *env);
+int qemu_cpu_self(void *env);
+
+#ifdef CONFIG_USER_ONLY
+#define qemu_init_vcpu(env) do { } while (0)
+#else
+void qemu_init_vcpu(void *env);
+#endif
 
 typedef struct QEMUIOVector {
@@ -229 +253 @@
 
 void qemu_iovec_init(QEMUIOVector *qiov, int alloc_hint);
+void qemu_iovec_init_external(QEMUIOVector *qiov, struct iovec *iov, int niov);
 void qemu_iovec_add(QEMUIOVector *qiov, void *base, size_t len);
 void qemu_iovec_destroy(QEMUIOVector *qiov);
@@ -235 +260 @@
 void qemu_iovec_from_buffer(QEMUIOVector *qiov, const void *buf, size_t count);
 
+struct Monitor;
+typedef struct Monitor Monitor;
+
+#include "module.h"
+
 #endif /* dyngen-exec.h hack */