[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 06/12] hw/i386/ich9: Move unnecessary "pci_bridge.h" include
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 06/12] hw/i386/ich9: Move unnecessary "pci_bridge.h" include |
Date: |
Fri, 13 Dec 2019 17:17:47 +0100 |
While the ICH9 chipset is a 'South Bridge', it is not a PCI bridge.
Nothing in "hw/i386/ich9.h" requires definitions from "pci_bridge.h"
so move its inclusion where it is required.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
include/hw/i386/ich9.h | 1 -
hw/i386/acpi-build.c | 1 +
hw/pci-bridge/i82801b11.c | 1 +
3 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/hw/i386/ich9.h b/include/hw/i386/ich9.h
index eeb79ac1fe..369bc64671 100644
--- a/include/hw/i386/ich9.h
+++ b/include/hw/i386/ich9.h
@@ -7,7 +7,6 @@
#include "hw/isa/apm.h"
#include "hw/i386/ioapic.h"
#include "hw/pci/pci.h"
-#include "hw/pci/pci_bridge.h"
#include "hw/acpi/acpi.h"
#include "hw/acpi/ich9.h"
#include "hw/pci/pci_bus.h"
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 12ff55fcfb..291909fa05 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -27,6 +27,7 @@
#include "qemu/bitmap.h"
#include "qemu/error-report.h"
#include "hw/pci/pci.h"
+#include "hw/pci/pci_bridge.h"
#include "hw/core/cpu.h"
#include "target/i386/cpu.h"
#include "hw/misc/pvpanic.h"
diff --git a/hw/pci-bridge/i82801b11.c b/hw/pci-bridge/i82801b11.c
index 2b3907655b..033b3c43c4 100644
--- a/hw/pci-bridge/i82801b11.c
+++ b/hw/pci-bridge/i82801b11.c
@@ -43,6 +43,7 @@
#include "qemu/osdep.h"
#include "hw/pci/pci.h"
+#include "hw/pci/pci_bridge.h"
#include "migration/vmstate.h"
#include "qemu/module.h"
#include "hw/i386/ich9.h"
--
2.21.0
- [PATCH 00/12] hw/i386/pc: Move PC-machine specific declarations to 'pc_internal.h', Philippe Mathieu-Daudé, 2019/12/13
- [PATCH 01/12] hw/i386/pc: Convert DPRINTF() to trace events, Philippe Mathieu-Daudé, 2019/12/13
- [PATCH 02/12] hw/i386/pc: Move kvm_i8259_init() declaration to sysemu/kvm.h, Philippe Mathieu-Daudé, 2019/12/13
- [PATCH 03/12] hw/i386/pc: Remove obsolete pc_pci_device_init() declaration, Philippe Mathieu-Daudé, 2019/12/13
- [PATCH 04/12] hw/i386/pc: Remove obsolete cpu_set_smm_t typedef, Philippe Mathieu-Daudé, 2019/12/13
- [PATCH 05/12] hw/i386/ich9: Remove unused include, Philippe Mathieu-Daudé, 2019/12/13
- [PATCH 06/12] hw/i386/ich9: Move unnecessary "pci_bridge.h" include,
Philippe Mathieu-Daudé <=
- [PATCH 07/12] hw/ide/piix: Remove superfluous DEVICE() cast, Philippe Mathieu-Daudé, 2019/12/13
- [PATCH 08/12] hw/ide/piix: Use ARRAY_SIZE() instead of magic numbers, Philippe Mathieu-Daudé, 2019/12/13
- [PATCH 09/12] hw/intc/ioapic: Make ioapic_print_redtbl() static, Philippe Mathieu-Daudé, 2019/12/13
- [PATCH 10/12] hw/i386/pc: Rename allocate_cpu_irq from 'pc' to 'x86_machine', Philippe Mathieu-Daudé, 2019/12/13
- [PATCH 11/12] hw/i386/pc: Move x86_machine_allocate_cpu_irq() to 'hw/i386/x86.c', Philippe Mathieu-Daudé, 2019/12/13
- [PATCH 12/12] hw/i386/pc: Move PC-machine specific declarations to 'pc_internal.h', Philippe Mathieu-Daudé, 2019/12/13