projects
/
qemu
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'gnu/master' into test
[qemu]
/
qemu-common.h
diff --git
a/qemu-common.h
b/qemu-common.h
index
c90c3e3
..
fdc3679
100644
(file)
--- a/
qemu-common.h
+++ b/
qemu-common.h
@@
-23,6
+23,7
@@
#include <unistd.h>
#include <fcntl.h>
#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/stat.h>
+#include <assert.h>
#include "config-host.h"
#ifndef O_LARGEFILE
#include "config-host.h"
#ifndef O_LARGEFILE
@@
-177,7
+178,12
@@
typedef struct PCIBus PCIBus;
typedef struct PCIDevice PCIDevice;
typedef struct SerialState SerialState;
typedef struct IRQState *qemu_irq;
typedef struct PCIDevice PCIDevice;
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. */
void cpu_save(QEMUFile *f, void *opaque);
/* CPU save/load. */
void cpu_save(QEMUFile *f, void *opaque);
@@
-217,6
+223,8
@@
void qemu_iovec_from_buffer(QEMUIOVector *qiov, const void *buf, size_t count);
struct Monitor;
typedef struct Monitor Monitor;
struct Monitor;
typedef struct Monitor Monitor;
+#include "module.h"
+
#endif /* dyngen-exec.h hack */
#endif
#endif /* dyngen-exec.h hack */
#endif