aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>2022-05-04 10:25:51 +0100
committerMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>2022-05-08 18:52:37 +0100
commit134ba73f32036256e0a89bcd166ddbe1fd19b824 (patch)
treebc6f7139dcbda53a3913fc8fae19838e915876c7
parent8e81ffe32070490b27d8e9ccac48a3f470e19c96 (diff)
hppa: move device headers from hppa_sys.h into individual .c files
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Acked-by: Helge Deller <deller@gmx.de> Message-Id: <20220504092600.10048-42-mark.cave-ayland@ilande.co.uk> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
-rw-r--r--hw/hppa/hppa_sys.h3
-rw-r--r--hw/hppa/lasi.h4
-rw-r--r--hw/hppa/machine.c2
-rw-r--r--hw/hppa/pci.c3
4 files changed, 9 insertions, 3 deletions
diff --git a/hw/hppa/hppa_sys.h b/hw/hppa/hppa_sys.h
index f7a127be19..9964d4a7a7 100644
--- a/hw/hppa/hppa_sys.h
+++ b/hw/hppa/hppa_sys.h
@@ -3,10 +3,7 @@
#ifndef HW_HPPA_SYS_H
#define HW_HPPA_SYS_H
-#include "hw/pci/pci.h"
-#include "hw/pci/pci_host.h"
#include "hw/boards.h"
-#include "hw/intc/i8259.h"
#include "hppa_hardware.h"
diff --git a/hw/hppa/lasi.h b/hw/hppa/lasi.h
index 11cf7d6b0b..ecc7065ce8 100644
--- a/hw/hppa/lasi.h
+++ b/hw/hppa/lasi.h
@@ -12,6 +12,10 @@
#ifndef LASI_H
#define LASI_H
+#include "exec/address-spaces.h"
+#include "hw/pci/pci_host.h"
+#include "hw/boards.h"
+
#define TYPE_LASI_CHIP "lasi-chip"
OBJECT_DECLARE_SIMPLE_TYPE(LasiState, LASI_CHIP)
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index 58b25ca5bc..9d904b7a60 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -16,9 +16,11 @@
#include "hw/timer/i8254.h"
#include "hw/char/serial.h"
#include "hw/char/parallel.h"
+#include "hw/intc/i8259.h"
#include "hw/input/lasips2.h"
#include "hw/net/lasi_82596.h"
#include "hw/nmi.h"
+#include "hw/pci/pci.h"
#include "hw/pci-host/dino.h"
#include "lasi.h"
#include "hppa_sys.h"
diff --git a/hw/hppa/pci.c b/hw/hppa/pci.c
index 32609aba63..a92dcb6b9e 100644
--- a/hw/hppa/pci.c
+++ b/hw/hppa/pci.c
@@ -6,6 +6,9 @@
#include "qemu/osdep.h"
#include "hppa_sys.h"
#include "qemu/log.h"
+#include "hw/pci/pci.h"
+#include "hw/pci/pci_host.h"
+#include "hw/intc/i8259.h"
#include "trace.h"