[Qemu-devel] [PATCH RFC v3 4/5] Include exec/hwaddr.h where hwaddr is used

[Markus Armbruster <armbru@redhat.com>]

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 <armbru@redhat.com>
---
 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             | 3 +--
 include/hw/arm/sharpsl.h          | 4 ++--
 include/hw/block/fdc.h            | 3 +--
 include/hw/char/escc.h            | 3 +--
 include/hw/char/pl011.h           | 1 +
 include/hw/char/xilinx_uartlite.h | 1 +
 include/hw/cris/etraxfs_dma.h     | 3 +--
 include/hw/empty_slot.h           | 4 ++--
 include/hw/misc/mips_cmgcr.h      | 1 +
 include/hw/pci-host/apb.h         | 3 +--
 include/hw/sparc/sparc32_dma.h    | 4 ++--
 include/hw/timer/m48t59.h         | 3 +--
 include/sysemu/xen-mapcache.h     | 1 +
 target-ppc/mmu-hash32.h           | 2 ++
 19 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/hw/audio/lm4549.h b/hw/audio/lm4549.h
index 503c8e9..e03f6b8 100644
--- a/hw/audio/lm4549.h
+++ b/hw/audio/lm4549.h
@@ -15,6 +15,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 2aa4355..57cc13e 100644
--- a/hw/cris/boot.h
+++ b/hw/cris/boot.h
@@ -3,6 +3,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 fcc1ca2..098f32e 100644
--- a/hw/net/e1000e_core.h
+++ b/hw/net/e1000e_core.h
@@ -35,6 +35,11 @@
 
 /* FIXME Does not pass make check-headers, yet! */
 
+#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)
@@ -146,3 +151,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 cad4098..899e535 100644
--- a/hw/net/vmware_utils.h
+++ b/hw/net/vmware_utils.h
@@ -19,6 +19,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 b1b138d..228aaa7 100644
--- a/hw/scsi/mptsas.h
+++ b/hw/scsi/mptsas.h
@@ -3,6 +3,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 b665558..8e221c3 100644
--- a/include/disas/disas.h
+++ b/include/disas/disas.h
@@ -1,8 +1,7 @@
-/* FIXME Does not pass make check-headers, yet! */
-
 #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 a899cbd..b55d95a 100644
--- a/include/hw/arm/sharpsl.h
+++ b/include/hw/arm/sharpsl.h
@@ -4,11 +4,11 @@
  * This file is licensed under the GNU GPL.
  */
 
-/* FIXME Does not pass make check-headers, yet! */
-
 #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 4c5d3c5..0f6db73 100644
--- a/include/hw/block/fdc.h
+++ b/include/hw/block/fdc.h
@@ -1,8 +1,7 @@
-/* FIXME Does not pass make check-headers, yet! */
-
 #ifndef HW_FDC_H
 #define HW_FDC_H
 
+#include "exec/hwaddr.h"
 #include "hw/irq.h"
 #include "qemu-common.h"
 
diff --git a/include/hw/char/escc.h b/include/hw/char/escc.h
index b37fa76..d1e1e6c 100644
--- a/include/hw/char/escc.h
+++ b/include/hw/char/escc.h
@@ -1,8 +1,7 @@
-/* FIXME Does not pass make check-headers, yet! */
-
 #ifndef HW_ESCC_H
 #define HW_ESCC_H 1
 
+#include "exec/hwaddr.h"
 #include "hw/irq.h"
 
 /* escc.c */
diff --git a/include/hw/char/pl011.h b/include/hw/char/pl011.h
index bbb7a1f..8b898b2 100644
--- a/include/hw/char/pl011.h
+++ b/include/hw/char/pl011.h
@@ -17,6 +17,7 @@
 #ifndef PL011_UART_H
 #define PL011_UART_H
 
+#include "exec/hwaddr.h"
 #include "hw/irq.h"
 
 static inline DeviceState *pl011_create(hwaddr addr,
diff --git a/include/hw/char/xilinx_uartlite.h b/include/hw/char/xilinx_uartlite.h
index f9070f8..8353475 100644
--- a/include/hw/char/xilinx_uartlite.h
+++ b/include/hw/char/xilinx_uartlite.h
@@ -17,6 +17,7 @@
 #ifndef XILINX_UARTLITE_H
 #define XILINX_UARTLITE_H
 
+#include "exec/hwaddr.h"
 #include "hw/irq.h"
 
 static inline DeviceState *xilinx_uartlite_create(hwaddr addr,
diff --git a/include/hw/cris/etraxfs_dma.h b/include/hw/cris/etraxfs_dma.h
index 925e289..5526756 100644
--- a/include/hw/cris/etraxfs_dma.h
+++ b/include/hw/cris/etraxfs_dma.h
@@ -1,8 +1,7 @@
-/* FIXME Does not pass make check-headers, yet! */
-
 #ifndef HW_ETRAXFS_DMA_H
 #define HW_ETRAXFS_DMA_H 1
 
+#include "exec/hwaddr.h"
 #include "hw/irq.h"
 
 struct dma_context_metadata {
diff --git a/include/hw/empty_slot.h b/include/hw/empty_slot.h
index e148923..64b4b02 100644
--- a/include/hw/empty_slot.h
+++ b/include/hw/empty_slot.h
@@ -1,8 +1,8 @@
-/* FIXME Does not pass make check-headers, yet! */
-
 #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 504a2b2..8a3f4d7 100644
--- a/include/hw/misc/mips_cmgcr.h
+++ b/include/hw/misc/mips_cmgcr.h
@@ -13,6 +13,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 c059fe2..9a6e058 100644
--- a/include/hw/pci-host/apb.h
+++ b/include/hw/pci-host/apb.h
@@ -1,8 +1,7 @@
-/* FIXME Does not pass make check-headers, yet! */
-
 #ifndef APB_PCI_H
 #define APB_PCI_H
 
+#include "exec/hwaddr.h"
 #include "hw/irq.h"
 #include "qemu-common.h"
 
diff --git a/include/hw/sparc/sparc32_dma.h b/include/hw/sparc/sparc32_dma.h
index 844a659..fbc95fd 100644
--- a/include/hw/sparc/sparc32_dma.h
+++ b/include/hw/sparc/sparc32_dma.h
@@ -1,8 +1,8 @@
-/* FIXME Does not pass make check-headers, yet! */
-
 #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 06e1f44..dd0bf7c 100644
--- a/include/hw/timer/m48t59.h
+++ b/include/hw/timer/m48t59.h
@@ -1,8 +1,7 @@
-/* FIXME Does not pass make check-headers, yet! */
-
 #ifndef NVRAM_H
 #define NVRAM_H
 
+#include "exec/hwaddr.h"
 #include "hw/irq.h"
 #include "qemu-common.h"
 #include "qom/object.h"
diff --git a/include/sysemu/xen-mapcache.h b/include/sysemu/xen-mapcache.h
index 6e5f98a..10becd1 100644
--- a/include/sysemu/xen-mapcache.h
+++ b/include/sysemu/xen-mapcache.h
@@ -11,6 +11,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 a621fb9..f345da1 100644
--- a/target-ppc/mmu-hash32.h
+++ b/target-ppc/mmu-hash32.h
@@ -5,6 +5,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,
-- 
2.5.5