[Qemu-devel] [PATCH 17/29] piix: move piix4 declaration into new southbridge/i82371_piix.h

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
 include/hw/i386/pc.h                 |  2 --
 include/hw/southbridge/i82371_piix.h | 17 +++++++++++++++++
 hw/isa/piix4.c                       |  1 +
 hw/mips/gt64xxx_pci.c                |  1 +
 MAINTAINERS                          |  1 +
 5 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 include/hw/southbridge/i82371_piix.h

diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index d2b67e44a7..195c02febe 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -272,8 +272,6 @@ PCIBus *i440fx_init(const char *host_type, const char 
*pci_type,
                     MemoryRegion *ram_memory);
 
 PCIBus *find_i440fx(void);
-/* piix4.c */
-extern PCIDevice *piix4_dev;
 
 /* pc_sysfw.c */
 void pc_system_firmware_init(MemoryRegion *rom_memory,
diff --git a/include/hw/southbridge/i82371_piix.h 
b/include/hw/southbridge/i82371_piix.h
new file mode 100644
index 0000000000..95ac25becd
--- /dev/null
+++ b/include/hw/southbridge/i82371_piix.h
@@ -0,0 +1,17 @@
+/*
+ * Intel 82371 PIIX South Bridge Emulation
+ *
+ * Copyright (c) 2018 Philippe Mathieu-Daudé
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+#ifndef HW_ISA_PIIX_H
+#define HW_ISA_PIIX_H
+
+#include "hw/pci/pci.h"
+
+/* piix4.c */
+extern PCIDevice *piix4_dev;
+
+#endif /* HW_ISA_PIIX_H */
diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index c19aa5a74f..b0f6a0a342 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -28,6 +28,7 @@
 #include "hw/i386/pc.h"
 #include "hw/pci/pci.h"
 #include "hw/isa/isa.h"
+#include "hw/southbridge/i82371_piix.h"
 #include "hw/sysbus.h"
 
 PCIDevice *piix4_dev;
diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c
index 5a9dad9aae..24cc4044d7 100644
--- a/hw/mips/gt64xxx_pci.c
+++ b/hw/mips/gt64xxx_pci.c
@@ -28,6 +28,7 @@
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_host.h"
 #include "hw/i386/pc.h"
+#include "hw/southbridge/i82371_piix.h"
 #include "exec/address-spaces.h"
 
 //#define DEBUG
diff --git a/MAINTAINERS b/MAINTAINERS
index 6f867da743..cead15b69b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -888,6 +888,7 @@ F: include/hw/dma/i8257.h
 F: include/hw/i2c/pm_smbus.h
 F: include/hw/isa/superio.h
 F: include/hw/input/i8042.h
+F: include/hw/southbridge/i82371_piix.h
 F: include/hw/timer/hpet.h
 F: include/hw/timer/i8254*
 F: include/hw/timer/mc146818rtc*
-- 
2.15.1