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 C4ADBCA9EA0 for ; Fri, 18 Oct 2019 13:51:54 +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 9F1D3222BD for ; Fri, 18 Oct 2019 13:51:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9F1D3222BD 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 1iLSfR-0006lE-Jb; Fri, 18 Oct 2019 13:51:45 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iLSfR-0006kt-5G for xen-devel@lists.xenproject.org; Fri, 18 Oct 2019 13:51:45 +0000 X-Inumbo-ID: 6bae826e-f1ae-11e9-93f5-12813bfff9fa Received: from mx1.redhat.com (unknown [209.132.183.28]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 6bae826e-f1ae-11e9-93f5-12813bfff9fa; Fri, 18 Oct 2019 13:51:44 +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 3CB12307D986; Fri, 18 Oct 2019 13:51:44 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.74]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2B09C60BF1; Fri, 18 Oct 2019 13:51:33 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Fri, 18 Oct 2019 15:47:54 +0200 Message-Id: <20191018134754.16362-21-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.48]); Fri, 18 Oct 2019 13:51:44 +0000 (UTC) Subject: [Xen-devel] [PATCH v2 20/20] hw/pci-host/i440fx: Remove the last PIIX3 traces 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 , 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" VGhlIFBJSVgzIGlzIG5vdCB0aWVkIHRvIHRoZSBpNDQwRlggYW5kIGNhbiBldmVuIGJlIHVzZWQg d2l0aG91dCBpdC4KTW92ZSBpdHMgY3JlYXRpb24gdG8gdGhlIG1hY2hpbmUgY29kZSAocGNfcGlp eC5jKS4KV2UgaGF2ZSBub3cgcmVtb3ZlZCB0aGUgbGFzdCB0cmFjZSBvZiBzb3V0aGJyaWRnZSBj b2RlIGluIHRoZSBpNDQwRlgKbm9ydGhicmlkZ2UuCgpTaWduZWQtb2ZmLWJ5OiBQaGlsaXBwZSBN YXRoaWV1LURhdWTDqSA8cGhpbG1kQHJlZGhhdC5jb20+Ci0tLQogaHcvaTM4Ni9wY19waWl4LmMg ICAgICAgICAgICB8IDggKysrKysrKy0KIGh3L3BjaS1ob3N0L2k0NDBmeC5jICAgICAgICAgfCA4 IC0tLS0tLS0tCiBpbmNsdWRlL2h3L3BjaS1ob3N0L2k0NDBmeC5oIHwgMyArLS0KIDMgZmlsZXMg Y2hhbmdlZCwgOCBpbnNlcnRpb25zKCspLCAxMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9o dy9pMzg2L3BjX3BpaXguYyBiL2h3L2kzODYvcGNfcGlpeC5jCmluZGV4IDExYjhkZTA0OWYuLmY2 ZTcxOTZhODIgMTAwNjQ0Ci0tLSBhL2h3L2kzODYvcGNfcGlpeC5jCisrKyBiL2h3L2kzODYvcGNf cGlpeC5jCkBAIC0xOTksMTQgKzE5OSwyMCBAQCBzdGF0aWMgdm9pZCBwY19pbml0MShNYWNoaW5l U3RhdGUgKm1hY2hpbmUsCiAgICAgfQogCiAgICAgaWYgKHBjbWMtPnBjaV9lbmFibGVkKSB7Cisg ICAgICAgIFBJSVgzU3RhdGUgKnBpaXgzOworCiAgICAgICAgIHBjaV9idXMgPSBpNDQwZnhfaW5p dChob3N0X3R5cGUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwY2lfdHlwZSwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICZpNDQwZnhfc3RhdGUsICZwaWl4M19kZXZmbiwg JmlzYV9idXMsIHBjbXMtPmdzaSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZpNDQw Znhfc3RhdGUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzeXN0ZW1fbWVtb3J5LCBz eXN0ZW1faW8sIG1hY2hpbmUtPnJhbV9zaXplLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgcGNtcy0+YmVsb3dfNGdfbWVtX3NpemUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBwY21zLT5hYm92ZV80Z19tZW1fc2l6ZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHBjaV9tZW1vcnksIHJhbV9tZW1vcnkpOwogICAgICAgICBwY21zLT5idXMgPSBwY2lfYnVzOwor CisgICAgICAgIHBpaXgzID0gcGlpeDNfY3JlYXRlKHBjaV9idXMsICZpc2FfYnVzKTsKKyAgICAg ICAgcGlpeDMtPnBpYyA9IHBjbXMtPmdzaTsKKyAgICAgICAgcGlpeDNfZGV2Zm4gPSBwaWl4My0+ ZGV2LmRldmZuOwogICAgIH0gZWxzZSB7CiAgICAgICAgIHBjaV9idXMgPSBOVUxMOwogICAgICAg ICBpNDQwZnhfc3RhdGUgPSBOVUxMOwpkaWZmIC0tZ2l0IGEvaHcvcGNpLWhvc3QvaTQ0MGZ4LmMg Yi9ody9wY2ktaG9zdC9pNDQwZnguYwppbmRleCA3OWVjZDU4YTJiLi5mMjcxMzExMDJkIDEwMDY0 NAotLS0gYS9ody9wY2ktaG9zdC9pNDQwZnguYworKysgYi9ody9wY2ktaG9zdC9pNDQwZnguYwpA QCAtMjcsNyArMjcsNiBAQAogI2luY2x1ZGUgImh3L3BjaS9wY2kuaCIKICNpbmNsdWRlICJody9w Y2kvcGNpX2hvc3QuaCIKICNpbmNsdWRlICJody9wY2ktaG9zdC9pNDQwZnguaCIKLSNpbmNsdWRl ICJody9zb3V0aGJyaWRnZS9waWl4LmgiCiAjaW5jbHVkZSAiaHcvcWRldi1wcm9wZXJ0aWVzLmgi CiAjaW5jbHVkZSAiaHcvc3lzYnVzLmgiCiAjaW5jbHVkZSAicWFwaS9lcnJvci5oIgpAQCAtMjcy LDggKzI3MSw2IEBAIHN0YXRpYyB2b2lkIGk0NDBmeF9yZWFsaXplKFBDSURldmljZSAqZGV2LCBF cnJvciAqKmVycnApCiAKIFBDSUJ1cyAqaTQ0MGZ4X2luaXQoY29uc3QgY2hhciAqaG9zdF90eXBl LCBjb25zdCBjaGFyICpwY2lfdHlwZSwKICAgICAgICAgICAgICAgICAgICAgUENJSTQ0MEZYU3Rh dGUgKipwaTQ0MGZ4X3N0YXRlLAotICAgICAgICAgICAgICAgICAgICBpbnQgKnBpaXgzX2RldmZu LAotICAgICAgICAgICAgICAgICAgICBJU0FCdXMgKippc2FfYnVzLCBxZW11X2lycSAqcGljLAog ICAgICAgICAgICAgICAgICAgICBNZW1vcnlSZWdpb24gKmFkZHJlc3Nfc3BhY2VfbWVtLAogICAg ICAgICAgICAgICAgICAgICBNZW1vcnlSZWdpb24gKmFkZHJlc3Nfc3BhY2VfaW8sCiAgICAgICAg ICAgICAgICAgICAgIHJhbV9hZGRyX3QgcmFtX3NpemUsCkBAIC0yODYsNyArMjgzLDYgQEAgUENJ QnVzICppNDQwZnhfaW5pdChjb25zdCBjaGFyICpob3N0X3R5cGUsIGNvbnN0IGNoYXIgKnBjaV90 eXBlLAogICAgIFBDSUJ1cyAqYjsKICAgICBQQ0lEZXZpY2UgKmQ7CiAgICAgUENJSG9zdFN0YXRl ICpzOwotICAgIFBJSVgzU3RhdGUgKnBpaXgzOwogICAgIFBDSUk0NDBGWFN0YXRlICpmOwogICAg IHVuc2lnbmVkIGk7CiAgICAgSTQ0MEZYU3RhdGUgKmk0NDBmeDsKQEAgLTMzOSwxMCArMzM1LDYg QEAgUENJQnVzICppNDQwZnhfaW5pdChjb25zdCBjaGFyICpob3N0X3R5cGUsIGNvbnN0IGNoYXIg KnBjaV90eXBlLAogICAgICAgICAgICAgICAgICBQQU1fRVhQQU5fU0laRSk7CiAgICAgfQogCi0g ICAgcGlpeDMgPSBwaWl4M19jcmVhdGUoYiwgaXNhX2J1cyk7Ci0gICAgcGlpeDMtPnBpYyA9IHBp YzsKLSAgICAqcGlpeDNfZGV2Zm4gPSBwaWl4My0+ZGV2LmRldmZuOwotCiAgICAgcmFtX3NpemUg PSByYW1fc2l6ZSAvIDggLyAxMDI0IC8gMTAyNDsKICAgICBpZiAocmFtX3NpemUgPiAyNTUpIHsK ICAgICAgICAgcmFtX3NpemUgPSAyNTU7CmRpZmYgLS1naXQgYS9pbmNsdWRlL2h3L3BjaS1ob3N0 L2k0NDBmeC5oIGIvaW5jbHVkZS9ody9wY2ktaG9zdC9pNDQwZnguaAppbmRleCBlMzI3ZjliZjg3 Li5mNTRlNjQ2NmU0IDEwMDY0NAotLS0gYS9pbmNsdWRlL2h3L3BjaS1ob3N0L2k0NDBmeC5oCisr KyBiL2luY2x1ZGUvaHcvcGNpLWhvc3QvaTQ0MGZ4LmgKQEAgLTIyLDggKzIyLDcgQEAgdHlwZWRl ZiBzdHJ1Y3QgUENJSTQ0MEZYU3RhdGUgUENJSTQ0MEZYU3RhdGU7CiAjZGVmaW5lIFRZUEVfSUdE X1BBU1NUSFJPVUdIX0k0NDBGWF9QQ0lfREVWSUNFICJpZ2QtcGFzc3Rocm91Z2gtaTQ0MEZYIgog CiBQQ0lCdXMgKmk0NDBmeF9pbml0KGNvbnN0IGNoYXIgKmhvc3RfdHlwZSwgY29uc3QgY2hhciAq cGNpX3R5cGUsCi0gICAgICAgICAgICAgICAgICAgIFBDSUk0NDBGWFN0YXRlICoqcGk0NDBmeF9z dGF0ZSwgaW50ICpwaWl4X2RldmZuLAotICAgICAgICAgICAgICAgICAgICBJU0FCdXMgKippc2Ff YnVzLCBxZW11X2lycSAqcGljLAorICAgICAgICAgICAgICAgICAgICBQQ0lJNDQwRlhTdGF0ZSAq KnBpNDQwZnhfc3RhdGUsCiAgICAgICAgICAgICAgICAgICAgIE1lbW9yeVJlZ2lvbiAqYWRkcmVz c19zcGFjZV9tZW0sCiAgICAgICAgICAgICAgICAgICAgIE1lbW9yeVJlZ2lvbiAqYWRkcmVzc19z cGFjZV9pbywKICAgICAgICAgICAgICAgICAgICAgcmFtX2FkZHJfdCByYW1fc2l6ZSwKLS0gCjIu MjEuMAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhl bi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBz Oi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw= 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 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 E1CAACA9EA1 for ; Fri, 18 Oct 2019 14:06:55 +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 A6EA021925 for ; Fri, 18 Oct 2019 14:06:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A6EA021925 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]:40570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLSu6-0007j3-C1 for qemu-devel@archiver.kernel.org; Fri, 18 Oct 2019 10:06:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55446) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLSfS-0007IR-Jw for qemu-devel@nongnu.org; Fri, 18 Oct 2019 09:51:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLSfR-00078p-B8 for qemu-devel@nongnu.org; Fri, 18 Oct 2019 09:51:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1776) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iLSfR-00078R-2f for qemu-devel@nongnu.org; Fri, 18 Oct 2019 09:51:45 -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 3CB12307D986; Fri, 18 Oct 2019 13:51:44 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.74]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2B09C60BF1; Fri, 18 Oct 2019 13:51:33 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 20/20] hw/pci-host/i440fx: Remove the last PIIX3 traces Date: Fri, 18 Oct 2019 15:47:54 +0200 Message-Id: <20191018134754.16362-21-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.48]); Fri, 18 Oct 2019 13:51:44 +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 , 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" The PIIX3 is not tied to the i440FX and can even be used without it. Move its creation to the machine code (pc_piix.c). We have now removed the last trace of southbridge code in the i440FX northbridge. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc_piix.c | 8 +++++++- hw/pci-host/i440fx.c | 8 -------- include/hw/pci-host/i440fx.h | 3 +-- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 11b8de049f..f6e7196a82 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -199,14 +199,20 @@ static void pc_init1(MachineState *machine, } =20 if (pcmc->pci_enabled) { + PIIX3State *piix3; + pci_bus =3D i440fx_init(host_type, pci_type, - &i440fx_state, &piix3_devfn, &isa_bus, pcm= s->gsi, + &i440fx_state, system_memory, system_io, machine->ram_siz= e, pcms->below_4g_mem_size, pcms->above_4g_mem_size, pci_memory, ram_memory); pcms->bus =3D pci_bus; + + piix3 =3D piix3_create(pci_bus, &isa_bus); + piix3->pic =3D pcms->gsi; + piix3_devfn =3D piix3->dev.devfn; } else { pci_bus =3D NULL; i440fx_state =3D NULL; diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c index 79ecd58a2b..f27131102d 100644 --- a/hw/pci-host/i440fx.c +++ b/hw/pci-host/i440fx.c @@ -27,7 +27,6 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "hw/pci-host/i440fx.h" -#include "hw/southbridge/piix.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "qapi/error.h" @@ -272,8 +271,6 @@ static void i440fx_realize(PCIDevice *dev, Error **er= rp) =20 PCIBus *i440fx_init(const char *host_type, const char *pci_type, PCII440FXState **pi440fx_state, - int *piix3_devfn, - ISABus **isa_bus, qemu_irq *pic, MemoryRegion *address_space_mem, MemoryRegion *address_space_io, ram_addr_t ram_size, @@ -286,7 +283,6 @@ PCIBus *i440fx_init(const char *host_type, const char= *pci_type, PCIBus *b; PCIDevice *d; PCIHostState *s; - PIIX3State *piix3; PCII440FXState *f; unsigned i; I440FXState *i440fx; @@ -339,10 +335,6 @@ PCIBus *i440fx_init(const char *host_type, const cha= r *pci_type, PAM_EXPAN_SIZE); } =20 - piix3 =3D piix3_create(b, isa_bus); - piix3->pic =3D pic; - *piix3_devfn =3D piix3->dev.devfn; - ram_size =3D ram_size / 8 / 1024 / 1024; if (ram_size > 255) { ram_size =3D 255; diff --git a/include/hw/pci-host/i440fx.h b/include/hw/pci-host/i440fx.h index e327f9bf87..f54e6466e4 100644 --- a/include/hw/pci-host/i440fx.h +++ b/include/hw/pci-host/i440fx.h @@ -22,8 +22,7 @@ typedef struct PCII440FXState PCII440FXState; #define TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE "igd-passthrough-i440FX" =20 PCIBus *i440fx_init(const char *host_type, const char *pci_type, - PCII440FXState **pi440fx_state, int *piix_devfn, - ISABus **isa_bus, qemu_irq *pic, + PCII440FXState **pi440fx_state, MemoryRegion *address_space_mem, MemoryRegion *address_space_io, ram_addr_t ram_size, --=20 2.21.0