| Message ID | 20191213161753.8051-7-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/i386/pc: Move PC-machine specific declarations to 'pc_internal.h' | expand |
On 13/12/19 17:17, Philippe Mathieu-Daudé wrote: > 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é <philmd@redhat.com> > --- > 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" > Queued, thanks. Paolo
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"
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é <philmd@redhat.com> --- 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(-)