← Back to branch summary

~vcs-imports/qemu/maemo

« back to all changes in this revision

Viewing changes to qemu-common.h

  • Committer: Riku Voipio
  • Date: 2009-06-08 15:31:58 UTC
  • mfrom: (6281.2.366)
  • mto: This revision was merged to the branch mainline in revision 6452.
  • Revision ID: git-v1:759b334a9739814df2883aa4c41b1c0f5670e90a
Merge commit 'gnu/master' into test

Epic merge

Conflicts:
        Makefile
        block.c
        block.h
        configure
        hw/boards.h
        hw/flash.h
        hw/integratorcp.c
        hw/nand.c
        hw/omap2.c
        hw/omap_i2c.c
        hw/sd.c
        hw/smc91c111.c
        hw/tsc2005.c
        hw/tusb6010.c
        hw/usb-musb.c
        linux-user/syscall.c
        target-arm/machine.c
        target-arm/translate.c

Show diffs side-by-side

added added

removed removed

Lines of Context:
qemu-common.h
23
23
#include <unistd.h>
24
24
#include <fcntl.h>
25
25
#include <sys/stat.h>
 
26
#include <assert.h>
26
27
#include "config-host.h"
27
28
 
28
29
#ifndef O_LARGEFILE
177
178
typedef struct PCIDevice PCIDevice;
178
179
typedef struct SerialState SerialState;
179
180
typedef struct IRQState *qemu_irq;
180
 
struct pcmcia_card_s;
 
181
typedef struct PCMCIACardState PCMCIACardState;
 
182
typedef struct MouseTransformInfo MouseTransformInfo;
 
183
typedef struct uWireSlave uWireSlave;
 
184
typedef struct I2SCodec I2SCodec;
 
185
typedef struct DeviceState DeviceState;
 
186
typedef struct SSIBus SSIBus;
181
187
 
182
188
/* CPU save/load.  */
183
189
void cpu_save(QEMUFile *f, void *opaque);
217
223
struct Monitor;
218
224
typedef struct Monitor Monitor;
219
225
 
 
226
#include "module.h"
 
227
 
220
228
#endif /* dyngen-exec.h hack */
221
229
 
222
230
#endif