| Message ID | 20230131115326.12454-20-shentey@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | PC and ICH9 cleanups | expand |
On Tue, 31 Jan 2023 12:53:25 +0100 Bernhard Beschow <shentey@gmail.com> wrote: this lacks commit description explaining below movements > Signed-off-by: Bernhard Beschow <shentey@gmail.com> > --- > include/hw/i386/ich9.h | 8 +++++--- > hw/i386/acpi-build.c | 1 + > hw/isa/lpc_ich9.c | 2 +- > 3 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/include/hw/i386/ich9.h b/include/hw/i386/ich9.h > index d29090a9b7..3125863049 100644 > --- a/include/hw/i386/ich9.h > +++ b/include/hw/i386/ich9.h > @@ -1,11 +1,13 @@ > #ifndef HW_ICH9_H > #define HW_ICH9_H > > -#include "hw/sysbus.h" > -#include "hw/i386/pc.h" > #include "hw/isa/apm.h" > -#include "hw/acpi/acpi.h" > #include "hw/acpi/ich9.h" > +#include "hw/intc/ioapic.h" > +#include "hw/pci/pci.h" > +#include "hw/pci/pci_device.h" > +#include "exec/memory.h" > +#include "qemu/notify.h" > #include "qom/object.h" > > void ich9_generate_smi(void); > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 127c4e2d50..266df7a153 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -59,6 +59,7 @@ > #include "hw/acpi/pcihp.h" > #include "hw/i386/fw_cfg.h" > #include "hw/i386/ich9.h" > +#include "hw/i386/pc.h" > #include "hw/pci/pci_bus.h" > #include "hw/pci-host/i440fx.h" > #include "hw/pci-host/q35.h" > diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c > index 808c572ae4..f508f6071e 100644 > --- a/hw/isa/lpc_ich9.c > +++ b/hw/isa/lpc_ich9.c > @@ -40,8 +40,8 @@ > #include "hw/irq.h" > #include "hw/isa/apm.h" > #include "hw/pci/pci.h" > -#include "hw/pci/pci_bridge.h" > #include "hw/i386/ich9.h" > +#include "hw/i386/pc.h" > #include "hw/acpi/acpi.h" > #include "hw/acpi/ich9.h" > #include "hw/pci/pci_bus.h"
diff --git a/include/hw/i386/ich9.h b/include/hw/i386/ich9.h index d29090a9b7..3125863049 100644 --- a/include/hw/i386/ich9.h +++ b/include/hw/i386/ich9.h @@ -1,11 +1,13 @@ #ifndef HW_ICH9_H #define HW_ICH9_H -#include "hw/sysbus.h" -#include "hw/i386/pc.h" #include "hw/isa/apm.h" -#include "hw/acpi/acpi.h" #include "hw/acpi/ich9.h" +#include "hw/intc/ioapic.h" +#include "hw/pci/pci.h" +#include "hw/pci/pci_device.h" +#include "exec/memory.h" +#include "qemu/notify.h" #include "qom/object.h" void ich9_generate_smi(void); diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 127c4e2d50..266df7a153 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -59,6 +59,7 @@ #include "hw/acpi/pcihp.h" #include "hw/i386/fw_cfg.h" #include "hw/i386/ich9.h" +#include "hw/i386/pc.h" #include "hw/pci/pci_bus.h" #include "hw/pci-host/i440fx.h" #include "hw/pci-host/q35.h" diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index 808c572ae4..f508f6071e 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -40,8 +40,8 @@ #include "hw/irq.h" #include "hw/isa/apm.h" #include "hw/pci/pci.h" -#include "hw/pci/pci_bridge.h" #include "hw/i386/ich9.h" +#include "hw/i386/pc.h" #include "hw/acpi/acpi.h" #include "hw/acpi/ich9.h" #include "hw/pci/pci_bus.h"
Signed-off-by: Bernhard Beschow <shentey@gmail.com> --- include/hw/i386/ich9.h | 8 +++++--- hw/i386/acpi-build.c | 1 + hw/isa/lpc_ich9.c | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-)