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 A175BECE588 for ; Tue, 15 Oct 2019 16:33:03 +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 7BDD12086A for ; Tue, 15 Oct 2019 16:33:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7BDD12086A 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 1iKPkj-00065l-UY; Tue, 15 Oct 2019 16:32:53 +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 1iKPki-000650-EJ for xen-devel@lists.xenproject.org; Tue, 15 Oct 2019 16:32:52 +0000 X-Inumbo-ID: 6e91c17c-ef69-11e9-9397-12813bfff9fa Received: from mx1.redhat.com (unknown [209.132.183.28]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 6e91c17c-ef69-11e9-9397-12813bfff9fa; Tue, 15 Oct 2019 16:32:52 +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 681543018ED0; Tue, 15 Oct 2019 16:32:51 +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 D253319C69; Tue, 15 Oct 2019 16:32:44 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 15 Oct 2019 18:27:01 +0200 Message-Id: <20191015162705.28087-29-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.46]); Tue, 15 Oct 2019 16:32:51 +0000 (UTC) Subject: [Xen-devel] [PATCH 28/32] hw/pci-host/piix: Move i440FX declarations to hw/pci-host/i440fx.h 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" RnJvbTogUGhpbGlwcGUgTWF0aGlldS1EYXVkw6kgPGY0YnVnQGFtc2F0Lm9yZz4KClRoZSBody9w Y2ktaG9zdC9waWl4LmMgY29udGFpbnMgYSBtaXggb2YgUElJWDMgYW5kIGk0NDBGWCBjaGlwc2V0 cwpmdW5jdGlvbnMuIFRvIGJlIGFibGUgdG8gc3BsaXQgaXQsIHdlIG5lZWQgdG8gZXhwb3J0IHNv bWUKZGVjbGFyYXRpb25zIGZpcnN0LgoKU2lnbmVkLW9mZi1ieTogUGhpbGlwcGUgTWF0aGlldS1E YXVkw6kgPHBoaWxtZEByZWRoYXQuY29tPgotLS0KIE1BSU5UQUlORVJTICAgICAgICAgICAgICAg ICAgfCAgMSArCiBody9hY3BpL3BjaWhwLmMgICAgICAgICAgICAgIHwgIDIgKy0KIGh3L2kzODYv cGNfcGlpeC5jICAgICAgICAgICAgfCAgMSArCiBody9wY2ktaG9zdC9waWl4LmMgICAgICAgICAg IHwgIDEgKwogaW5jbHVkZS9ody9pMzg2L3BjLmggICAgICAgICB8IDIyIC0tLS0tLS0tLS0tLS0t LS0tLS0tLQogaW5jbHVkZS9ody9wY2ktaG9zdC9pNDQwZnguaCB8IDM3ICsrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKwogc3R1YnMvcGNpLWhvc3QtcGlpeC5jICAgICAgICB8ICAz ICsrLQogNyBmaWxlcyBjaGFuZ2VkLCA0MyBpbnNlcnRpb25zKCspLCAyNCBkZWxldGlvbnMoLSkK IGNyZWF0ZSBtb2RlIDEwMDY0NCBpbmNsdWRlL2h3L3BjaS1ob3N0L2k0NDBmeC5oCgpkaWZmIC0t Z2l0IGEvTUFJTlRBSU5FUlMgYi9NQUlOVEFJTkVSUwppbmRleCA1NTZmNThiZDhjLi5hZGYwNTlh MTY0IDEwMDY0NAotLS0gYS9NQUlOVEFJTkVSUworKysgYi9NQUlOVEFJTkVSUwpAQCAtMTIyOCw2 ICsxMjI4LDcgQEAgRjogaHcvaTM4Ni8KIEY6IGh3L3BjaS1ob3N0L3BpaXguYwogRjogaHcvcGNp LWhvc3QvcTM1LmMKIEY6IGh3L3BjaS1ob3N0L3BhbS5jCitGOiBpbmNsdWRlL2h3L3BjaS1ob3N0 L2k0NDBmeC5oCiBGOiBpbmNsdWRlL2h3L3BjaS1ob3N0L3EzNS5oCiBGOiBpbmNsdWRlL2h3L3Bj aS1ob3N0L3BhbS5oCiBGOiBody9pc2EvbHBjX2ljaDkuYwpkaWZmIC0tZ2l0IGEvaHcvYWNwaS9w Y2locC5jIGIvaHcvYWNwaS9wY2locC5jCmluZGV4IDgyZDI5NWI2ZTguLjg0MTMzNDhhMzMgMTAw NjQ0Ci0tLSBhL2h3L2FjcGkvcGNpaHAuYworKysgYi9ody9hY3BpL3BjaWhwLmMKQEAgLTI3LDcg KzI3LDcgQEAKICNpbmNsdWRlICJxZW11L29zZGVwLmgiCiAjaW5jbHVkZSAiaHcvYWNwaS9wY2lo cC5oIgogCi0jaW5jbHVkZSAiaHcvaTM4Ni9wYy5oIgorI2luY2x1ZGUgImh3L3BjaS1ob3N0L2k0 NDBmeC5oIgogI2luY2x1ZGUgImh3L3BjaS9wY2kuaCIKICNpbmNsdWRlICJody9wY2kvcGNpX2Jy aWRnZS5oIgogI2luY2x1ZGUgImh3L2FjcGkvYWNwaS5oIgpkaWZmIC0tZ2l0IGEvaHcvaTM4Ni9w Y19waWl4LmMgYi9ody9pMzg2L3BjX3BpaXguYwppbmRleCA1YjM1ZmYwNGM3Li44YWM0YmYxMmNh IDEwMDY0NAotLS0gYS9ody9pMzg2L3BjX3BpaXguYworKysgYi9ody9pMzg2L3BjX3BpaXguYwpA QCAtMjksNiArMjksNyBAQAogI2luY2x1ZGUgImh3L2xvYWRlci5oIgogI2luY2x1ZGUgImh3L2kz ODYvcGMuaCIKICNpbmNsdWRlICJody9pMzg2L2FwaWMuaCIKKyNpbmNsdWRlICJody9wY2ktaG9z dC9pNDQwZnguaCIKICNpbmNsdWRlICJody9zb3V0aGJyaWRnZS9waWl4LmgiCiAjaW5jbHVkZSAi aHcvZGlzcGxheS9yYW1mYi5oIgogI2luY2x1ZGUgImh3L2Zpcm13YXJlL3NtYmlvcy5oIgpkaWZm IC0tZ2l0IGEvaHcvcGNpLWhvc3QvcGlpeC5jIGIvaHcvcGNpLWhvc3QvcGlpeC5jCmluZGV4IGE0 NTBmYzcyNmUuLjBiNWRhNWJjOTQgMTAwNjQ0Ci0tLSBhL2h3L3BjaS1ob3N0L3BpaXguYworKysg Yi9ody9wY2ktaG9zdC9waWl4LmMKQEAgLTI3LDYgKzI3LDcgQEAKICNpbmNsdWRlICJody9pcnEu aCIKICNpbmNsdWRlICJody9wY2kvcGNpLmgiCiAjaW5jbHVkZSAiaHcvcGNpL3BjaV9ob3N0Lmgi CisjaW5jbHVkZSAiaHcvcGNpLWhvc3QvaTQ0MGZ4LmgiCiAjaW5jbHVkZSAiaHcvc291dGhicmlk Z2UvcGlpeC5oIgogI2luY2x1ZGUgImh3L3FkZXYtcHJvcGVydGllcy5oIgogI2luY2x1ZGUgImh3 L2lzYS9pc2EuaCIKZGlmZiAtLWdpdCBhL2luY2x1ZGUvaHcvaTM4Ni9wYy5oIGIvaW5jbHVkZS9o dy9pMzg2L3BjLmgKaW5kZXggMWMyMGI5NjU3MS4uY2VhZDI4MjhkZSAxMDA2NDQKLS0tIGEvaW5j bHVkZS9ody9pMzg2L3BjLmgKKysrIGIvaW5jbHVkZS9ody9pMzg2L3BjLmgKQEAgLTI0OCwyOCAr MjQ4LDYgQEAgaW50IGNtb3NfZ2V0X2ZkX2RyaXZlX3R5cGUoRmxvcHB5RHJpdmVUeXBlIGZkMCk7 CiAvKiBocGV0LmMgKi8KIGV4dGVybiBpbnQgbm9faHBldDsKIAotLyogcGlpeF9wY2kuYyAqLwot c3RydWN0IFBDSUk0NDBGWFN0YXRlOwotdHlwZWRlZiBzdHJ1Y3QgUENJSTQ0MEZYU3RhdGUgUENJ STQ0MEZYU3RhdGU7Ci0KLSNkZWZpbmUgVFlQRV9JNDQwRlhfUENJX0hPU1RfQlJJREdFICJpNDQw RlgtcGNpaG9zdCIKLSNkZWZpbmUgVFlQRV9JNDQwRlhfUENJX0RFVklDRSAiaTQ0MEZYIgotCi0j ZGVmaW5lIFRZUEVfSUdEX1BBU1NUSFJPVUdIX0k0NDBGWF9QQ0lfREVWSUNFICJpZ2QtcGFzc3Ro cm91Z2gtaTQ0MEZYIgotCi1QQ0lCdXMgKmk0NDBmeF9pbml0KGNvbnN0IGNoYXIgKmhvc3RfdHlw ZSwgY29uc3QgY2hhciAqcGNpX3R5cGUsCi0gICAgICAgICAgICAgICAgICAgIFBDSUk0NDBGWFN0 YXRlICoqcGk0NDBmeF9zdGF0ZSwgaW50ICpwaWl4X2RldmZuLAotICAgICAgICAgICAgICAgICAg ICBJU0FCdXMgKippc2FfYnVzLCBxZW11X2lycSAqcGljLAotICAgICAgICAgICAgICAgICAgICBN ZW1vcnlSZWdpb24gKmFkZHJlc3Nfc3BhY2VfbWVtLAotICAgICAgICAgICAgICAgICAgICBNZW1v cnlSZWdpb24gKmFkZHJlc3Nfc3BhY2VfaW8sCi0gICAgICAgICAgICAgICAgICAgIHJhbV9hZGRy X3QgcmFtX3NpemUsCi0gICAgICAgICAgICAgICAgICAgIHJhbV9hZGRyX3QgYmVsb3dfNGdfbWVt X3NpemUsCi0gICAgICAgICAgICAgICAgICAgIHJhbV9hZGRyX3QgYWJvdmVfNGdfbWVtX3NpemUs Ci0gICAgICAgICAgICAgICAgICAgIE1lbW9yeVJlZ2lvbiAqcGNpX21lbW9yeSwKLSAgICAgICAg ICAgICAgICAgICAgTWVtb3J5UmVnaW9uICpyYW1fbWVtb3J5KTsKLQotUENJQnVzICpmaW5kX2k0 NDBmeCh2b2lkKTsKLQogLyogcGNfc3lzZncuYyAqLwogdm9pZCBwY19zeXN0ZW1fZmxhc2hfY3Jl YXRlKFBDTWFjaGluZVN0YXRlICpwY21zKTsKIHZvaWQgcGNfc3lzdGVtX2Zpcm13YXJlX2luaXQo UENNYWNoaW5lU3RhdGUgKnBjbXMsIE1lbW9yeVJlZ2lvbiAqcm9tX21lbW9yeSk7CmRpZmYgLS1n aXQgYS9pbmNsdWRlL2h3L3BjaS1ob3N0L2k0NDBmeC5oIGIvaW5jbHVkZS9ody9wY2ktaG9zdC9p NDQwZnguaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwLi5lMzI3ZjliZjg3 Ci0tLSAvZGV2L251bGwKKysrIGIvaW5jbHVkZS9ody9wY2ktaG9zdC9pNDQwZnguaApAQCAtMCww ICsxLDM3IEBACisvKgorICogUUVNVSBpNDQwRlggTm9ydGggQnJpZGdlIEVtdWxhdGlvbgorICoK KyAqIENvcHlyaWdodCAoYykgMjAwNiBGYWJyaWNlIEJlbGxhcmQKKyAqCisgKiBUaGlzIHdvcmsg aXMgbGljZW5zZWQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR1BMLCB2ZXJzaW9uIDIgb3Ig bGF0ZXIuCisgKiBTZWUgdGhlIENPUFlJTkcgZmlsZSBpbiB0aGUgdG9wLWxldmVsIGRpcmVjdG9y eS4KKyAqCisgKi8KKworI2lmbmRlZiBIV19QQ0lfSTQ0MEZYX0gKKyNkZWZpbmUgSFdfUENJX0k0 NDBGWF9ICisKKyNpbmNsdWRlICJody9ody5oIgorI2luY2x1ZGUgImh3L3BjaS9wY2lfYnVzLmgi CisKK3R5cGVkZWYgc3RydWN0IFBDSUk0NDBGWFN0YXRlIFBDSUk0NDBGWFN0YXRlOworCisjZGVm aW5lIFRZUEVfSTQ0MEZYX1BDSV9IT1NUX0JSSURHRSAiaTQ0MEZYLXBjaWhvc3QiCisjZGVmaW5l IFRZUEVfSTQ0MEZYX1BDSV9ERVZJQ0UgImk0NDBGWCIKKworI2RlZmluZSBUWVBFX0lHRF9QQVNT VEhST1VHSF9JNDQwRlhfUENJX0RFVklDRSAiaWdkLXBhc3N0aHJvdWdoLWk0NDBGWCIKKworUENJ QnVzICppNDQwZnhfaW5pdChjb25zdCBjaGFyICpob3N0X3R5cGUsIGNvbnN0IGNoYXIgKnBjaV90 eXBlLAorICAgICAgICAgICAgICAgICAgICBQQ0lJNDQwRlhTdGF0ZSAqKnBpNDQwZnhfc3RhdGUs IGludCAqcGlpeF9kZXZmbiwKKyAgICAgICAgICAgICAgICAgICAgSVNBQnVzICoqaXNhX2J1cywg cWVtdV9pcnEgKnBpYywKKyAgICAgICAgICAgICAgICAgICAgTWVtb3J5UmVnaW9uICphZGRyZXNz X3NwYWNlX21lbSwKKyAgICAgICAgICAgICAgICAgICAgTWVtb3J5UmVnaW9uICphZGRyZXNzX3Nw YWNlX2lvLAorICAgICAgICAgICAgICAgICAgICByYW1fYWRkcl90IHJhbV9zaXplLAorICAgICAg ICAgICAgICAgICAgICByYW1fYWRkcl90IGJlbG93XzRnX21lbV9zaXplLAorICAgICAgICAgICAg ICAgICAgICByYW1fYWRkcl90IGFib3ZlXzRnX21lbV9zaXplLAorICAgICAgICAgICAgICAgICAg ICBNZW1vcnlSZWdpb24gKnBjaV9tZW1vcnksCisgICAgICAgICAgICAgICAgICAgIE1lbW9yeVJl Z2lvbiAqcmFtX21lbW9yeSk7CisKK1BDSUJ1cyAqZmluZF9pNDQwZngodm9pZCk7CisKKyNlbmRp ZgpkaWZmIC0tZ2l0IGEvc3R1YnMvcGNpLWhvc3QtcGlpeC5jIGIvc3R1YnMvcGNpLWhvc3QtcGlp eC5jCmluZGV4IDZlZDgxYjFmMjEuLjkzOTc1YWRiZmUgMTAwNjQ0Ci0tLSBhL3N0dWJzL3BjaS1o b3N0LXBpaXguYworKysgYi9zdHVicy9wY2ktaG9zdC1waWl4LmMKQEAgLTEsNSArMSw2IEBACiAj aW5jbHVkZSAicWVtdS9vc2RlcC5oIgotI2luY2x1ZGUgImh3L2kzODYvcGMuaCIKKyNpbmNsdWRl ICJody9wY2ktaG9zdC9pNDQwZnguaCIKKwogUENJQnVzICpmaW5kX2k0NDBmeCh2b2lkKQogewog ICAgIHJldHVybiBOVUxMOwotLSAKMi4yMS4wCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlz dHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xp c3RpbmZvL3hlbi1kZXZlbA== 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 457F5ECE588 for ; Tue, 15 Oct 2019 16:32:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 23C1520872 for ; Tue, 15 Oct 2019 16:32:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388149AbfJOQcw (ORCPT ); Tue, 15 Oct 2019 12:32:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51776 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388144AbfJOQcw (ORCPT ); Tue, 15 Oct 2019 12:32:52 -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 681543018ED0; Tue, 15 Oct 2019 16:32:51 +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 D253319C69; Tue, 15 Oct 2019 16:32:44 +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 28/32] hw/pci-host/piix: Move i440FX declarations to hw/pci-host/i440fx.h Date: Tue, 15 Oct 2019 18:27:01 +0200 Message-Id: <20191015162705.28087-29-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.46]); Tue, 15 Oct 2019 16:32:51 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Philippe Mathieu-Daudé The hw/pci-host/piix.c contains a mix of PIIX3 and i440FX chipsets functions. To be able to split it, we need to export some declarations first. Signed-off-by: Philippe Mathieu-Daudé --- MAINTAINERS | 1 + hw/acpi/pcihp.c | 2 +- hw/i386/pc_piix.c | 1 + hw/pci-host/piix.c | 1 + include/hw/i386/pc.h | 22 --------------------- include/hw/pci-host/i440fx.h | 37 ++++++++++++++++++++++++++++++++++++ stubs/pci-host-piix.c | 3 ++- 7 files changed, 43 insertions(+), 24 deletions(-) create mode 100644 include/hw/pci-host/i440fx.h diff --git a/MAINTAINERS b/MAINTAINERS index 556f58bd8c..adf059a164 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1228,6 +1228,7 @@ F: hw/i386/ F: hw/pci-host/piix.c F: hw/pci-host/q35.c F: hw/pci-host/pam.c +F: include/hw/pci-host/i440fx.h F: include/hw/pci-host/q35.h F: include/hw/pci-host/pam.h F: hw/isa/lpc_ich9.c diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c index 82d295b6e8..8413348a33 100644 --- a/hw/acpi/pcihp.c +++ b/hw/acpi/pcihp.c @@ -27,7 +27,7 @@ #include "qemu/osdep.h" #include "hw/acpi/pcihp.h" -#include "hw/i386/pc.h" +#include "hw/pci-host/i440fx.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" #include "hw/acpi/acpi.h" diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 5b35ff04c7..8ac4bf12ca 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -29,6 +29,7 @@ #include "hw/loader.h" #include "hw/i386/pc.h" #include "hw/i386/apic.h" +#include "hw/pci-host/i440fx.h" #include "hw/southbridge/piix.h" #include "hw/display/ramfb.h" #include "hw/firmware/smbios.h" diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index a450fc726e..0b5da5bc94 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -27,6 +27,7 @@ #include "hw/irq.h" #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/isa/isa.h" diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 1c20b96571..cead2828de 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -248,28 +248,6 @@ int cmos_get_fd_drive_type(FloppyDriveType fd0); /* hpet.c */ extern int no_hpet; -/* piix_pci.c */ -struct PCII440FXState; -typedef struct PCII440FXState PCII440FXState; - -#define TYPE_I440FX_PCI_HOST_BRIDGE "i440FX-pcihost" -#define TYPE_I440FX_PCI_DEVICE "i440FX" - -#define TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE "igd-passthrough-i440FX" - -PCIBus *i440fx_init(const char *host_type, const char *pci_type, - PCII440FXState **pi440fx_state, int *piix_devfn, - ISABus **isa_bus, qemu_irq *pic, - MemoryRegion *address_space_mem, - MemoryRegion *address_space_io, - ram_addr_t ram_size, - ram_addr_t below_4g_mem_size, - ram_addr_t above_4g_mem_size, - MemoryRegion *pci_memory, - MemoryRegion *ram_memory); - -PCIBus *find_i440fx(void); - /* pc_sysfw.c */ void pc_system_flash_create(PCMachineState *pcms); void pc_system_firmware_init(PCMachineState *pcms, MemoryRegion *rom_memory); diff --git a/include/hw/pci-host/i440fx.h b/include/hw/pci-host/i440fx.h new file mode 100644 index 0000000000..e327f9bf87 --- /dev/null +++ b/include/hw/pci-host/i440fx.h @@ -0,0 +1,37 @@ +/* + * QEMU i440FX North Bridge Emulation + * + * Copyright (c) 2006 Fabrice Bellard + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + * + */ + +#ifndef HW_PCI_I440FX_H +#define HW_PCI_I440FX_H + +#include "hw/hw.h" +#include "hw/pci/pci_bus.h" + +typedef struct PCII440FXState PCII440FXState; + +#define TYPE_I440FX_PCI_HOST_BRIDGE "i440FX-pcihost" +#define TYPE_I440FX_PCI_DEVICE "i440FX" + +#define TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE "igd-passthrough-i440FX" + +PCIBus *i440fx_init(const char *host_type, const char *pci_type, + PCII440FXState **pi440fx_state, int *piix_devfn, + ISABus **isa_bus, qemu_irq *pic, + MemoryRegion *address_space_mem, + MemoryRegion *address_space_io, + ram_addr_t ram_size, + ram_addr_t below_4g_mem_size, + ram_addr_t above_4g_mem_size, + MemoryRegion *pci_memory, + MemoryRegion *ram_memory); + +PCIBus *find_i440fx(void); + +#endif diff --git a/stubs/pci-host-piix.c b/stubs/pci-host-piix.c index 6ed81b1f21..93975adbfe 100644 --- a/stubs/pci-host-piix.c +++ b/stubs/pci-host-piix.c @@ -1,5 +1,6 @@ #include "qemu/osdep.h" -#include "hw/i386/pc.h" +#include "hw/pci-host/i440fx.h" + PCIBus *find_i440fx(void) { return NULL; -- 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 22D4AECE588 for ; Tue, 15 Oct 2019 16:56:08 +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 EBAB220659 for ; Tue, 15 Oct 2019 16:56:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EBAB220659 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]:53122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKQ7D-0001yo-0W for qemu-devel@archiver.kernel.org; Tue, 15 Oct 2019 12:56:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42072) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKPkj-00057H-V7 for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:32:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iKPki-0007MK-IM for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:32:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53434) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iKPki-0007M7-AA for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:32:52 -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 681543018ED0; Tue, 15 Oct 2019 16:32:51 +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 D253319C69; Tue, 15 Oct 2019 16:32:44 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 28/32] hw/pci-host/piix: Move i440FX declarations to hw/pci-host/i440fx.h Date: Tue, 15 Oct 2019 18:27:01 +0200 Message-Id: <20191015162705.28087-29-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.46]); Tue, 15 Oct 2019 16:32:51 +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 The hw/pci-host/piix.c contains a mix of PIIX3 and i440FX chipsets functions. To be able to split it, we need to export some declarations first. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- MAINTAINERS | 1 + hw/acpi/pcihp.c | 2 +- hw/i386/pc_piix.c | 1 + hw/pci-host/piix.c | 1 + include/hw/i386/pc.h | 22 --------------------- include/hw/pci-host/i440fx.h | 37 ++++++++++++++++++++++++++++++++++++ stubs/pci-host-piix.c | 3 ++- 7 files changed, 43 insertions(+), 24 deletions(-) create mode 100644 include/hw/pci-host/i440fx.h diff --git a/MAINTAINERS b/MAINTAINERS index 556f58bd8c..adf059a164 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1228,6 +1228,7 @@ F: hw/i386/ F: hw/pci-host/piix.c F: hw/pci-host/q35.c F: hw/pci-host/pam.c +F: include/hw/pci-host/i440fx.h F: include/hw/pci-host/q35.h F: include/hw/pci-host/pam.h F: hw/isa/lpc_ich9.c diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c index 82d295b6e8..8413348a33 100644 --- a/hw/acpi/pcihp.c +++ b/hw/acpi/pcihp.c @@ -27,7 +27,7 @@ #include "qemu/osdep.h" #include "hw/acpi/pcihp.h" =20 -#include "hw/i386/pc.h" +#include "hw/pci-host/i440fx.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" #include "hw/acpi/acpi.h" diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 5b35ff04c7..8ac4bf12ca 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -29,6 +29,7 @@ #include "hw/loader.h" #include "hw/i386/pc.h" #include "hw/i386/apic.h" +#include "hw/pci-host/i440fx.h" #include "hw/southbridge/piix.h" #include "hw/display/ramfb.h" #include "hw/firmware/smbios.h" diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index a450fc726e..0b5da5bc94 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -27,6 +27,7 @@ #include "hw/irq.h" #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/isa/isa.h" diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 1c20b96571..cead2828de 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -248,28 +248,6 @@ int cmos_get_fd_drive_type(FloppyDriveType fd0); /* hpet.c */ extern int no_hpet; =20 -/* piix_pci.c */ -struct PCII440FXState; -typedef struct PCII440FXState PCII440FXState; - -#define TYPE_I440FX_PCI_HOST_BRIDGE "i440FX-pcihost" -#define TYPE_I440FX_PCI_DEVICE "i440FX" - -#define TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE "igd-passthrough-i440FX" - -PCIBus *i440fx_init(const char *host_type, const char *pci_type, - PCII440FXState **pi440fx_state, int *piix_devfn, - ISABus **isa_bus, qemu_irq *pic, - MemoryRegion *address_space_mem, - MemoryRegion *address_space_io, - ram_addr_t ram_size, - ram_addr_t below_4g_mem_size, - ram_addr_t above_4g_mem_size, - MemoryRegion *pci_memory, - MemoryRegion *ram_memory); - -PCIBus *find_i440fx(void); - /* pc_sysfw.c */ void pc_system_flash_create(PCMachineState *pcms); void pc_system_firmware_init(PCMachineState *pcms, MemoryRegion *rom_mem= ory); diff --git a/include/hw/pci-host/i440fx.h b/include/hw/pci-host/i440fx.h new file mode 100644 index 0000000000..e327f9bf87 --- /dev/null +++ b/include/hw/pci-host/i440fx.h @@ -0,0 +1,37 @@ +/* + * QEMU i440FX North Bridge Emulation + * + * Copyright (c) 2006 Fabrice Bellard + * + * This work is licensed under the terms of the GNU GPL, version 2 or la= ter. + * See the COPYING file in the top-level directory. + * + */ + +#ifndef HW_PCI_I440FX_H +#define HW_PCI_I440FX_H + +#include "hw/hw.h" +#include "hw/pci/pci_bus.h" + +typedef struct PCII440FXState PCII440FXState; + +#define TYPE_I440FX_PCI_HOST_BRIDGE "i440FX-pcihost" +#define TYPE_I440FX_PCI_DEVICE "i440FX" + +#define TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE "igd-passthrough-i440FX" + +PCIBus *i440fx_init(const char *host_type, const char *pci_type, + PCII440FXState **pi440fx_state, int *piix_devfn, + ISABus **isa_bus, qemu_irq *pic, + MemoryRegion *address_space_mem, + MemoryRegion *address_space_io, + ram_addr_t ram_size, + ram_addr_t below_4g_mem_size, + ram_addr_t above_4g_mem_size, + MemoryRegion *pci_memory, + MemoryRegion *ram_memory); + +PCIBus *find_i440fx(void); + +#endif diff --git a/stubs/pci-host-piix.c b/stubs/pci-host-piix.c index 6ed81b1f21..93975adbfe 100644 --- a/stubs/pci-host-piix.c +++ b/stubs/pci-host-piix.c @@ -1,5 +1,6 @@ #include "qemu/osdep.h" -#include "hw/i386/pc.h" +#include "hw/pci-host/i440fx.h" + PCIBus *find_i440fx(void) { return NULL; --=20 2.21.0