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>
This commit is contained in:
parent
ec68007a29
commit
8170dfa077
|
@ -2,6 +2,7 @@
|
||||||
#define HW_PC_H
|
#define HW_PC_H
|
||||||
|
|
||||||
#include "qemu-common.h"
|
#include "qemu-common.h"
|
||||||
|
#include "qemu/typedefs.h"
|
||||||
#include "exec/memory.h"
|
#include "exec/memory.h"
|
||||||
#include "hw/boards.h"
|
#include "hw/boards.h"
|
||||||
#include "hw/isa/isa.h"
|
#include "hw/isa/isa.h"
|
||||||
|
@ -61,9 +62,6 @@ struct PCMachineClass {
|
||||||
DeviceState *dev);
|
DeviceState *dev);
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef struct PCMachineState PCMachineState;
|
|
||||||
typedef struct PCMachineClass PCMachineClass;
|
|
||||||
|
|
||||||
#define TYPE_PC_MACHINE "generic-pc-machine"
|
#define TYPE_PC_MACHINE "generic-pc-machine"
|
||||||
#define PC_MACHINE(obj) \
|
#define PC_MACHINE(obj) \
|
||||||
OBJECT_CHECK(PCMachineState, (obj), TYPE_PC_MACHINE)
|
OBJECT_CHECK(PCMachineState, (obj), TYPE_PC_MACHINE)
|
||||||
|
|
|
@ -58,6 +58,8 @@ typedef struct PCIESlot PCIESlot;
|
||||||
typedef struct PCIExpressDevice PCIExpressDevice;
|
typedef struct PCIExpressDevice PCIExpressDevice;
|
||||||
typedef struct PCIExpressHost PCIExpressHost;
|
typedef struct PCIExpressHost PCIExpressHost;
|
||||||
typedef struct PCIHostState PCIHostState;
|
typedef struct PCIHostState PCIHostState;
|
||||||
|
typedef struct PCMachineState PCMachineState;
|
||||||
|
typedef struct PCMachineClass PCMachineClass;
|
||||||
typedef struct PCMCIACardState PCMCIACardState;
|
typedef struct PCMCIACardState PCMCIACardState;
|
||||||
typedef struct PixelFormat PixelFormat;
|
typedef struct PixelFormat PixelFormat;
|
||||||
typedef struct PropertyInfo PropertyInfo;
|
typedef struct PropertyInfo PropertyInfo;
|
||||||
|
|
Loading…
Reference in a new issue