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 E31F7CA9EA0 for ; Fri, 18 Oct 2019 13:51:02 +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 C1435222BD for ; Fri, 18 Oct 2019 13:51:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C1435222BD 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 1iLSea-0006F7-OY; Fri, 18 Oct 2019 13:50:52 +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 1iLSeZ-0006ES-EE for xen-devel@lists.xenproject.org; Fri, 18 Oct 2019 13:50:51 +0000 X-Inumbo-ID: 446b6688-f1ae-11e9-93f5-12813bfff9fa Received: from mx1.redhat.com (unknown [209.132.183.28]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 446b6688-f1ae-11e9-93f5-12813bfff9fa; Fri, 18 Oct 2019 13:50:39 +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 8635951EF6; Fri, 18 Oct 2019 13:50:38 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.74]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8AE1360BF1; Fri, 18 Oct 2019 13:50:25 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Fri, 18 Oct 2019 15:47:48 +0200 Message-Id: <20191018134754.16362-15-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.30]); Fri, 18 Oct 2019 13:50:38 +0000 (UTC) Subject: [Xen-devel] [PATCH v2 14/20] hw/pci-host/piix: Move RCR_IOPORT register definition 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" RnJvbTogUGhpbGlwcGUgTWF0aGlldS1EYXVkw6kgPGY0YnVnQGFtc2F0Lm9yZz4KClRoZSBSQ1Jf SU9QT1JUIHJlZ2lzdGVyIGJlbG9uZ3MgdG8gdGhlIFBJSVggY2hpcHNldC4KTW92ZSB0aGUgZGVm aW5pdGlvbiB0byAicGlpeC5oIiwgYW5kIHByZXBlbmQgdGhlIFBJSVggcHJlZml4LgoKUmV2aWV3 ZWQtYnk6IEFsZWtzYW5kYXIgTWFya292aWMgPGFtYXJrb3ZpY0B3YXZlY29tcC5jb20+ClNpZ25l ZC1vZmYtYnk6IFBoaWxpcHBlIE1hdGhpZXUtRGF1ZMOpIDxwaGlsbWRAcmVkaGF0LmNvbT4KLS0t CnYyOiBwcmVwZW5kIFBJSVggcHJlZml4IChBbGVrc2FuZGFyKQotLS0KIGh3L2kzODYvYWNwaS1i dWlsZC5jICAgICAgICAgIHwgMiArLQogaHcvcGNpLWhvc3QvcGlpeC5jICAgICAgICAgICAgfCA3 ICsrKystLS0KIGluY2x1ZGUvaHcvaTM4Ni9wYy5oICAgICAgICAgIHwgNiAtLS0tLS0KIGluY2x1 ZGUvaHcvc291dGhicmlkZ2UvcGlpeC5oIHwgNiArKysrKysKIDQgZmlsZXMgY2hhbmdlZCwgMTEg aW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvaHcvaTM4Ni9hY3Bp LWJ1aWxkLmMgYi9ody9pMzg2L2FjcGktYnVpbGQuYwppbmRleCA1NmM0MjdmNzcyLi40NzhjYTI5 ODc0IDEwMDY0NAotLS0gYS9ody9pMzg2L2FjcGktYnVpbGQuYworKysgYi9ody9pMzg2L2FjcGkt YnVpbGQuYwpAQCAtMjA5LDcgKzIwOSw3IEBAIHN0YXRpYyB2b2lkIGFjcGlfZ2V0X3BtX2luZm8o TWFjaGluZVN0YXRlICptYWNoaW5lLCBBY3BpUG1JbmZvICpwbSkKIAogICAgIC8qIFRoZSBhYm92 ZSBuZWVkIG5vdCBiZSBjb25kaXRpb25hbCBvbiBtYWNoaW5lIHR5cGUgYmVjYXVzZSB0aGUgcmVz ZXQgcG9ydAogICAgICAqIGhhcHBlbnMgdG8gYmUgdGhlIHNhbWUgb24gUElJWCAocGMpIGFuZCBJ Q0g5IChxMzUpLiAqLwotICAgIFFFTVVfQlVJTERfQlVHX09OKElDSDlfUlNUX0NOVF9JT1BPUlQg IT0gUkNSX0lPUE9SVCk7CisgICAgUUVNVV9CVUlMRF9CVUdfT04oSUNIOV9SU1RfQ05UX0lPUE9S VCAhPSBQSUlYX1JDUl9JT1BPUlQpOwogCiAgICAgLyogRmlsbCBpbiBvcHRpb25hbCBzMy9zNCBy ZWxhdGVkIHByb3BlcnRpZXMgKi8KICAgICBvID0gb2JqZWN0X3Byb3BlcnR5X2dldF9xb2JqZWN0 KG9iaiwgQUNQSV9QTV9QUk9QX1MzX0RJU0FCTEVELCBOVUxMKTsKZGlmZiAtLWdpdCBhL2h3L3Bj aS1ob3N0L3BpaXguYyBiL2h3L3BjaS1ob3N0L3BpaXguYwppbmRleCAzMjkyNzAzZGU3Li42NTQ4 ZDlhNGI1IDEwMDY0NAotLS0gYS9ody9wY2ktaG9zdC9waWl4LmMKKysrIGIvaHcvcGNpLWhvc3Qv cGlpeC5jCkBAIC0yNyw2ICsyNyw3IEBACiAjaW5jbHVkZSAiaHcvaXJxLmgiCiAjaW5jbHVkZSAi aHcvcGNpL3BjaS5oIgogI2luY2x1ZGUgImh3L3BjaS9wY2lfaG9zdC5oIgorI2luY2x1ZGUgImh3 L3NvdXRoYnJpZGdlL3BpaXguaCIKICNpbmNsdWRlICJody9xZGV2LXByb3BlcnRpZXMuaCIKICNp bmNsdWRlICJody9pc2EvaXNhLmgiCiAjaW5jbHVkZSAiaHcvc3lzYnVzLmgiCkBAIC04Nyw3ICs4 OCw3IEBAIHR5cGVkZWYgc3RydWN0IFBJSVgzU3RhdGUgewogICAgIC8qIFJlc2V0IENvbnRyb2wg UmVnaXN0ZXIgY29udGVudHMgKi8KICAgICB1aW50OF90IHJjcjsKIAotICAgIC8qIElPIG1lbW9y eSByZWdpb24gZm9yIFJlc2V0IENvbnRyb2wgUmVnaXN0ZXIgKFJDUl9JT1BPUlQpICovCisgICAg LyogSU8gbWVtb3J5IHJlZ2lvbiBmb3IgUmVzZXQgQ29udHJvbCBSZWdpc3RlciAoUElJWF9SQ1Jf SU9QT1JUKSAqLwogICAgIE1lbW9yeVJlZ2lvbiByY3JfbWVtOwogfSBQSUlYM1N0YXRlOwogCkBA IC02OTUsOCArNjk2LDggQEAgc3RhdGljIHZvaWQgcGlpeDNfcmVhbGl6ZShQQ0lEZXZpY2UgKmRl diwgRXJyb3IgKiplcnJwKQogCiAgICAgbWVtb3J5X3JlZ2lvbl9pbml0X2lvKCZkLT5yY3JfbWVt LCBPQkpFQ1QoZGV2KSwgJnJjcl9vcHMsIGQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICJw aWl4My1yZXNldC1jb250cm9sIiwgMSk7Ci0gICAgbWVtb3J5X3JlZ2lvbl9hZGRfc3VicmVnaW9u X292ZXJsYXAocGNpX2FkZHJlc3Nfc3BhY2VfaW8oZGV2KSwgUkNSX0lPUE9SVCwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmZC0+cmNyX21lbSwgMSk7CisgICAgbWVt b3J5X3JlZ2lvbl9hZGRfc3VicmVnaW9uX292ZXJsYXAocGNpX2FkZHJlc3Nfc3BhY2VfaW8oZGV2 KSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQSUlYX1JDUl9JT1BP UlQsICZkLT5yY3JfbWVtLCAxKTsKIAogICAgIHFlbXVfcmVnaXN0ZXJfcmVzZXQocGlpeDNfcmVz ZXQsIGQpOwogfQpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9ody9pMzg2L3BjLmggYi9pbmNsdWRlL2h3 L2kzODYvcGMuaAppbmRleCA4NDgwNzhiYWNjLi4yNjI4ZGU4YjcyIDEwMDY0NAotLS0gYS9pbmNs dWRlL2h3L2kzODYvcGMuaAorKysgYi9pbmNsdWRlL2h3L2kzODYvcGMuaApAQCAtMjYwLDEyICsy NjAsNiBAQCB0eXBlZGVmIHN0cnVjdCBQQ0lJNDQwRlhTdGF0ZSBQQ0lJNDQwRlhTdGF0ZTsKIAog I2RlZmluZSBUWVBFX0lHRF9QQVNTVEhST1VHSF9JNDQwRlhfUENJX0RFVklDRSAiaWdkLXBhc3N0 aHJvdWdoLWk0NDBGWCIKIAotLyoKLSAqIFJlc2V0IENvbnRyb2wgUmVnaXN0ZXI6IFBDSS1hY2Nl c3NpYmxlIElTQS1Db21wYXRpYmxlIFJlZ2lzdGVyIGF0IGFkZHJlc3MKLSAqIDB4Y2Y5LCBwcm92 aWRlZCBieSB0aGUgUENJL0lTQSBicmlkZ2UgKFBJSVgzIFBDSSBmdW5jdGlvbiAwLCA4MDg2Ojcw MDApLgotICovCi0jZGVmaW5lIFJDUl9JT1BPUlQgMHhjZjkKLQogUENJQnVzICppNDQwZnhfaW5p dChjb25zdCBjaGFyICpob3N0X3R5cGUsIGNvbnN0IGNoYXIgKnBjaV90eXBlLAogICAgICAgICAg ICAgICAgICAgICBQQ0lJNDQwRlhTdGF0ZSAqKnBpNDQwZnhfc3RhdGUsIGludCAqcGlpeF9kZXZm biwKICAgICAgICAgICAgICAgICAgICAgSVNBQnVzICoqaXNhX2J1cywgcWVtdV9pcnEgKnBpYywK ZGlmZiAtLWdpdCBhL2luY2x1ZGUvaHcvc291dGhicmlkZ2UvcGlpeC5oIGIvaW5jbHVkZS9ody9z b3V0aGJyaWRnZS9waWl4LmgKaW5kZXggYWRkMzUyNDU2Yi4uZTQ5ZDRhNmJiZSAxMDA2NDQKLS0t IGEvaW5jbHVkZS9ody9zb3V0aGJyaWRnZS9waWl4LmgKKysrIGIvaW5jbHVkZS9ody9zb3V0aGJy aWRnZS9waWl4LmgKQEAgLTE4LDYgKzE4LDEyIEBAIEkyQ0J1cyAqcGlpeDRfcG1faW5pdChQQ0lC dXMgKmJ1cywgaW50IGRldmZuLCB1aW50MzJfdCBzbWJfaW9fYmFzZSwKICAgICAgICAgICAgICAg ICAgICAgICBxZW11X2lycSBzY2lfaXJxLCBxZW11X2lycSBzbWlfaXJxLAogICAgICAgICAgICAg ICAgICAgICAgIGludCBzbW1fZW5hYmxlZCwgRGV2aWNlU3RhdGUgKipwaWl4NF9wbSk7CiAKKy8q CisgKiBSZXNldCBDb250cm9sIFJlZ2lzdGVyOiBQQ0ktYWNjZXNzaWJsZSBJU0EtQ29tcGF0aWJs ZSBSZWdpc3RlciBhdCBhZGRyZXNzCisgKiAweGNmOSwgcHJvdmlkZWQgYnkgdGhlIFBDSS9JU0Eg YnJpZGdlIChQSUlYMyBQQ0kgZnVuY3Rpb24gMCwgODA4Njo3MDAwKS4KKyAqLworI2RlZmluZSBQ SUlYX1JDUl9JT1BPUlQgMHhjZjkKKwogZXh0ZXJuIFBDSURldmljZSAqcGlpeDRfZGV2OwogCiBE ZXZpY2VTdGF0ZSAqcGlpeDRfY3JlYXRlKFBDSUJ1cyAqcGNpX2J1cywgSVNBQnVzICoqaXNhX2J1 cywKLS0gCjIuMjEuMAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qu b3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2 ZWw= 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 53939CA9EA1 for ; Fri, 18 Oct 2019 13:58:43 +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 285C3222BD for ; Fri, 18 Oct 2019 13:58:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 285C3222BD 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]:40452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLSm9-0006cC-78 for qemu-devel@archiver.kernel.org; Fri, 18 Oct 2019 09:58:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55252) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLSeO-000661-W5 for qemu-devel@nongnu.org; Fri, 18 Oct 2019 09:50:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLSeN-0006iN-Ko for qemu-devel@nongnu.org; Fri, 18 Oct 2019 09:50:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49476) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iLSeN-0006hu-CV for qemu-devel@nongnu.org; Fri, 18 Oct 2019 09:50:39 -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 8635951EF6; Fri, 18 Oct 2019 13:50:38 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.74]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8AE1360BF1; Fri, 18 Oct 2019 13:50:25 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 14/20] hw/pci-host/piix: Move RCR_IOPORT register definition Date: Fri, 18 Oct 2019 15:47:48 +0200 Message-Id: <20191018134754.16362-15-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.30]); Fri, 18 Oct 2019 13:50:38 +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 The RCR_IOPORT register belongs to the PIIX chipset. Move the definition to "piix.h", and prepend the PIIX prefix. Reviewed-by: Aleksandar Markovic Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v2: prepend PIIX prefix (Aleksandar) --- hw/i386/acpi-build.c | 2 +- hw/pci-host/piix.c | 7 ++++--- include/hw/i386/pc.h | 6 ------ include/hw/southbridge/piix.h | 6 ++++++ 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 56c427f772..478ca29874 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -209,7 +209,7 @@ static void acpi_get_pm_info(MachineState *machine, A= cpiPmInfo *pm) =20 /* The above need not be conditional on machine type because the res= et port * happens to be the same on PIIX (pc) and ICH9 (q35). */ - QEMU_BUILD_BUG_ON(ICH9_RST_CNT_IOPORT !=3D RCR_IOPORT); + QEMU_BUILD_BUG_ON(ICH9_RST_CNT_IOPORT !=3D PIIX_RCR_IOPORT); =20 /* Fill in optional s3/s4 related properties */ o =3D object_property_get_qobject(obj, ACPI_PM_PROP_S3_DISABLED, NUL= L); diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index 3292703de7..6548d9a4b5 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/southbridge/piix.h" #include "hw/qdev-properties.h" #include "hw/isa/isa.h" #include "hw/sysbus.h" @@ -87,7 +88,7 @@ typedef struct PIIX3State { /* Reset Control Register contents */ uint8_t rcr; =20 - /* IO memory region for Reset Control Register (RCR_IOPORT) */ + /* IO memory region for Reset Control Register (PIIX_RCR_IOPORT) */ MemoryRegion rcr_mem; } PIIX3State; =20 @@ -695,8 +696,8 @@ static void piix3_realize(PCIDevice *dev, Error **err= p) =20 memory_region_init_io(&d->rcr_mem, OBJECT(dev), &rcr_ops, d, "piix3-reset-control", 1); - memory_region_add_subregion_overlap(pci_address_space_io(dev), RCR_I= OPORT, - &d->rcr_mem, 1); + memory_region_add_subregion_overlap(pci_address_space_io(dev), + PIIX_RCR_IOPORT, &d->rcr_mem, 1)= ; =20 qemu_register_reset(piix3_reset, d); } diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 848078bacc..2628de8b72 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -260,12 +260,6 @@ typedef struct PCII440FXState PCII440FXState; =20 #define TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE "igd-passthrough-i440FX" =20 -/* - * Reset Control Register: PCI-accessible ISA-Compatible Register at add= ress - * 0xcf9, provided by the PCI/ISA bridge (PIIX3 PCI function 0, 8086:700= 0). - */ -#define RCR_IOPORT 0xcf9 - PCIBus *i440fx_init(const char *host_type, const char *pci_type, PCII440FXState **pi440fx_state, int *piix_devfn, ISABus **isa_bus, qemu_irq *pic, diff --git a/include/hw/southbridge/piix.h b/include/hw/southbridge/piix.= h index add352456b..e49d4a6bbe 100644 --- a/include/hw/southbridge/piix.h +++ b/include/hw/southbridge/piix.h @@ -18,6 +18,12 @@ 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 +/* + * Reset Control Register: PCI-accessible ISA-Compatible Register at add= ress + * 0xcf9, provided by the PCI/ISA bridge (PIIX3 PCI function 0, 8086:700= 0). + */ +#define PIIX_RCR_IOPORT 0xcf9 + extern PCIDevice *piix4_dev; =20 DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, --=20 2.21.0