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 D0FAFC10F14 for ; Tue, 15 Oct 2019 16:33:38 +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 AB6F620873 for ; Tue, 15 Oct 2019 16:33:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AB6F620873 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 1iKPlJ-0006MS-5W; Tue, 15 Oct 2019 16:33:29 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iKPlI-0006M1-BN for xen-devel@lists.xenproject.org; Tue, 15 Oct 2019 16:33:28 +0000 X-Inumbo-ID: 83fb29fe-ef69-11e9-bbab-bc764e2007e4 Received: from mx1.redhat.com (unknown [209.132.183.28]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 83fb29fe-ef69-11e9-bbab-bc764e2007e4; Tue, 15 Oct 2019 16:33:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 61EB97BDA9; Tue, 15 Oct 2019 16:33:27 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-35.brq.redhat.com [10.40.204.35]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F265B4100; Tue, 15 Oct 2019 16:33:15 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 15 Oct 2019 18:27:04 +0200 Message-Id: <20191015162705.28087-32-philmd@redhat.com> In-Reply-To: <20191015162705.28087-1-philmd@redhat.com> References: <20191015162705.28087-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 15 Oct 2019 16:33:27 +0000 (UTC) Subject: [Xen-devel] [PATCH 31/32] 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: Laurent Vivier , Thomas Huth , Stefano Stabellini , Eduardo Habkost , kvm@vger.kernel.org, Paul Durrant , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Markovic , xen-devel@lists.xenproject.org, Anthony Perard , Igor Mammedov , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Richard Henderson 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 IHRvIG1hdGNoIHRoZSBjaGlwc2V0IG1vZGVsbGVkLgoKU2lnbmVkLW9mZi1ieTogUGhpbGlwcGUg TWF0aGlldS1EYXVkw6kgPHBoaWxtZEByZWRoYXQuY29tPgotLS0KIE1BSU5UQUlORVJTICAgICAg ICAgICAgICAgICAgICAgIHwgMiArLQogaHcvaTM4Ni9LY29uZmlnICAgICAgICAgICAgICAgICAg fCAyICstCiBody9wY2ktaG9zdC9LY29uZmlnICAgICAgICAgICAgICB8IDIgKy0KIGh3L3BjaS1o b3N0L01ha2VmaWxlLm9ianMgICAgICAgIHwgMiArLQogaHcvcGNpLWhvc3Qve3BpaXguYyA9PiBp NDQwZnguY30gfCAwCiA1IGZpbGVzIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlv bnMoLSkKIHJlbmFtZSBody9wY2ktaG9zdC97cGlpeC5jID0+IGk0NDBmeC5jfSAoMTAwJSkKCmRp ZmYgLS1naXQgYS9NQUlOVEFJTkVSUyBiL01BSU5UQUlORVJTCmluZGV4IDQ4NDVmNDdkOTMuLjFi Yzk5NTliOGEgMTAwNjQ0Ci0tLSBhL01BSU5UQUlORVJTCisrKyBiL01BSU5UQUlORVJTCkBAIC0x MjI1LDcgKzEyMjUsNyBAQCBNOiBNYXJjZWwgQXBmZWxiYXVtIDxtYXJjZWwuYXBmZWxiYXVtQGdt YWlsLmNvbT4KIFM6IFN1cHBvcnRlZAogRjogaW5jbHVkZS9ody9pMzg2LwogRjogaHcvaTM4Ni8K LUY6IGh3L3BjaS1ob3N0L3BpaXguYworRjogaHcvcGNpLWhvc3QvaTQ0MGZ4LmMKIEY6IGh3L3Bj aS1ob3N0L3EzNS5jCiBGOiBody9wY2ktaG9zdC9wYW0uYwogRjogaW5jbHVkZS9ody9wY2ktaG9z dC9pNDQwZnguaApkaWZmIC0tZ2l0IGEvaHcvaTM4Ni9LY29uZmlnIGIvaHcvaTM4Ni9LY29uZmln CmluZGV4IDU4OWQ3NWUyNmEuLmNmZTk0YWVkZTcgMTAwNjQ0Ci0tLSBhL2h3L2kzODYvS2NvbmZp ZworKysgYi9ody9pMzg2L0tjb25maWcKQEAgLTYwLDcgKzYwLDcgQEAgY29uZmlnIEk0NDBGWAog ICAgIHNlbGVjdCBQQ19QQ0kKICAgICBzZWxlY3QgUENfQUNQSQogICAgIHNlbGVjdCBBQ1BJX1NN QlVTCi0gICAgc2VsZWN0IFBDSV9QSUlYCisgICAgc2VsZWN0IFBDSV9JNDQwRlgKICAgICBzZWxl Y3QgUElJWDMKICAgICBzZWxlY3QgSURFX1BJSVgKICAgICBzZWxlY3QgRElNTQpkaWZmIC0tZ2l0 IGEvaHcvcGNpLWhvc3QvS2NvbmZpZyBiL2h3L3BjaS1ob3N0L0tjb25maWcKaW5kZXggMzk3MDQz YjI4OS4uYjBhYTgzNTFjNCAxMDA2NDQKLS0tIGEvaHcvcGNpLWhvc3QvS2NvbmZpZworKysgYi9o dy9wY2ktaG9zdC9LY29uZmlnCkBAIC0yOCw3ICsyOCw3IEBAIGNvbmZpZyBQQ0lfU0FCUkUKICAg ICBzZWxlY3QgUENJCiAgICAgYm9vbAogCi1jb25maWcgUENJX1BJSVgKK2NvbmZpZyBQQ0lfSTQ0 MEZYCiAgICAgYm9vbAogICAgIHNlbGVjdCBQQ0kKICAgICBzZWxlY3QgUEFNCmRpZmYgLS1naXQg YS9ody9wY2ktaG9zdC9NYWtlZmlsZS5vYmpzIGIvaHcvcGNpLWhvc3QvTWFrZWZpbGUub2Jqcwpp bmRleCBhOWNkM2UwMjJkLi5lZmQ3NTJiNzY2IDEwMDY0NAotLS0gYS9ody9wY2ktaG9zdC9NYWtl ZmlsZS5vYmpzCisrKyBiL2h3L3BjaS1ob3N0L01ha2VmaWxlLm9ianMKQEAgLTEzLDcgKzEzLDcg QEAgY29tbW9uLW9iai0kKENPTkZJR19WRVJTQVRJTEVfUENJKSArPSB2ZXJzYXRpbGUubwogCiBj b21tb24tb2JqLSQoQ09ORklHX1BDSV9TQUJSRSkgKz0gc2FicmUubwogY29tbW9uLW9iai0kKENP TkZJR19GVUxPTkcpICs9IGJvbml0by5vCi1jb21tb24tb2JqLSQoQ09ORklHX1BDSV9QSUlYKSAr PSBwaWl4Lm8KK2NvbW1vbi1vYmotJChDT05GSUdfUENJX0k0NDBGWCkgKz0gaTQ0MGZ4Lm8KIGNv bW1vbi1vYmotJChDT05GSUdfUENJX0VYUFJFU1NfUTM1KSArPSBxMzUubwogY29tbW9uLW9iai0k KENPTkZJR19QQ0lfRVhQUkVTU19HRU5FUklDX0JSSURHRSkgKz0gZ3BleC5vCiBjb21tb24tb2Jq LSQoQ09ORklHX1BDSV9FWFBSRVNTX1hJTElOWCkgKz0geGlsaW54LXBjaWUubwpkaWZmIC0tZ2l0 IGEvaHcvcGNpLWhvc3QvcGlpeC5jIGIvaHcvcGNpLWhvc3QvaTQ0MGZ4LmMKc2ltaWxhcml0eSBp bmRleCAxMDAlCnJlbmFtZSBmcm9tIGh3L3BjaS1ob3N0L3BpaXguYwpyZW5hbWUgdG8gaHcvcGNp LWhvc3QvaTQ0MGZ4LmMKLS0gCjIuMjEuMAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3Rz LnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0 aW5mby94ZW4tZGV2ZWw= 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 D7272C10F14 for ; Tue, 15 Oct 2019 16:33:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B58A120873 for ; Tue, 15 Oct 2019 16:33:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388166AbfJOQd1 (ORCPT ); Tue, 15 Oct 2019 12:33:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57340 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388164AbfJOQd1 (ORCPT ); Tue, 15 Oct 2019 12:33:27 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 61EB97BDA9; Tue, 15 Oct 2019 16:33:27 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-35.brq.redhat.com [10.40.204.35]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F265B4100; Tue, 15 Oct 2019 16:33:15 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aleksandar Markovic , Aurelien Jarno , Eduardo Habkost , Thomas Huth , Igor Mammedov , Anthony Perard , Stefano Stabellini , Paul Durrant , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Rikalo , xen-devel@lists.xenproject.org, Laurent Vivier , "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , kvm@vger.kernel.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 31/32] hw/pci-host: Rename incorrectly named 'piix' as 'i440fx' Date: Tue, 15 Oct 2019 18:27:04 +0200 Message-Id: <20191015162705.28087-32-philmd@redhat.com> In-Reply-To: <20191015162705.28087-1-philmd@redhat.com> References: <20191015162705.28087-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 15 Oct 2019 16:33:27 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Philippe Mathieu-Daudé 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é --- 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%) 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 -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 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 848BBECE588 for ; Tue, 15 Oct 2019 16:55:05 +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 5CBB0217D6 for ; Tue, 15 Oct 2019 16:55:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5CBB0217D6 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]:53098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKQ6B-00006z-Vx for qemu-devel@archiver.kernel.org; Tue, 15 Oct 2019 12:55:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42208) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKPlJ-0005kT-NB for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:33:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iKPlI-0007eH-Go for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:33:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53690) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iKPlI-0007do-8o for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:33:28 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 61EB97BDA9; Tue, 15 Oct 2019 16:33:27 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-35.brq.redhat.com [10.40.204.35]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F265B4100; Tue, 15 Oct 2019 16:33:15 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 31/32] hw/pci-host: Rename incorrectly named 'piix' as 'i440fx' Date: Tue, 15 Oct 2019 18:27:04 +0200 Message-Id: <20191015162705.28087-32-philmd@redhat.com> In-Reply-To: <20191015162705.28087-1-philmd@redhat.com> References: <20191015162705.28087-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 15 Oct 2019 16:33:27 +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: Laurent Vivier , Thomas Huth , Stefano Stabellini , Eduardo Habkost , kvm@vger.kernel.org, Paul Durrant , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Markovic , xen-devel@lists.xenproject.org, Anthony Perard , Igor Mammedov , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Richard Henderson 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. 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