Commit 8170dfa0 authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Michael S. Tsirkin
Browse files

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: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent ec68007a

include/hw/i386/pc.h

+1 −3
Original line number Diff line number Diff line
@@ -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)

include/qemu/typedefs.h

+2 −0
Original line number Diff line number Diff line
@@ -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;