[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/25] hw/ssi: Remove SSIBus from "qemu/typedefs.h"
From: |
Thomas Huth |
Subject: |
[Qemu-devel] [PULL 12/25] hw/ssi: Remove SSIBus from "qemu/typedefs.h" |
Date: |
Mon, 14 Jan 2019 11:02:07 +0100 |
From: Philippe Mathieu-Daudé <address@hidden>
There are only three header files requiring this typedef, let them
include "hw/ssi/ssi.h" directly to simplify "qemu/typedefs.h".
To clean "qemu/typedefs.h", move the forward declaration
to "hw/ssi/ssi.h".
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
[thuth: slightly tweaked commit message]
Signed-off-by: Thomas Huth <address@hidden>
---
hw/arm/strongarm.h | 1 +
include/hw/arm/pxa.h | 1 +
include/hw/ssi/pl022.h | 1 +
include/hw/ssi/ssi.h | 1 +
include/qemu/typedefs.h | 1 -
5 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/hw/arm/strongarm.h b/hw/arm/strongarm.h
index e98840b..ae51a1a 100644
--- a/hw/arm/strongarm.h
+++ b/hw/arm/strongarm.h
@@ -3,6 +3,7 @@
#include "exec/memory.h"
#include "target/arm/cpu-qom.h"
+#include "hw/ssi/ssi.h"
#define SA_CS0 0x00000000
#define SA_CS1 0x08000000
diff --git a/include/hw/arm/pxa.h b/include/hw/arm/pxa.h
index f6dfb5c..f184349 100644
--- a/include/hw/arm/pxa.h
+++ b/include/hw/arm/pxa.h
@@ -13,6 +13,7 @@
#include "exec/memory.h"
#include "target/arm/cpu-qom.h"
#include "hw/pcmcia.h"
+#include "hw/ssi/ssi.h"
/* Interrupt numbers */
# define PXA2XX_PIC_SSP3 0
diff --git a/include/hw/ssi/pl022.h b/include/hw/ssi/pl022.h
index a080519..1cf16f1 100644
--- a/include/hw/ssi/pl022.h
+++ b/include/hw/ssi/pl022.h
@@ -22,6 +22,7 @@
#define HW_SSI_PL022_H
#include "hw/sysbus.h"
+#include "hw/ssi/ssi.h"
#define TYPE_PL022 "pl022"
#define PL022(obj) OBJECT_CHECK(PL022State, (obj), TYPE_PL022)
diff --git a/include/hw/ssi/ssi.h b/include/hw/ssi/ssi.h
index 6a0c3c3..bdbf3c5 100644
--- a/include/hw/ssi/ssi.h
+++ b/include/hw/ssi/ssi.h
@@ -13,6 +13,7 @@
#include "hw/qdev.h"
+typedef struct SSIBus SSIBus;
typedef struct SSISlave SSISlave;
typedef struct SSISlaveClass SSISlaveClass;
typedef enum SSICSMode SSICSMode;
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index 3bd9215..c026229 100644
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -108,7 +108,6 @@ typedef struct Range Range;
typedef struct SerialState SerialState;
typedef struct SHPCDevice SHPCDevice;
typedef struct SMBusDevice SMBusDevice;
-typedef struct SSIBus SSIBus;
typedef struct uWireSlave uWireSlave;
typedef struct VirtIODevice VirtIODevice;
typedef struct Visitor Visitor;
--
1.8.3.1
- [Qemu-devel] [PULL 14/25] hw/i2c/smbus: Remove SMBusDevice from "qemu/typedefs.h", (continued)
- [Qemu-devel] [PULL 14/25] hw/i2c/smbus: Remove SMBusDevice from "qemu/typedefs.h", Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 08/25] tests/boot-order: Make test independent of global_qtest, Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 07/25] tests/endianesss: Make test independent of global_qtest, Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 06/25] tests/Makefile: Use some more CONFIG switches for ppc tests, Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 01/25] hw/misc/ivshmem: Remove deprecated "ivshmem" legacy device, Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 13/25] hw/ide/ahci: Remove AllwinnerAHCIState from "qemu/typedefs.h", Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 16/25] hw/char/serial: Remove SerialState from "qemu/typedefs.h", Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 11/25] hw/pcmcia: Remove PCMCIACardState from "qemu/typedefs.h", Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 19/25] ui/console: Remove QemuDmaBuf from "qemu/typedefs.h", Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 24/25] configure: Force the C standard to gnu99, Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 12/25] hw/ssi: Remove SSIBus from "qemu/typedefs.h",
Thomas Huth <=
- [Qemu-devel] [PULL 09/25] tests/pnv-xscom: Make test independent of global_qtest, Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 18/25] audio: Remove AudioState from "qemu/typedefs.h", Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 22/25] ppc: Move spapr-related prototypes from xics.h into a seperate header file, Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 20/25] ui/console: Remove DisplayState/DisplaySurface from "qemu/typedefs.h", Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 17/25] hw/i386: Remove PCMachineClass from "qemu/typedefs.h", Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 21/25] linux-user: Fix compilation with clang 3.4, Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 10/25] hw/input/ps2: Remove PS2State from "qemu/typedefs.h", Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 25/25] tests/hexloader-test: Don't pass -nographic to the QEMU under test, Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 15/25] hw/bt: Remove HCIInfo from "qemu/typedefs.h", Thomas Huth, 2019/01/14
- [Qemu-devel] [PULL 23/25] ppc: Fix duplicated typedefs to be able to compile with Clang in gnu99 mode, Thomas Huth, 2019/01/14