From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B5A9CA9EA0 for ; Fri, 18 Oct 2019 13:51:46 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 348A6222C3 for ; Fri, 18 Oct 2019 13:51:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 348A6222C3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iLSfI-0006fL-8s; Fri, 18 Oct 2019 13:51:36 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iLSfG-0006eM-Rt for xen-devel@lists.xenproject.org; Fri, 18 Oct 2019 13:51:34 +0000 X-Inumbo-ID: 6535eb98-f1ae-11e9-beca-bc764e2007e4 Received: from mx1.redhat.com (unknown [209.132.183.28]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 6535eb98-f1ae-11e9-beca-bc764e2007e4; Fri, 18 Oct 2019 13:51:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5F55F3073880; Fri, 18 Oct 2019 13:51:33 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.74]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E3F5560BF1; Fri, 18 Oct 2019 13:51:23 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Fri, 18 Oct 2019 15:47:53 +0200 Message-Id: <20191018134754.16362-20-philmd@redhat.com> In-Reply-To: <20191018134754.16362-1-philmd@redhat.com> References: <20191018134754.16362-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Fri, 18 Oct 2019 13:51:33 +0000 (UTC) Subject: [Xen-devel] [PATCH v2 19/20] hw/pci-host: Rename incorrectly named 'piix' as 'i440fx' X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , Marcel Apfelbaum , "Michael S. Tsirkin" , Paul Durrant , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Markovic , Igor Mammedov , Anthony Perard , xen-devel@lists.xenproject.org, Aleksandar Rikalo , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Eduardo Habkost Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" RnJvbTogUGhpbGlwcGUgTWF0aGlldS1EYXVkw6kgPGY0YnVnQGFtc2F0Lm9yZz4KCldlIG1vdmVk IGFsbCB0aGUgUElJWDMgc291dGhicmlkZ2UgY29kZSBvdXQgb2YgaHcvcGNpLWhvc3QvcGlpeC5j LAppdCBub3cgb25seSBjb250YWlucyBpNDQwRlggbm9ydGhicmlkZ2UgY29kZS4KUmVuYW1lIGl0 IHRvIG1hdGNoIHRoZSBjaGlwc2V0IG1vZGVsbGVkLgoKUmV2aWV3ZWQtYnk6IEFsZWtzYW5kYXIg TWFya292aWMgPGFtYXJrb3ZpY0B3YXZlY29tcC5jb20+ClNpZ25lZC1vZmYtYnk6IFBoaWxpcHBl IE1hdGhpZXUtRGF1ZMOpIDxwaGlsbWRAcmVkaGF0LmNvbT4KLS0tCiBNQUlOVEFJTkVSUyAgICAg ICAgICAgICAgICAgICAgICB8IDIgKy0KIGh3L2kzODYvS2NvbmZpZyAgICAgICAgICAgICAgICAg IHwgMiArLQogaHcvcGNpLWhvc3QvS2NvbmZpZyAgICAgICAgICAgICAgfCAyICstCiBody9wY2kt aG9zdC9NYWtlZmlsZS5vYmpzICAgICAgICB8IDIgKy0KIGh3L3BjaS1ob3N0L3twaWl4LmMgPT4g aTQ0MGZ4LmN9IHwgMAogNSBmaWxlcyBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDQgZGVsZXRp b25zKC0pCiByZW5hbWUgaHcvcGNpLWhvc3Qve3BpaXguYyA9PiBpNDQwZnguY30gKDEwMCUpCgpk aWZmIC0tZ2l0IGEvTUFJTlRBSU5FUlMgYi9NQUlOVEFJTkVSUwppbmRleCA0ODQ1ZjQ3ZDkzLi4x YmM5OTU5YjhhIDEwMDY0NAotLS0gYS9NQUlOVEFJTkVSUworKysgYi9NQUlOVEFJTkVSUwpAQCAt MTIyNSw3ICsxMjI1LDcgQEAgTTogTWFyY2VsIEFwZmVsYmF1bSA8bWFyY2VsLmFwZmVsYmF1bUBn bWFpbC5jb20+CiBTOiBTdXBwb3J0ZWQKIEY6IGluY2x1ZGUvaHcvaTM4Ni8KIEY6IGh3L2kzODYv Ci1GOiBody9wY2ktaG9zdC9waWl4LmMKK0Y6IGh3L3BjaS1ob3N0L2k0NDBmeC5jCiBGOiBody9w Y2ktaG9zdC9xMzUuYwogRjogaHcvcGNpLWhvc3QvcGFtLmMKIEY6IGluY2x1ZGUvaHcvcGNpLWhv c3QvaTQ0MGZ4LmgKZGlmZiAtLWdpdCBhL2h3L2kzODYvS2NvbmZpZyBiL2h3L2kzODYvS2NvbmZp ZwppbmRleCA1ODlkNzVlMjZhLi5jZmU5NGFlZGU3IDEwMDY0NAotLS0gYS9ody9pMzg2L0tjb25m aWcKKysrIGIvaHcvaTM4Ni9LY29uZmlnCkBAIC02MCw3ICs2MCw3IEBAIGNvbmZpZyBJNDQwRlgK ICAgICBzZWxlY3QgUENfUENJCiAgICAgc2VsZWN0IFBDX0FDUEkKICAgICBzZWxlY3QgQUNQSV9T TUJVUwotICAgIHNlbGVjdCBQQ0lfUElJWAorICAgIHNlbGVjdCBQQ0lfSTQ0MEZYCiAgICAgc2Vs ZWN0IFBJSVgzCiAgICAgc2VsZWN0IElERV9QSUlYCiAgICAgc2VsZWN0IERJTU0KZGlmZiAtLWdp dCBhL2h3L3BjaS1ob3N0L0tjb25maWcgYi9ody9wY2ktaG9zdC9LY29uZmlnCmluZGV4IDM5NzA0 M2IyODkuLmIwYWE4MzUxYzQgMTAwNjQ0Ci0tLSBhL2h3L3BjaS1ob3N0L0tjb25maWcKKysrIGIv aHcvcGNpLWhvc3QvS2NvbmZpZwpAQCAtMjgsNyArMjgsNyBAQCBjb25maWcgUENJX1NBQlJFCiAg ICAgc2VsZWN0IFBDSQogICAgIGJvb2wKIAotY29uZmlnIFBDSV9QSUlYCitjb25maWcgUENJX0k0 NDBGWAogICAgIGJvb2wKICAgICBzZWxlY3QgUENJCiAgICAgc2VsZWN0IFBBTQpkaWZmIC0tZ2l0 IGEvaHcvcGNpLWhvc3QvTWFrZWZpbGUub2JqcyBiL2h3L3BjaS1ob3N0L01ha2VmaWxlLm9ianMK aW5kZXggYTljZDNlMDIyZC4uZWZkNzUyYjc2NiAxMDA2NDQKLS0tIGEvaHcvcGNpLWhvc3QvTWFr ZWZpbGUub2JqcworKysgYi9ody9wY2ktaG9zdC9NYWtlZmlsZS5vYmpzCkBAIC0xMyw3ICsxMyw3 IEBAIGNvbW1vbi1vYmotJChDT05GSUdfVkVSU0FUSUxFX1BDSSkgKz0gdmVyc2F0aWxlLm8KIAog Y29tbW9uLW9iai0kKENPTkZJR19QQ0lfU0FCUkUpICs9IHNhYnJlLm8KIGNvbW1vbi1vYmotJChD T05GSUdfRlVMT05HKSArPSBib25pdG8ubwotY29tbW9uLW9iai0kKENPTkZJR19QQ0lfUElJWCkg Kz0gcGlpeC5vCitjb21tb24tb2JqLSQoQ09ORklHX1BDSV9JNDQwRlgpICs9IGk0NDBmeC5vCiBj b21tb24tb2JqLSQoQ09ORklHX1BDSV9FWFBSRVNTX1EzNSkgKz0gcTM1Lm8KIGNvbW1vbi1vYmot JChDT05GSUdfUENJX0VYUFJFU1NfR0VORVJJQ19CUklER0UpICs9IGdwZXgubwogY29tbW9uLW9i ai0kKENPTkZJR19QQ0lfRVhQUkVTU19YSUxJTlgpICs9IHhpbGlueC1wY2llLm8KZGlmZiAtLWdp dCBhL2h3L3BjaS1ob3N0L3BpaXguYyBiL2h3L3BjaS1ob3N0L2k0NDBmeC5jCnNpbWlsYXJpdHkg aW5kZXggMTAwJQpyZW5hbWUgZnJvbSBody9wY2ktaG9zdC9waWl4LmMKcmVuYW1lIHRvIGh3L3Bj aS1ob3N0L2k0NDBmeC5jCi0tIAoyLjIxLjAKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0 cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlz dGluZm8veGVuLWRldmVs From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9DC38CA9EA1 for ; Fri, 18 Oct 2019 14:02:00 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7232E21925 for ; Fri, 18 Oct 2019 14:02:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7232E21925 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLSpL-0001Vq-Fh for qemu-devel@archiver.kernel.org; Fri, 18 Oct 2019 10:01:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55433) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLSfI-00073x-ME for qemu-devel@nongnu.org; Fri, 18 Oct 2019 09:51:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLSfG-00075m-Gl for qemu-devel@nongnu.org; Fri, 18 Oct 2019 09:51:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51400) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iLSfG-00075T-8t for qemu-devel@nongnu.org; Fri, 18 Oct 2019 09:51:34 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5F55F3073880; Fri, 18 Oct 2019 13:51:33 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.74]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E3F5560BF1; Fri, 18 Oct 2019 13:51:23 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 19/20] hw/pci-host: Rename incorrectly named 'piix' as 'i440fx' Date: Fri, 18 Oct 2019 15:47:53 +0200 Message-Id: <20191018134754.16362-20-philmd@redhat.com> In-Reply-To: <20191018134754.16362-1-philmd@redhat.com> References: <20191018134754.16362-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Fri, 18 Oct 2019 13:51:33 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , "Michael S. Tsirkin" , Paul Durrant , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Markovic , Igor Mammedov , Anthony Perard , xen-devel@lists.xenproject.org, Aleksandar Rikalo , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Eduardo Habkost Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daud=C3=A9 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. Reviewed-by: Aleksandar Markovic Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- MAINTAINERS | 2 +- hw/i386/Kconfig | 2 +- hw/pci-host/Kconfig | 2 +- hw/pci-host/Makefile.objs | 2 +- hw/pci-host/{piix.c =3D> i440fx.c} | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename hw/pci-host/{piix.c =3D> i440fx.c} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 4845f47d93..1bc9959b8a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1225,7 +1225,7 @@ M: Marcel Apfelbaum 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 =20 -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) +=3D versatile.o =20 common-obj-$(CONFIG_PCI_SABRE) +=3D sabre.o common-obj-$(CONFIG_FULONG) +=3D bonito.o -common-obj-$(CONFIG_PCI_PIIX) +=3D piix.o +common-obj-$(CONFIG_PCI_I440FX) +=3D i440fx.o common-obj-$(CONFIG_PCI_EXPRESS_Q35) +=3D q35.o common-obj-$(CONFIG_PCI_EXPRESS_GENERIC_BRIDGE) +=3D gpex.o common-obj-$(CONFIG_PCI_EXPRESS_XILINX) +=3D 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 --=20 2.21.0