yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-06-17 20:10:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

pc: Move PCMachineClass, PCMachineState to qemu/typedefs.h

Browse source 
They will be used inside hw/xen/xen.h, which doesn't include
hw/i386/pc.h.

Backports commit 8170dfa077761ed979b45f608cf706253a764f0d from qemu
This commit is contained in:
Eduardo Habkost 2018-02-14 20:54:08 -05:00 committed by Lioncash
parent 952d0f522f
commit d5c7362e03
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
qemu/include/hw/i386/pc.h
View file

@ -1,6 +1,7 @@
#ifndef HW_PC_H #ifndef HW_PC_H
#define HW_PC_H #define HW_PC_H
#include "qemu/typedefs.h"
#include "hw/boards.h" #include "hw/boards.h"
/** /**
@ -23,9 +24,6 @@ struct PCMachineClass {
MachineClass parent_class; MachineClass parent_class;
}; };
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(uc, obj) \ #define PC_MACHINE(uc, obj) \
OBJECT_CHECK(uc, PCMachineState, (obj), TYPE_PC_MACHINE) OBJECT_CHECK(uc, PCMachineState, (obj), TYPE_PC_MACHINE)

2
qemu/include/qemu/typedefs.h
View file

@ -50,6 +50,8 @@ typedef struct ISABus ISABus;
typedef struct ISADevice ISADevice; typedef struct ISADevice ISADevice;
typedef struct SMBusDevice SMBusDevice; typedef struct SMBusDevice SMBusDevice;
typedef struct PCIHostState PCIHostState; typedef struct PCIHostState PCIHostState;
typedef struct PCMachineState PCMachineState;
typedef struct PCMachineClass PCMachineClass;
typedef struct PCIExpressHost PCIExpressHost; typedef struct PCIExpressHost PCIExpressHost;
typedef struct PCIBus PCIBus; typedef struct PCIBus PCIBus;
typedef struct PCIDevice PCIDevice; typedef struct PCIDevice PCIDevice;