| Message ID | 20191015162705.28087-32-philmd@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | hw/i386/pc: Split PIIX3 southbridge from i440FX northbridge | expand |
On Tuesday, October 15, 2019, Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > From: Philippe Mathieu-Daudé <f4bug@amsat.org> > > We moved all the PIIX3 southbridge code out of hw/pci-host/piix.c, > it now only contains i440FX northbridge code. > Rename it to match the chipset modelled. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > MAINTAINERS | 2 +- > hw/i386/Kconfig | 2 +- > hw/pci-host/Kconfig | 2 +- > hw/pci-host/Makefile.objs | 2 +- > hw/pci-host/{piix.c => i440fx.c} | 0 > 5 files changed, 4 insertions(+), 4 deletions(-) > rename hw/pci-host/{piix.c => i440fx.c} (100%) > > Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com> > diff --git a/MAINTAINERS b/MAINTAINERS > index 4845f47d93..1bc9959b8a 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1225,7 +1225,7 @@ M: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> > S: Supported > F: include/hw/i386/ > F: hw/i386/ > -F: hw/pci-host/piix.c > +F: hw/pci-host/i440fx.c > F: hw/pci-host/q35.c > F: hw/pci-host/pam.c > F: include/hw/pci-host/i440fx.h > diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig > index 589d75e26a..cfe94aede7 100644 > --- a/hw/i386/Kconfig > +++ b/hw/i386/Kconfig > @@ -60,7 +60,7 @@ config I440FX > select PC_PCI > select PC_ACPI > select ACPI_SMBUS > - select PCI_PIIX > + select PCI_I440FX > select PIIX3 > select IDE_PIIX > select DIMM > diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig > index 397043b289..b0aa8351c4 100644 > --- a/hw/pci-host/Kconfig > +++ b/hw/pci-host/Kconfig > @@ -28,7 +28,7 @@ config PCI_SABRE > select PCI > bool > > -config PCI_PIIX > +config PCI_I440FX > bool > select PCI > select PAM > diff --git a/hw/pci-host/Makefile.objs b/hw/pci-host/Makefile.objs > index a9cd3e022d..efd752b766 100644 > --- a/hw/pci-host/Makefile.objs > +++ b/hw/pci-host/Makefile.objs > @@ -13,7 +13,7 @@ common-obj-$(CONFIG_VERSATILE_PCI) += versatile.o > > common-obj-$(CONFIG_PCI_SABRE) += sabre.o > common-obj-$(CONFIG_FULONG) += bonito.o > -common-obj-$(CONFIG_PCI_PIIX) += piix.o > +common-obj-$(CONFIG_PCI_I440FX) += i440fx.o > common-obj-$(CONFIG_PCI_EXPRESS_Q35) += q35.o > common-obj-$(CONFIG_PCI_EXPRESS_GENERIC_BRIDGE) += gpex.o > common-obj-$(CONFIG_PCI_EXPRESS_XILINX) += xilinx-pcie.o > diff --git a/hw/pci-host/piix.c b/hw/pci-host/i440fx.c > similarity index 100% > rename from hw/pci-host/piix.c > rename to hw/pci-host/i440fx.c > -- > 2.21.0 > > >
diff --git a/MAINTAINERS b/MAINTAINERS index 4845f47d93..1bc9959b8a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1225,7 +1225,7 @@ M: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> S: Supported F: include/hw/i386/ F: hw/i386/ -F: hw/pci-host/piix.c +F: hw/pci-host/i440fx.c F: hw/pci-host/q35.c F: hw/pci-host/pam.c F: include/hw/pci-host/i440fx.h diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 589d75e26a..cfe94aede7 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -60,7 +60,7 @@ config I440FX select PC_PCI select PC_ACPI select ACPI_SMBUS - select PCI_PIIX + select PCI_I440FX select PIIX3 select IDE_PIIX select DIMM diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig index 397043b289..b0aa8351c4 100644 --- a/hw/pci-host/Kconfig +++ b/hw/pci-host/Kconfig @@ -28,7 +28,7 @@ config PCI_SABRE select PCI bool -config PCI_PIIX +config PCI_I440FX bool select PCI select PAM diff --git a/hw/pci-host/Makefile.objs b/hw/pci-host/Makefile.objs index a9cd3e022d..efd752b766 100644 --- a/hw/pci-host/Makefile.objs +++ b/hw/pci-host/Makefile.objs @@ -13,7 +13,7 @@ common-obj-$(CONFIG_VERSATILE_PCI) += versatile.o common-obj-$(CONFIG_PCI_SABRE) += sabre.o common-obj-$(CONFIG_FULONG) += bonito.o -common-obj-$(CONFIG_PCI_PIIX) += piix.o +common-obj-$(CONFIG_PCI_I440FX) += i440fx.o common-obj-$(CONFIG_PCI_EXPRESS_Q35) += q35.o common-obj-$(CONFIG_PCI_EXPRESS_GENERIC_BRIDGE) += gpex.o common-obj-$(CONFIG_PCI_EXPRESS_XILINX) += xilinx-pcie.o diff --git a/hw/pci-host/piix.c b/hw/pci-host/i440fx.c similarity index 100% rename from hw/pci-host/piix.c rename to hw/pci-host/i440fx.c