[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC 5/5] include: Include exec/hwaddr.h where hwaddr
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH RFC 5/5] include: Include exec/hwaddr.h where hwaddr is used |
Date: |
Thu, 23 Jun 2016 18:12:10 +0200 |
Don't bother with include/exec/memory-internal.h and
include/hw/elf_ops.h, because those are somewhat special.
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/audio/lm4549.h | 1 +
hw/cris/boot.h | 2 ++
hw/net/e1000e_core.h | 7 +++++++
hw/net/vmware_utils.h | 1 +
hw/scsi/mptsas.h | 1 +
include/disas/disas.h | 1 +
include/hw/arm/sharpsl.h | 3 +++
include/hw/block/fdc.h | 1 +
include/hw/char/escc.h | 2 ++
include/hw/char/pl011.h | 2 ++
include/hw/char/xilinx_uartlite.h | 2 ++
include/hw/cris/etraxfs_dma.h | 2 ++
include/hw/empty_slot.h | 2 ++
include/hw/misc/mips_cmgcr.h | 1 +
include/hw/pci-host/apb.h | 1 +
include/hw/sparc/sparc32_dma.h | 2 ++
include/hw/timer/m48t59.h | 1 +
include/sysemu/xen-mapcache.h | 1 +
target-ppc/mmu-hash32.h | 2 ++
tests/Makefile.include | 9 ---------
20 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/hw/audio/lm4549.h b/hw/audio/lm4549.h
index 812a7a4..8e6eebf 100644
--- a/hw/audio/lm4549.h
+++ b/hw/audio/lm4549.h
@@ -13,6 +13,7 @@
#define HW_LM4549_H
#include "audio/audio.h"
+#include "exec/hwaddr.h"
typedef void (*lm4549_callback)(void *opaque);
diff --git a/hw/cris/boot.h b/hw/cris/boot.h
index c4d3fa6..a51ae92 100644
--- a/hw/cris/boot.h
+++ b/hw/cris/boot.h
@@ -1,6 +1,8 @@
#ifndef _CRIS_BOOT_H
#define HW_CRIS_BOOT_H 1
+#include "exec/hwaddr.h"
+
struct cris_load_info
{
const char *image_filename;
diff --git a/hw/net/e1000e_core.h b/hw/net/e1000e_core.h
index 5f413a9..2c903f9 100644
--- a/hw/net/e1000e_core.h
+++ b/hw/net/e1000e_core.h
@@ -33,6 +33,11 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef E1000E_CORE_H
+#define E1000E_CORE_H
+
+#include "exec/hwaddr.h"
+
#define E1000E_PHY_PAGE_SIZE (0x20)
#define E1000E_PHY_PAGES (0x07)
#define E1000E_MAC_SIZE (0x8000)
@@ -144,3 +149,5 @@ e1000e_receive(E1000ECore *core, const uint8_t *buf, size_t
size);
ssize_t
e1000e_receive_iov(E1000ECore *core, const struct iovec *iov, int iovcnt);
+
+#endif
diff --git a/hw/net/vmware_utils.h b/hw/net/vmware_utils.h
index c0dbb2f..9ca714d 100644
--- a/hw/net/vmware_utils.h
+++ b/hw/net/vmware_utils.h
@@ -17,6 +17,7 @@
#ifndef VMWARE_UTILS_H
#define VMWARE_UTILS_H
+#include "exec/hwaddr.h"
#include "qemu/range.h"
#include "vmxnet_debug.h"
diff --git a/hw/scsi/mptsas.h b/hw/scsi/mptsas.h
index 595f81f..553552d 100644
--- a/hw/scsi/mptsas.h
+++ b/hw/scsi/mptsas.h
@@ -1,6 +1,7 @@
#ifndef MPTSAS_H
#define MPTSAS_H
+#include "exec/hwaddr.h"
#include "mpi.h"
#define MPTSAS_NUM_PORTS 8
diff --git a/include/disas/disas.h b/include/disas/disas.h
index 4930d78..8e221c3 100644
--- a/include/disas/disas.h
+++ b/include/disas/disas.h
@@ -1,6 +1,7 @@
#ifndef _QEMU_DISAS_H
#define _QEMU_DISAS_H
+#include "exec/hwaddr.h"
#include "qemu-common.h"
#ifdef NEED_CPU_H
diff --git a/include/hw/arm/sharpsl.h b/include/hw/arm/sharpsl.h
index 13981a6..b55d95a 100644
--- a/include/hw/arm/sharpsl.h
+++ b/include/hw/arm/sharpsl.h
@@ -3,9 +3,12 @@
*
* This file is licensed under the GNU GPL.
*/
+
#ifndef QEMU_SHARPSL_H
#define QEMU_SHARPSL_H
+#include "exec/hwaddr.h"
+
#define zaurus_printf(format, ...) \
fprintf(stderr, "%s: " format, __FUNCTION__, ##__VA_ARGS__)
diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc.h
index 1749dab..535ec90 100644
--- a/include/hw/block/fdc.h
+++ b/include/hw/block/fdc.h
@@ -1,6 +1,7 @@
#ifndef HW_FDC_H
#define HW_FDC_H
+#include "exec/hwaddr.h"
#include "qemu-common.h"
/* fdc.c */
diff --git a/include/hw/char/escc.h b/include/hw/char/escc.h
index 2742d70..ead9444 100644
--- a/include/hw/char/escc.h
+++ b/include/hw/char/escc.h
@@ -1,6 +1,8 @@
#ifndef HW_ESCC_H
#define HW_ESCC_H 1
+#include "exec/hwaddr.h"
+
/* escc.c */
#define TYPE_ESCC "escc"
#define ESCC_SIZE 4
diff --git a/include/hw/char/pl011.h b/include/hw/char/pl011.h
index 93bd7ee..e546030 100644
--- a/include/hw/char/pl011.h
+++ b/include/hw/char/pl011.h
@@ -15,6 +15,8 @@
#ifndef PL011_UART_H
#define PL011_UART_H
+#include "exec/hwaddr.h"
+
static inline DeviceState *pl011_create(hwaddr addr,
qemu_irq irq,
CharDriverState *chr)
diff --git a/include/hw/char/xilinx_uartlite.h
b/include/hw/char/xilinx_uartlite.h
index 8b4fc54..3e8a914 100644
--- a/include/hw/char/xilinx_uartlite.h
+++ b/include/hw/char/xilinx_uartlite.h
@@ -15,6 +15,8 @@
#ifndef XILINX_UARTLITE_H
#define XILINX_UARTLITE_H
+#include "exec/hwaddr.h"
+
static inline DeviceState *xilinx_uartlite_create(hwaddr addr,
qemu_irq irq,
CharDriverState *chr)
diff --git a/include/hw/cris/etraxfs_dma.h b/include/hw/cris/etraxfs_dma.h
index 38104a6..ed985b5 100644
--- a/include/hw/cris/etraxfs_dma.h
+++ b/include/hw/cris/etraxfs_dma.h
@@ -1,6 +1,8 @@
#ifndef HW_ETRAXFS_DMA_H
#define HW_ETRAXFS_DMA_H 1
+#include "exec/hwaddr.h"
+
struct dma_context_metadata {
/* data descriptor md */
uint16_t metadata;
diff --git a/include/hw/empty_slot.h b/include/hw/empty_slot.h
index 6079602..64b4b02 100644
--- a/include/hw/empty_slot.h
+++ b/include/hw/empty_slot.h
@@ -1,6 +1,8 @@
#ifndef HW_EMPTY_SLOT_H
#define HW_EMPTY_SLOT_H 1
+#include "exec/hwaddr.h"
+
/* empty_slot.c */
void empty_slot_init(hwaddr addr, uint64_t slot_size);
diff --git a/include/hw/misc/mips_cmgcr.h b/include/hw/misc/mips_cmgcr.h
index cc60eef..3c823ea 100644
--- a/include/hw/misc/mips_cmgcr.h
+++ b/include/hw/misc/mips_cmgcr.h
@@ -11,6 +11,7 @@
#define _MIPS_GCR_H
#define TYPE_MIPS_GCR "mips-gcr"
+#include "exec/hwaddr.h"
#define MIPS_GCR(obj) OBJECT_CHECK(MIPSGCRState, (obj), TYPE_MIPS_GCR)
#define GCR_BASE_ADDR 0x1fbf8000ULL
diff --git a/include/hw/pci-host/apb.h b/include/hw/pci-host/apb.h
index 736db61..824b5c6 100644
--- a/include/hw/pci-host/apb.h
+++ b/include/hw/pci-host/apb.h
@@ -1,6 +1,7 @@
#ifndef APB_PCI_H
#define APB_PCI_H
+#include "exec/hwaddr.h"
#include "qemu-common.h"
PCIBus *pci_apb_init(hwaddr special_base,
diff --git a/include/hw/sparc/sparc32_dma.h b/include/hw/sparc/sparc32_dma.h
index 9497b13..fbc95fd 100644
--- a/include/hw/sparc/sparc32_dma.h
+++ b/include/hw/sparc/sparc32_dma.h
@@ -1,6 +1,8 @@
#ifndef SPARC32_DMA_H
#define SPARC32_DMA_H
+#include "exec/hwaddr.h"
+
/* sparc32_dma.c */
void ledma_memory_read(void *opaque, hwaddr addr,
uint8_t *buf, int len, int do_bswap);
diff --git a/include/hw/timer/m48t59.h b/include/hw/timer/m48t59.h
index 3367923..aca90b3 100644
--- a/include/hw/timer/m48t59.h
+++ b/include/hw/timer/m48t59.h
@@ -1,6 +1,7 @@
#ifndef NVRAM_H
#define NVRAM_H
+#include "exec/hwaddr.h"
#include "qemu-common.h"
#include "qom/object.h"
diff --git a/include/sysemu/xen-mapcache.h b/include/sysemu/xen-mapcache.h
index c849489..93f3ecf 100644
--- a/include/sysemu/xen-mapcache.h
+++ b/include/sysemu/xen-mapcache.h
@@ -9,6 +9,7 @@
#ifndef XEN_MAPCACHE_H
#define XEN_MAPCACHE_H
+#include "exec/hwaddr.h"
typedef hwaddr (*phys_offset_to_gaddr_t)(hwaddr start_addr,
ram_addr_t size,
diff --git a/target-ppc/mmu-hash32.h b/target-ppc/mmu-hash32.h
index aaceacd..c9d04e4 100644
--- a/target-ppc/mmu-hash32.h
+++ b/target-ppc/mmu-hash32.h
@@ -3,6 +3,8 @@
#ifndef CONFIG_USER_ONLY
+#include "exec/hwaddr.h"
+
hwaddr get_pteg_offset32(PowerPCCPU *cpu, hwaddr hash);
hwaddr ppc_hash32_get_phys_page_debug(PowerPCCPU *cpu, target_ulong addr);
int ppc_hash32_handle_mmu_fault(PowerPCCPU *cpu, vaddr address, int rw,
diff --git a/tests/Makefile.include b/tests/Makefile.include
index cd2082a..732d6fa 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -496,7 +496,6 @@ blacklisted-headers :=
\
hw/usb/quirks.h \
hw/xtensa/bootparam.h \
include/block/write-threshold.h \
- include/disas/disas.h \
include/exec/cpu-all.h \
include/exec/cpu-defs.h \
include/exec/cpu_ldst.h \
@@ -523,17 +522,12 @@ blacklisted-headers :=
\
include/hw/arm/fsl-imx25.h \
include/hw/arm/fsl-imx31.h \
include/hw/arm/fsl-imx6.h \
- include/hw/arm/sharpsl.h \
include/hw/arm/xlnx-zynqmp.h \
- include/hw/block/fdc.h \
include/hw/block/flash.h \
- include/hw/char/escc.h \
include/hw/char/pl011.h \
include/hw/char/xilinx_uartlite.h \
include/hw/cris/etraxfs.h \
- include/hw/cris/etraxfs_dma.h \
include/hw/elf_ops.h \
- include/hw/empty_slot.h \
include/hw/i2c/aspeed_i2c.h \
include/hw/i2c/i2c-ddc.h \
include/hw/i2c/pm_smbus.h \
@@ -551,7 +545,6 @@ blacklisted-headers :=
\
include/hw/misc/mips_itu.h \
include/hw/net/allwinner_emac.h \
include/hw/nvram/openbios_firmware_abi.h \
- include/hw/pci-host/apb.h \
include/hw/pci-host/spapr.h \
include/hw/pci/pci_bus.h \
include/hw/pci/pcie_aer.h \
@@ -562,12 +555,10 @@ blacklisted-headers :=
\
include/hw/ppc/spapr_vio.h \
include/hw/ppc/xics.h \
include/hw/sparc/grlib.h \
- include/hw/sparc/sparc32_dma.h \
include/hw/ssi/xilinx_spips.h \
include/hw/timer/allwinner-a10-pit.h \
include/hw/timer/aspeed_timer.h \
include/hw/timer/i8254_internal.h \
- include/hw/timer/m48t59.h \
include/hw/virtio/virtio-access.h \
include/hw/virtio/virtio-input.h \
include/hw/virtio/virtio-rng.h \
--
2.5.5
- Re: [Qemu-devel] [PATCH RFC 4/5] include: Move typedef qemu_irq to qemu/typedefs.h, (continued)
[Qemu-devel] [PATCH RFC 3/5] include/qemu/typedefs.h: Restore alphabetical order, Markus Armbruster, 2016/06/23
[Qemu-devel] [PATCH RFC 1/5] Use #include "..." exactly for our own headers, Markus Armbruster, 2016/06/23
[Qemu-devel] [PATCH RFC 5/5] include: Include exec/hwaddr.h where hwaddr is used,
Markus Armbruster <=
[Qemu-devel] [PATCH RFC 2/5] tests: New make target check-headers, Markus Armbruster, 2016/06/23
Re: [Qemu-devel] [PATCH RFC 2/5] tests: New make target check-headers, Eric Blake, 2016/06/23