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 57C84C10F14 for ; Tue, 15 Oct 2019 16:32:41 +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 31B3C20873 for ; Tue, 15 Oct 2019 16:32:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 31B3C20873 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 1iKPkK-0005sQ-Ag; Tue, 15 Oct 2019 16:32:28 +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-0005rR-Um for xen-devel@lists.xenproject.org; Tue, 15 Oct 2019 16:32:26 +0000 X-Inumbo-ID: 5f59fa6c-ef69-11e9-9397-12813bfff9fa Received: from mx1.redhat.com (unknown [209.132.183.28]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 5f59fa6c-ef69-11e9-9397-12813bfff9fa; Tue, 15 Oct 2019 16:32:26 +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 CF7F618CB911; Tue, 15 Oct 2019 16:32:25 +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 26E3619C58; Tue, 15 Oct 2019 16:32:16 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 15 Oct 2019 18:26:59 +0200 Message-Id: <20191015162705.28087-27-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.6.2 (mx1.redhat.com [10.5.110.63]); Tue, 15 Oct 2019 16:32:25 +0000 (UTC) Subject: [Xen-devel] [PATCH 26/32] 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: 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" RnJvbTogUGhpbGlwcGUgTWF0aGlldS1EYXVkw6kgPGY0YnVnQGFtc2F0Lm9yZz4KClRoZSBSQ1Jf SU9QT1JUIHJlZ2lzdGVyIGJlbG9uZ3MgdG8gdGhlIFBJSVggY2hpcHNldC4KTW92ZSB0aGUgZGVm aW5pdGlvbiB0byAicGlpeC5oIi4KClNpZ25lZC1vZmYtYnk6IFBoaWxpcHBlIE1hdGhpZXUtRGF1 ZMOpIDxwaGlsbWRAcmVkaGF0LmNvbT4KLS0tCiBody9wY2ktaG9zdC9waWl4LmMgICAgICAgICAg ICB8IDEgKwogaW5jbHVkZS9ody9pMzg2L3BjLmggICAgICAgICAgfCA2IC0tLS0tLQogaW5jbHVk ZS9ody9zb3V0aGJyaWRnZS9waWl4LmggfCA2ICsrKysrKwogMyBmaWxlcyBjaGFuZ2VkLCA3IGlu c2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvaHcvcGNpLWhvc3QvcGlp eC5jIGIvaHcvcGNpLWhvc3QvcGlpeC5jCmluZGV4IDMyOTI3MDNkZTcuLjM3NzA1NzVjMWEgMTAw NjQ0Ci0tLSBhL2h3L3BjaS1ob3N0L3BpaXguYworKysgYi9ody9wY2ktaG9zdC9waWl4LmMKQEAg LTI3LDYgKzI3LDcgQEAKICNpbmNsdWRlICJody9pcnEuaCIKICNpbmNsdWRlICJody9wY2kvcGNp LmgiCiAjaW5jbHVkZSAiaHcvcGNpL3BjaV9ob3N0LmgiCisjaW5jbHVkZSAiaHcvc291dGhicmlk Z2UvcGlpeC5oIgogI2luY2x1ZGUgImh3L3FkZXYtcHJvcGVydGllcy5oIgogI2luY2x1ZGUgImh3 L2lzYS9pc2EuaCIKICNpbmNsdWRlICJody9zeXNidXMuaCIKZGlmZiAtLWdpdCBhL2luY2x1ZGUv aHcvaTM4Ni9wYy5oIGIvaW5jbHVkZS9ody9pMzg2L3BjLmgKaW5kZXggMTgzMzI2ZDlmZS4uMWMy MGI5NjU3MSAxMDA2NDQKLS0tIGEvaW5jbHVkZS9ody9pMzg2L3BjLmgKKysrIGIvaW5jbHVkZS9o dy9pMzg2L3BjLmgKQEAgLTI1NywxMiArMjU3LDYgQEAgdHlwZWRlZiBzdHJ1Y3QgUENJSTQ0MEZY U3RhdGUgUENJSTQ0MEZYU3RhdGU7CiAKICNkZWZpbmUgVFlQRV9JR0RfUEFTU1RIUk9VR0hfSTQ0 MEZYX1BDSV9ERVZJQ0UgImlnZC1wYXNzdGhyb3VnaC1pNDQwRlgiCiAKLS8qCi0gKiBSZXNldCBD b250cm9sIFJlZ2lzdGVyOiBQQ0ktYWNjZXNzaWJsZSBJU0EtQ29tcGF0aWJsZSBSZWdpc3RlciBh dCBhZGRyZXNzCi0gKiAweGNmOSwgcHJvdmlkZWQgYnkgdGhlIFBDSS9JU0EgYnJpZGdlIChQSUlY MyBQQ0kgZnVuY3Rpb24gMCwgODA4Njo3MDAwKS4KLSAqLwotI2RlZmluZSBSQ1JfSU9QT1JUIDB4 Y2Y5Ci0KIFBDSUJ1cyAqaTQ0MGZ4X2luaXQoY29uc3QgY2hhciAqaG9zdF90eXBlLCBjb25zdCBj aGFyICpwY2lfdHlwZSwKICAgICAgICAgICAgICAgICAgICAgUENJSTQ0MEZYU3RhdGUgKipwaTQ0 MGZ4X3N0YXRlLCBpbnQgKnBpaXhfZGV2Zm4sCiAgICAgICAgICAgICAgICAgICAgIElTQUJ1cyAq KmlzYV9idXMsIHFlbXVfaXJxICpwaWMsCmRpZmYgLS1naXQgYS9pbmNsdWRlL2h3L3NvdXRoYnJp ZGdlL3BpaXguaCBiL2luY2x1ZGUvaHcvc291dGhicmlkZ2UvcGlpeC5oCmluZGV4IGFkZDM1MjQ1 NmIuLjc5ZWJlMDA4OWIgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvaHcvc291dGhicmlkZ2UvcGlpeC5o CisrKyBiL2luY2x1ZGUvaHcvc291dGhicmlkZ2UvcGlpeC5oCkBAIC0xOCw2ICsxOCwxMiBAQCBJ MkNCdXMgKnBpaXg0X3BtX2luaXQoUENJQnVzICpidXMsIGludCBkZXZmbiwgdWludDMyX3Qgc21i X2lvX2Jhc2UsCiAgICAgICAgICAgICAgICAgICAgICAgcWVtdV9pcnEgc2NpX2lycSwgcWVtdV9p cnEgc21pX2lycSwKICAgICAgICAgICAgICAgICAgICAgICBpbnQgc21tX2VuYWJsZWQsIERldmlj ZVN0YXRlICoqcGlpeDRfcG0pOwogCisvKgorICogUmVzZXQgQ29udHJvbCBSZWdpc3RlcjogUENJ LWFjY2Vzc2libGUgSVNBLUNvbXBhdGlibGUgUmVnaXN0ZXIgYXQgYWRkcmVzcworICogMHhjZjks IHByb3ZpZGVkIGJ5IHRoZSBQQ0kvSVNBIGJyaWRnZSAoUElJWDMgUENJIGZ1bmN0aW9uIDAsIDgw ODY6NzAwMCkuCisgKi8KKyNkZWZpbmUgUkNSX0lPUE9SVCAweGNmOQorCiBleHRlcm4gUENJRGV2 aWNlICpwaWl4NF9kZXY7CiAKIERldmljZVN0YXRlICpwaWl4NF9jcmVhdGUoUENJQnVzICpwY2lf YnVzLCBJU0FCdXMgKippc2FfYnVzLAotLSAKMi4yMS4wCgoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2 ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWls bWFuL2xpc3RpbmZvL3hlbi1kZXZlbA== 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 9DD90ECE588 for ; Tue, 15 Oct 2019 16:32:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7CA8A20872 for ; Tue, 15 Oct 2019 16:32:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388140AbfJOQc0 (ORCPT ); Tue, 15 Oct 2019 12:32:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7372 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729863AbfJOQc0 (ORCPT ); Tue, 15 Oct 2019 12:32:26 -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 CF7F618CB911; Tue, 15 Oct 2019 16:32:25 +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 26E3619C58; Tue, 15 Oct 2019 16:32:16 +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 26/32] hw/pci-host/piix: Move RCR_IOPORT register definition Date: Tue, 15 Oct 2019 18:26:59 +0200 Message-Id: <20191015162705.28087-27-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.6.2 (mx1.redhat.com [10.5.110.63]); Tue, 15 Oct 2019 16:32:25 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Philippe Mathieu-Daudé The RCR_IOPORT register belongs to the PIIX chipset. Move the definition to "piix.h". Signed-off-by: Philippe Mathieu-Daudé --- hw/pci-host/piix.c | 1 + include/hw/i386/pc.h | 6 ------ include/hw/southbridge/piix.h | 6 ++++++ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index 3292703de7..3770575c1a 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" diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 183326d9fe..1c20b96571 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -257,12 +257,6 @@ typedef struct PCII440FXState PCII440FXState; #define TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE "igd-passthrough-i440FX" -/* - * Reset Control Register: PCI-accessible ISA-Compatible Register at address - * 0xcf9, provided by the PCI/ISA bridge (PIIX3 PCI function 0, 8086:7000). - */ -#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..79ebe0089b 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); +/* + * Reset Control Register: PCI-accessible ISA-Compatible Register at address + * 0xcf9, provided by the PCI/ISA bridge (PIIX3 PCI function 0, 8086:7000). + */ +#define RCR_IOPORT 0xcf9 + extern PCIDevice *piix4_dev; DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, -- 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 85B9AECE588 for ; Tue, 15 Oct 2019 16:52:26 +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 5AFC62064A for ; Tue, 15 Oct 2019 16:52:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5AFC62064A 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]:53046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKQ3c-0004TF-RJ for qemu-devel@archiver.kernel.org; Tue, 15 Oct 2019 12:52:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41986) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKPkL-0004nf-4q for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:32:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iKPkJ-00078U-27 for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:32:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58720) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iKPkI-000786-PC for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:32: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 CF7F618CB911; Tue, 15 Oct 2019 16:32:25 +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 26E3619C58; Tue, 15 Oct 2019 16:32:16 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 26/32] hw/pci-host/piix: Move RCR_IOPORT register definition Date: Tue, 15 Oct 2019 18:26:59 +0200 Message-Id: <20191015162705.28087-27-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.6.2 (mx1.redhat.com [10.5.110.63]); Tue, 15 Oct 2019 16:32:25 +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 RCR_IOPORT register belongs to the PIIX chipset. Move the definition to "piix.h". Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci-host/piix.c | 1 + include/hw/i386/pc.h | 6 ------ include/hw/southbridge/piix.h | 6 ++++++ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index 3292703de7..3770575c1a 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" diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 183326d9fe..1c20b96571 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -257,12 +257,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..79ebe0089b 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 RCR_IOPORT 0xcf9 + extern PCIDevice *piix4_dev; =20 DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, --=20 2.21.0