diff options
| author | Eduardo Habkost | 2015-08-07 21:55:46 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin | 2015-08-13 13:08:26 +0200 |
| commit | 8170dfa077761ed979b45f608cf706253a764f0d (patch) | |
| tree | bde7596c87ef3858d7ebca65b627449c8bef1337 /include | |
| parent | pc: Rename pc_machine variables to pcms (diff) | |
| download | qemu-8170dfa077761ed979b45f608cf706253a764f0d.tar.gz qemu-8170dfa077761ed979b45f608cf706253a764f0d.tar.xz qemu-8170dfa077761ed979b45f608cf706253a764f0d.zip | |
pc: Move PCMachineClass, PCMachineState to qemu/typedefs.h
They will be used inside hw/xen/xen.h, which doesn't include
hw/i386/pc.h.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/i386/pc.h | 4 | ||||
| -rw-r--r-- | include/qemu/typedefs.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 1dca7e71b3..67460972fd 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -2,6 +2,7 @@ #define HW_PC_H #include "qemu-common.h" +#include "qemu/typedefs.h" #include "exec/memory.h" #include "hw/boards.h" #include "hw/isa/isa.h" @@ -61,9 +62,6 @@ struct PCMachineClass { DeviceState *dev); }; -typedef struct PCMachineState PCMachineState; -typedef struct PCMachineClass PCMachineClass; - #define TYPE_PC_MACHINE "generic-pc-machine" #define PC_MACHINE(obj) \ OBJECT_CHECK(PCMachineState, (obj), TYPE_PC_MACHINE) diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 6fdcbcd524..f8a9dd6f10 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -58,6 +58,8 @@ typedef struct PCIESlot PCIESlot; typedef struct PCIExpressDevice PCIExpressDevice; typedef struct PCIExpressHost PCIExpressHost; typedef struct PCIHostState PCIHostState; +typedef struct PCMachineState PCMachineState; +typedef struct PCMachineClass PCMachineClass; typedef struct PCMCIACardState PCMCIACardState; typedef struct PixelFormat PixelFormat; typedef struct PropertyInfo PropertyInfo; |