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 767A5ECE588 for ; Tue, 15 Oct 2019 16:31:08 +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 5357B2086A for ; Tue, 15 Oct 2019 16:31:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5357B2086A 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 1iKPis-000567-NS; Tue, 15 Oct 2019 16:30:58 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iKPiq-000551-Qm for xen-devel@lists.xenproject.org; Tue, 15 Oct 2019 16:30:56 +0000 X-Inumbo-ID: 297825ae-ef69-11e9-beca-bc764e2007e4 Received: from mx1.redhat.com (unknown [209.132.183.28]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 297825ae-ef69-11e9-beca-bc764e2007e4; Tue, 15 Oct 2019 16:30:56 +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 84B7D3082B41; Tue, 15 Oct 2019 16:30:55 +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 A8F7219C58; Tue, 15 Oct 2019 16:30:46 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 15 Oct 2019 18:26:52 +0200 Message-Id: <20191015162705.28087-20-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.45]); Tue, 15 Oct 2019 16:30:55 +0000 (UTC) Subject: [Xen-devel] [PATCH 19/32] hw/isa/piix4: Move piix4_create() to hw/isa/piix4.c 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" RnJvbTogUGhpbGlwcGUgTWF0aGlldS1EYXVkw6kgPGY0YnVnQGFtc2F0Lm9yZz4KCk5vdyB0aGF0 IHdlIHByb3Blcmx5IHJlZmFjdG9yZWQgdGhlIHBpaXg0X2NyZWF0ZSgpIGZ1bmN0aW9uLCBsZXQn cwptb3ZlIGl0IHRvIGh3L2lzYS9waWl4NC5jIHdoZXJlIGl0IGJlbG9uZ3MsIHNvIGl0IGNhbiBi ZSByZXVzZWQKb24gb3RoZXIgcGxhY2VzLgoKU2lnbmVkLW9mZi1ieTogUGhpbGlwcGUgTWF0aGll dS1EYXVkw6kgPHBoaWxtZEByZWRoYXQuY29tPgotLS0KIGh3L2lzYS9waWl4NC5jICAgICAgICAg ICAgICAgIHwgMzAgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiBody9taXBzL2d0NjR4 eHhfcGNpLmMgICAgICAgICB8ICAxICsKIGh3L21pcHMvbWlwc19tYWx0YS5jICAgICAgICAgIHwg MjggLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogaW5jbHVkZS9ody9pMzg2L3BjLmggICAg ICAgICAgfCAgMiAtLQogaW5jbHVkZS9ody9zb3V0aGJyaWRnZS9waWl4LmggfCAgNiArKysrKysK IDUgZmlsZXMgY2hhbmdlZCwgMzcgaW5zZXJ0aW9ucygrKSwgMzAgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvaHcvaXNhL3BpaXg0LmMgYi9ody9pc2EvcGlpeDQuYwppbmRleCA5ZjU1NDc0N2Fm Li5kOTA4OTllMTIyIDEwMDY0NAotLS0gYS9ody9pc2EvcGlpeDQuYworKysgYi9ody9pc2EvcGlp eDQuYwpAQCAtMjcsMTIgKzI3LDE0IEBACiAjaW5jbHVkZSAicWFwaS9lcnJvci5oIgogI2luY2x1 ZGUgImh3L2lycS5oIgogI2luY2x1ZGUgImh3L2kzODYvcGMuaCIKKyNpbmNsdWRlICJody9zb3V0 aGJyaWRnZS9waWl4LmgiCiAjaW5jbHVkZSAiaHcvcGNpL3BjaS5oIgogI2luY2x1ZGUgImh3L2lz YS9pc2EuaCIKICNpbmNsdWRlICJody9zeXNidXMuaCIKICNpbmNsdWRlICJody9kbWEvaTgyNTcu aCIKICNpbmNsdWRlICJody90aW1lci9pODI1NC5oIgogI2luY2x1ZGUgImh3L3RpbWVyL21jMTQ2 ODE4cnRjLmgiCisjaW5jbHVkZSAiaHcvaWRlLmgiCiAjaW5jbHVkZSAibWlncmF0aW9uL3Ztc3Rh dGUuaCIKICNpbmNsdWRlICJzeXNlbXUvcmVzZXQuaCIKICNpbmNsdWRlICJzeXNlbXUvcnVuc3Rh dGUuaCIKQEAgLTIzNCwzICsyMzYsMzEgQEAgc3RhdGljIHZvaWQgcGlpeDRfcmVnaXN0ZXJfdHlw ZXModm9pZCkKIH0KIAogdHlwZV9pbml0KHBpaXg0X3JlZ2lzdGVyX3R5cGVzKQorCitEZXZpY2VT dGF0ZSAqcGlpeDRfY3JlYXRlKFBDSUJ1cyAqcGNpX2J1cywgSVNBQnVzICoqaXNhX2J1cywKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgSTJDQnVzICoqc21idXMsIHNpemVfdCBpZGVfYnVzZXMp Cit7CisgICAgc2l6ZV90IGlkZV9kcml2ZXMgPSBpZGVfYnVzZXMgKiBNQVhfSURFX0RFVlM7Cisg ICAgRHJpdmVJbmZvICoqaGQ7CisgICAgUENJRGV2aWNlICpwY2k7CisgICAgRGV2aWNlU3RhdGUg KmRldjsKKworICAgIHBjaSA9IHBjaV9jcmVhdGVfc2ltcGxlX211bHRpZnVuY3Rpb24ocGNpX2J1 cywgUENJX0RFVkZOKDEwLCAwKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHRydWUsIFRZUEVfUElJWDRfUENJX0RFVklDRSk7CisgICAgZGV2ID0gREVWSUNFKHBj aSk7CisgICAgaWYgKGlzYV9idXMpIHsKKyAgICAgICAgKmlzYV9idXMgPSBJU0FfQlVTKHFkZXZf Z2V0X2NoaWxkX2J1cyhkZXYsICJpc2EuMCIpKTsKKyAgICB9CisKKyAgICBoZCA9IGdfbmV3KERy aXZlSW5mbyAqLCBpZGVfZHJpdmVzKTsKKyAgICBpZGVfZHJpdmVfZ2V0KGhkLCBpZGVfZHJpdmVz KTsKKyAgICBwY2lfcGlpeDRfaWRlX2luaXQocGNpX2J1cywgaGQsIHBjaS0+ZGV2Zm4gKyAxKTsK KyAgICBnX2ZyZWUoaGQpOworICAgIHBjaV9jcmVhdGVfc2ltcGxlKHBjaV9idXMsIHBjaS0+ZGV2 Zm4gKyAyLCAicGlpeDQtdXNiLXVoY2kiKTsKKyAgICBpZiAoc21idXMpIHsKKyAgICAgICAgKnNt YnVzID0gcGlpeDRfcG1faW5pdChwY2lfYnVzLCBwY2ktPmRldmZuICsgMywgMHgxMTAwLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlzYV9nZXRfaXJxKE5VTEwsIDkpLCBOVUxMLCAw LCBOVUxMKTsKKyAgIH0KKworICAgIHJldHVybiBkZXY7Cit9CmRpZmYgLS1naXQgYS9ody9taXBz L2d0NjR4eHhfcGNpLmMgYi9ody9taXBzL2d0NjR4eHhfcGNpLmMKaW5kZXggZjMyNWJkNmMxYy4u YzI3NzM5OGMwZCAxMDA2NDQKLS0tIGEvaHcvbWlwcy9ndDY0eHh4X3BjaS5jCisrKyBiL2h3L21p cHMvZ3Q2NHh4eF9wY2kuYwpAQCAtMjgsNiArMjgsNyBAQAogI2luY2x1ZGUgImh3L21pcHMvbWlw cy5oIgogI2luY2x1ZGUgImh3L3BjaS9wY2kuaCIKICNpbmNsdWRlICJody9wY2kvcGNpX2hvc3Qu aCIKKyNpbmNsdWRlICJody9zb3V0aGJyaWRnZS9waWl4LmgiCiAjaW5jbHVkZSAibWlncmF0aW9u L3Ztc3RhdGUuaCIKICNpbmNsdWRlICJody9pMzg2L3BjLmgiCiAjaW5jbHVkZSAiaHcvaXJxLmgi CmRpZmYgLS1naXQgYS9ody9taXBzL21pcHNfbWFsdGEuYyBiL2h3L21pcHMvbWlwc19tYWx0YS5j CmluZGV4IDBkNDMxMjg0MGIuLjQ3N2E0NzI1YzAgMTAwNjQ0Ci0tLSBhL2h3L21pcHMvbWlwc19t YWx0YS5jCisrKyBiL2h3L21pcHMvbWlwc19tYWx0YS5jCkBAIC0xMjEwLDM0ICsxMjEwLDYgQEAg c3RhdGljIHZvaWQgbWlwc19jcmVhdGVfY3B1KE1hY2hpbmVTdGF0ZSAqbXMsIE1hbHRhU3RhdGUg KnMsCiAgICAgfQogfQogCi1zdGF0aWMgRGV2aWNlU3RhdGUgKnBpaXg0X2NyZWF0ZShQQ0lCdXMg KnBjaV9idXMsIElTQUJ1cyAqKmlzYV9idXMsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBJMkNCdXMgKipzbWJ1cywgc2l6ZV90IGlkZV9idXNlcykKLXsKLSAgICBjb25zdCBzaXpl X3QgaWRlX2RyaXZlcyA9IGlkZV9idXNlcyAqIE1BWF9JREVfREVWUzsKLSAgICBEcml2ZUluZm8g KipoZDsKLSAgICBQQ0lEZXZpY2UgKnBjaTsKLSAgICBEZXZpY2VTdGF0ZSAqZGV2OwotCi0gICAg cGNpID0gcGNpX2NyZWF0ZV9zaW1wbGVfbXVsdGlmdW5jdGlvbihwY2lfYnVzLCBQQ0lfREVWRk4o MTAsIDApLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdHJ1ZSwg VFlQRV9QSUlYNF9QQ0lfREVWSUNFKTsKLSAgICBkZXYgPSBERVZJQ0UocGNpKTsKLSAgICBpZiAo aXNhX2J1cykgewotICAgICAgICAqaXNhX2J1cyA9IElTQV9CVVMocWRldl9nZXRfY2hpbGRfYnVz KGRldiwgImlzYS4wIikpOwotICAgIH0KLQotICAgIGhkID0gZ19uZXcoRHJpdmVJbmZvICosIGlk ZV9kcml2ZXMpOwotICAgIGlkZV9kcml2ZV9nZXQoaGQsIGlkZV9kcml2ZXMpOwotICAgIHBjaV9w aWl4NF9pZGVfaW5pdChwY2lfYnVzLCBoZCwgcGNpLT5kZXZmbiArIDEpOwotICAgIGdfZnJlZSho ZCk7Ci0gICAgcGNpX2NyZWF0ZV9zaW1wbGUocGNpX2J1cywgcGNpLT5kZXZmbiArIDIsICJwaWl4 NC11c2ItdWhjaSIpOwotICAgIGlmIChzbWJ1cykgewotICAgICAgICAqc21idXMgPSBwaWl4NF9w bV9pbml0KHBjaV9idXMsIHBjaS0+ZGV2Zm4gKyAzLCAweDExMDAsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgaXNhX2dldF9pcnEoTlVMTCwgOSksIE5VTEwsIDAsIE5VTEwpOwotICAg fQotCi0gICAgcmV0dXJuIGRldjsKLX0KLQogc3RhdGljCiB2b2lkIG1pcHNfbWFsdGFfaW5pdChN YWNoaW5lU3RhdGUgKm1hY2hpbmUpCiB7CmRpZmYgLS1naXQgYS9pbmNsdWRlL2h3L2kzODYvcGMu aCBiL2luY2x1ZGUvaHcvaTM4Ni9wYy5oCmluZGV4IGM2NzFjOWZkMmEuLmI2M2ZjNzYzMWUgMTAw NjQ0Ci0tLSBhL2luY2x1ZGUvaHcvaTM4Ni9wYy5oCisrKyBiL2luY2x1ZGUvaHcvaTM4Ni9wYy5o CkBAIC0yNzQsOCArMjc0LDYgQEAgUENJQnVzICppNDQwZnhfaW5pdChjb25zdCBjaGFyICpob3N0 X3R5cGUsIGNvbnN0IGNoYXIgKnBjaV90eXBlLAogICAgICAgICAgICAgICAgICAgICBNZW1vcnlS ZWdpb24gKnJhbV9tZW1vcnkpOwogCiBQQ0lCdXMgKmZpbmRfaTQ0MGZ4KHZvaWQpOwotLyogcGlp eDQuYyAqLwotZXh0ZXJuIFBDSURldmljZSAqcGlpeDRfZGV2OwogCiAvKiBwY19zeXNmdy5jICov CiB2b2lkIHBjX3N5c3RlbV9mbGFzaF9jcmVhdGUoUENNYWNoaW5lU3RhdGUgKnBjbXMpOwpkaWZm IC0tZ2l0IGEvaW5jbHVkZS9ody9zb3V0aGJyaWRnZS9waWl4LmggYi9pbmNsdWRlL2h3L3NvdXRo YnJpZGdlL3BpaXguaAppbmRleCBiOGNlMjZmZWM0Li5hZGQzNTI0NTZiIDEwMDY0NAotLS0gYS9p bmNsdWRlL2h3L3NvdXRoYnJpZGdlL3BpaXguaAorKysgYi9pbmNsdWRlL2h3L3NvdXRoYnJpZGdl L3BpaXguaApAQCAtMiw2ICsyLDcgQEAKICAqIFFFTVUgUElJWCBTb3V0aCBCcmlkZ2UgRW11bGF0 aW9uCiAgKgogICogQ29weXJpZ2h0IChjKSAyMDA2IEZhYnJpY2UgQmVsbGFyZAorICogQ29weXJp Z2h0IChjKSAyMDE4IEhlcnbDqSBQb3Vzc2luZWF1CiAgKgogICogVGhpcyB3b3JrIGlzIGxpY2Vu c2VkIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIEdQTCwgdmVyc2lvbiAyIG9yIGxhdGVyLgog ICogU2VlIHRoZSBDT1BZSU5HIGZpbGUgaW4gdGhlIHRvcC1sZXZlbCBkaXJlY3RvcnkuCkBAIC0x Nyw0ICsxOCw5IEBAIEkyQ0J1cyAqcGlpeDRfcG1faW5pdChQQ0lCdXMgKmJ1cywgaW50IGRldmZu LCB1aW50MzJfdCBzbWJfaW9fYmFzZSwKICAgICAgICAgICAgICAgICAgICAgICBxZW11X2lycSBz Y2lfaXJxLCBxZW11X2lycSBzbWlfaXJxLAogICAgICAgICAgICAgICAgICAgICAgIGludCBzbW1f ZW5hYmxlZCwgRGV2aWNlU3RhdGUgKipwaWl4NF9wbSk7CiAKK2V4dGVybiBQQ0lEZXZpY2UgKnBp aXg0X2RldjsKKworRGV2aWNlU3RhdGUgKnBpaXg0X2NyZWF0ZShQQ0lCdXMgKnBjaV9idXMsIElT QUJ1cyAqKmlzYV9idXMsCisgICAgICAgICAgICAgICAgICAgICAgICAgIEkyQ0J1cyAqKnNtYnVz LCBzaXplX3QgaWRlX2J1c2VzKTsKKwogI2VuZGlmCi0tIAoyLjIxLjAKCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0 Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qu b3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs 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 7AD5AC10F14 for ; Tue, 15 Oct 2019 16:30:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5ABFA2086A for ; Tue, 15 Oct 2019 16:30:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388064AbfJOQa4 (ORCPT ); Tue, 15 Oct 2019 12:30:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38400 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729840AbfJOQa4 (ORCPT ); Tue, 15 Oct 2019 12:30:56 -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 84B7D3082B41; Tue, 15 Oct 2019 16:30:55 +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 A8F7219C58; Tue, 15 Oct 2019 16:30:46 +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 19/32] hw/isa/piix4: Move piix4_create() to hw/isa/piix4.c Date: Tue, 15 Oct 2019 18:26:52 +0200 Message-Id: <20191015162705.28087-20-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.45]); Tue, 15 Oct 2019 16:30:55 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Philippe Mathieu-Daudé Now that we properly refactored the piix4_create() function, let's move it to hw/isa/piix4.c where it belongs, so it can be reused on other places. Signed-off-by: Philippe Mathieu-Daudé --- hw/isa/piix4.c | 30 ++++++++++++++++++++++++++++++ hw/mips/gt64xxx_pci.c | 1 + hw/mips/mips_malta.c | 28 ---------------------------- include/hw/i386/pc.h | 2 -- include/hw/southbridge/piix.h | 6 ++++++ 5 files changed, 37 insertions(+), 30 deletions(-) diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index 9f554747af..d90899e122 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -27,12 +27,14 @@ #include "qapi/error.h" #include "hw/irq.h" #include "hw/i386/pc.h" +#include "hw/southbridge/piix.h" #include "hw/pci/pci.h" #include "hw/isa/isa.h" #include "hw/sysbus.h" #include "hw/dma/i8257.h" #include "hw/timer/i8254.h" #include "hw/timer/mc146818rtc.h" +#include "hw/ide.h" #include "migration/vmstate.h" #include "sysemu/reset.h" #include "sysemu/runstate.h" @@ -234,3 +236,31 @@ static void piix4_register_types(void) } type_init(piix4_register_types) + +DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, + I2CBus **smbus, size_t ide_buses) +{ + size_t ide_drives = ide_buses * MAX_IDE_DEVS; + DriveInfo **hd; + PCIDevice *pci; + DeviceState *dev; + + pci = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0), + true, TYPE_PIIX4_PCI_DEVICE); + dev = DEVICE(pci); + if (isa_bus) { + *isa_bus = ISA_BUS(qdev_get_child_bus(dev, "isa.0")); + } + + hd = g_new(DriveInfo *, ide_drives); + ide_drive_get(hd, ide_drives); + pci_piix4_ide_init(pci_bus, hd, pci->devfn + 1); + g_free(hd); + pci_create_simple(pci_bus, pci->devfn + 2, "piix4-usb-uhci"); + if (smbus) { + *smbus = piix4_pm_init(pci_bus, pci->devfn + 3, 0x1100, + isa_get_irq(NULL, 9), NULL, 0, NULL); + } + + return dev; +} diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c index f325bd6c1c..c277398c0d 100644 --- a/hw/mips/gt64xxx_pci.c +++ b/hw/mips/gt64xxx_pci.c @@ -28,6 +28,7 @@ #include "hw/mips/mips.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" +#include "hw/southbridge/piix.h" #include "migration/vmstate.h" #include "hw/i386/pc.h" #include "hw/irq.h" diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 0d4312840b..477a4725c0 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1210,34 +1210,6 @@ static void mips_create_cpu(MachineState *ms, MaltaState *s, } } -static DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, - I2CBus **smbus, size_t ide_buses) -{ - const size_t ide_drives = ide_buses * MAX_IDE_DEVS; - DriveInfo **hd; - PCIDevice *pci; - DeviceState *dev; - - pci = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0), - true, TYPE_PIIX4_PCI_DEVICE); - dev = DEVICE(pci); - if (isa_bus) { - *isa_bus = ISA_BUS(qdev_get_child_bus(dev, "isa.0")); - } - - hd = g_new(DriveInfo *, ide_drives); - ide_drive_get(hd, ide_drives); - pci_piix4_ide_init(pci_bus, hd, pci->devfn + 1); - g_free(hd); - pci_create_simple(pci_bus, pci->devfn + 2, "piix4-usb-uhci"); - if (smbus) { - *smbus = piix4_pm_init(pci_bus, pci->devfn + 3, 0x1100, - isa_get_irq(NULL, 9), NULL, 0, NULL); - } - - return dev; -} - static void mips_malta_init(MachineState *machine) { diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index c671c9fd2a..b63fc7631e 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -274,8 +274,6 @@ PCIBus *i440fx_init(const char *host_type, const char *pci_type, MemoryRegion *ram_memory); PCIBus *find_i440fx(void); -/* piix4.c */ -extern PCIDevice *piix4_dev; /* pc_sysfw.c */ void pc_system_flash_create(PCMachineState *pcms); diff --git a/include/hw/southbridge/piix.h b/include/hw/southbridge/piix.h index b8ce26fec4..add352456b 100644 --- a/include/hw/southbridge/piix.h +++ b/include/hw/southbridge/piix.h @@ -2,6 +2,7 @@ * QEMU PIIX South Bridge Emulation * * Copyright (c) 2006 Fabrice Bellard + * Copyright (c) 2018 Hervé Poussineau * * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. @@ -17,4 +18,9 @@ I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, qemu_irq sci_irq, qemu_irq smi_irq, int smm_enabled, DeviceState **piix4_pm); +extern PCIDevice *piix4_dev; + +DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, + I2CBus **smbus, size_t ide_buses); + #endif -- 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 656A9C10F14 for ; Tue, 15 Oct 2019 16:43:30 +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 3A82620650 for ; Tue, 15 Oct 2019 16:43:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3A82620650 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]:52862 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKPuy-00027S-R6 for qemu-devel@archiver.kernel.org; Tue, 15 Oct 2019 12:43:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41723) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKPis-0003fl-4K for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:30:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iKPiq-0006Am-LF for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:30:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54346) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iKPiq-0006AM-D6 for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:30:56 -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 84B7D3082B41; Tue, 15 Oct 2019 16:30:55 +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 A8F7219C58; Tue, 15 Oct 2019 16:30:46 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 19/32] hw/isa/piix4: Move piix4_create() to hw/isa/piix4.c Date: Tue, 15 Oct 2019 18:26:52 +0200 Message-Id: <20191015162705.28087-20-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.45]); Tue, 15 Oct 2019 16:30:55 +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 Now that we properly refactored the piix4_create() function, let's move it to hw/isa/piix4.c where it belongs, so it can be reused on other places. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/piix4.c | 30 ++++++++++++++++++++++++++++++ hw/mips/gt64xxx_pci.c | 1 + hw/mips/mips_malta.c | 28 ---------------------------- include/hw/i386/pc.h | 2 -- include/hw/southbridge/piix.h | 6 ++++++ 5 files changed, 37 insertions(+), 30 deletions(-) diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index 9f554747af..d90899e122 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -27,12 +27,14 @@ #include "qapi/error.h" #include "hw/irq.h" #include "hw/i386/pc.h" +#include "hw/southbridge/piix.h" #include "hw/pci/pci.h" #include "hw/isa/isa.h" #include "hw/sysbus.h" #include "hw/dma/i8257.h" #include "hw/timer/i8254.h" #include "hw/timer/mc146818rtc.h" +#include "hw/ide.h" #include "migration/vmstate.h" #include "sysemu/reset.h" #include "sysemu/runstate.h" @@ -234,3 +236,31 @@ static void piix4_register_types(void) } =20 type_init(piix4_register_types) + +DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, + I2CBus **smbus, size_t ide_buses) +{ + size_t ide_drives =3D ide_buses * MAX_IDE_DEVS; + DriveInfo **hd; + PCIDevice *pci; + DeviceState *dev; + + pci =3D pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0), + true, TYPE_PIIX4_PCI_DEVICE); + dev =3D DEVICE(pci); + if (isa_bus) { + *isa_bus =3D ISA_BUS(qdev_get_child_bus(dev, "isa.0")); + } + + hd =3D g_new(DriveInfo *, ide_drives); + ide_drive_get(hd, ide_drives); + pci_piix4_ide_init(pci_bus, hd, pci->devfn + 1); + g_free(hd); + pci_create_simple(pci_bus, pci->devfn + 2, "piix4-usb-uhci"); + if (smbus) { + *smbus =3D piix4_pm_init(pci_bus, pci->devfn + 3, 0x1100, + isa_get_irq(NULL, 9), NULL, 0, NULL); + } + + return dev; +} diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c index f325bd6c1c..c277398c0d 100644 --- a/hw/mips/gt64xxx_pci.c +++ b/hw/mips/gt64xxx_pci.c @@ -28,6 +28,7 @@ #include "hw/mips/mips.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" +#include "hw/southbridge/piix.h" #include "migration/vmstate.h" #include "hw/i386/pc.h" #include "hw/irq.h" diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 0d4312840b..477a4725c0 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1210,34 +1210,6 @@ static void mips_create_cpu(MachineState *ms, Malt= aState *s, } } =20 -static DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, - I2CBus **smbus, size_t ide_buses) -{ - const size_t ide_drives =3D ide_buses * MAX_IDE_DEVS; - DriveInfo **hd; - PCIDevice *pci; - DeviceState *dev; - - pci =3D pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0), - true, TYPE_PIIX4_PCI_DEVICE); - dev =3D DEVICE(pci); - if (isa_bus) { - *isa_bus =3D ISA_BUS(qdev_get_child_bus(dev, "isa.0")); - } - - hd =3D g_new(DriveInfo *, ide_drives); - ide_drive_get(hd, ide_drives); - pci_piix4_ide_init(pci_bus, hd, pci->devfn + 1); - g_free(hd); - pci_create_simple(pci_bus, pci->devfn + 2, "piix4-usb-uhci"); - if (smbus) { - *smbus =3D piix4_pm_init(pci_bus, pci->devfn + 3, 0x1100, - isa_get_irq(NULL, 9), NULL, 0, NULL); - } - - return dev; -} - static void mips_malta_init(MachineState *machine) { diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index c671c9fd2a..b63fc7631e 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -274,8 +274,6 @@ PCIBus *i440fx_init(const char *host_type, const char= *pci_type, MemoryRegion *ram_memory); =20 PCIBus *find_i440fx(void); -/* piix4.c */ -extern PCIDevice *piix4_dev; =20 /* pc_sysfw.c */ void pc_system_flash_create(PCMachineState *pcms); diff --git a/include/hw/southbridge/piix.h b/include/hw/southbridge/piix.= h index b8ce26fec4..add352456b 100644 --- a/include/hw/southbridge/piix.h +++ b/include/hw/southbridge/piix.h @@ -2,6 +2,7 @@ * QEMU PIIX South Bridge Emulation * * Copyright (c) 2006 Fabrice Bellard + * Copyright (c) 2018 Herv=C3=A9 Poussineau * * 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. @@ -17,4 +18,9 @@ I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t = smb_io_base, qemu_irq sci_irq, qemu_irq smi_irq, int smm_enabled, DeviceState **piix4_pm); =20 +extern PCIDevice *piix4_dev; + +DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, + I2CBus **smbus, size_t ide_buses); + #endif --=20 2.21.0