[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/24] pc: Move PCMachineClass, PCMachineState to qem
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 08/24] pc: Move PCMachineClass, PCMachineState to qemu/typedefs.h |
Date: |
Thu, 13 Aug 2015 15:15:01 +0300 |
From: Eduardo Habkost <address@hidden>
They will be used inside hw/xen/xen.h, which doesn't include
hw/i386/pc.h.
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/i386/pc.h | 4 +---
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 1dca7e7..6746097 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 6fdcbcd..f8a9dd6 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;
--
MST
- [Qemu-devel] [PULL 00/24] virtio,pc,acpi fixes, cleanups, Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 01/24] make: fix where dependency *.d are stored., Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 02/24] make: load only required dependency files., Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 03/24] piix: Document coreboot-specific RAM size config register, Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 04/24] pc: Use PC_COMPAT_* for CPUID feature compatibility, Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 05/24] target-i386: Remove x86_cpu_compat_set_features(), Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 06/24] pc: Use error_abort when registering properties, Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 07/24] pc: Rename pc_machine variables to pcms, Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 09/24] pc: Eliminate pc_common_machine_options(), Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 08/24] pc: Move PCMachineClass, PCMachineState to qemu/typedefs.h,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 10/24] pc: Eliminate pc_default_machine_options(), Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 12/24] pc: Use PCMachineState for pc_memory_init() argument, Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 11/24] pc: Use PCMachineState for pc_cmos_init() argument, Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 14/24] pc: Use PCMachineState as pc_guest_info_init() argument, Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 13/24] pc: Move {above, below}_4g_mem_size variables to PCMachineState, Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 15/24] pc: Remove redundant arguments from *load_linux(), Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 17/24] pc: Remove redundant arguments from pc_memory_init(), Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 16/24] pc: Remove redundant arguments from pc_cmos_init(), Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 18/24] pci: allow 0 address for PCI IO/MEM regions, Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 19/24] virtio-net: remove useless codes, Michael S. Tsirkin, 2015/08/13