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 3EA98ECE588 for ; Tue, 15 Oct 2019 16:29:59 +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 16E702086A for ; Tue, 15 Oct 2019 16:29:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 16E702086A 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 1iKPhl-0003pZ-JU; Tue, 15 Oct 2019 16:29:49 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iKPhl-0003p2-2S for xen-devel@lists.xenproject.org; Tue, 15 Oct 2019 16:29:49 +0000 X-Inumbo-ID: 012eb1f8-ef69-11e9-bbab-bc764e2007e4 Received: from mx1.redhat.com (unknown [209.132.183.28]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 012eb1f8-ef69-11e9-bbab-bc764e2007e4; Tue, 15 Oct 2019 16:29:48 +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 E85F880167A; Tue, 15 Oct 2019 16:29:47 +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 C046B19C58; Tue, 15 Oct 2019 16:29:39 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 15 Oct 2019 18:26:46 +0200 Message-Id: <20191015162705.28087-14-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.67]); Tue, 15 Oct 2019 16:29:48 +0000 (UTC) Subject: [Xen-devel] [PATCH 13/32] piix4: convert reset function to QOM 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" , 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" RnJvbTogSGVydsOpIFBvdXNzaW5lYXUgPGhwb3Vzc2luQHJlYWN0b3Mub3JnPgoKQWNrZWQtYnk6 IE1pY2hhZWwgUy4gVHNpcmtpbiA8bXN0QHJlZGhhdC5jb20+CkFja2VkLWJ5OiBQYW9sbyBCb256 aW5pIDxwYm9uemluaUByZWRoYXQuY29tPgpTaWduZWQtb2ZmLWJ5OiBIZXJ2w6kgUG91c3NpbmVh dSA8aHBvdXNzaW5AcmVhY3Rvcy5vcmc+Ck1lc3NhZ2UtSWQ6IDwyMDE4MDEwNjE1MzczMC4zMDMx My0xNS1ocG91c3NpbkByZWFjdG9zLm9yZz4KU2lnbmVkLW9mZi1ieTogUGhpbGlwcGUgTWF0aGll dS1EYXVkw6kgPHBoaWxtZEByZWRoYXQuY29tPgotLS0KIGh3L2lzYS9waWl4NC5jIHwgOCArKysr LS0tLQogMSBmaWxlIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9ody9pc2EvcGlpeDQuYyBiL2h3L2lzYS9waWl4NC5jCmluZGV4IGMzYTJiZDBk NzAuLjg5OThiMGNhNDcgMTAwNjQ0Ci0tLSBhL2h3L2lzYS9waWl4NC5jCisrKyBiL2h3L2lzYS9w aWl4NC5jCkBAIC00OCwxMCArNDgsMTAgQEAgdHlwZWRlZiBzdHJ1Y3QgUElJWDRTdGF0ZSB7CiAj ZGVmaW5lIFBJSVg0X1BDSV9ERVZJQ0Uob2JqKSBcCiAgICAgT0JKRUNUX0NIRUNLKFBJSVg0U3Rh dGUsIChvYmopLCBUWVBFX1BJSVg0X1BDSV9ERVZJQ0UpCiAKLXN0YXRpYyB2b2lkIHBpaXg0X3Jl c2V0KHZvaWQgKm9wYXF1ZSkKK3N0YXRpYyB2b2lkIHBpaXg0X3Jlc2V0KERldmljZVN0YXRlICpk ZXYpCiB7Ci0gICAgUElJWDRTdGF0ZSAqZCA9IG9wYXF1ZTsKLSAgICB1aW50OF90ICpwY2lfY29u ZiA9IGQtPmRldi5jb25maWc7CisgICAgUElJWDRTdGF0ZSAqcyA9IFBJSVg0X1BDSV9ERVZJQ0Uo ZGV2KTsKKyAgICB1aW50OF90ICpwY2lfY29uZiA9IHMtPmRldi5jb25maWc7CiAKICAgICBwY2lf Y29uZlsweDA0XSA9IDB4MDc7IC8vIG1hc3RlciwgbWVtb3J5IGFuZCBJL08KICAgICBwY2lfY29u ZlsweDA1XSA9IDB4MDA7CkBAIC0xNjUsNyArMTY1LDYgQEAgc3RhdGljIHZvaWQgcGlpeDRfcmVh bGl6ZShQQ0lEZXZpY2UgKnBjaV9kZXYsIEVycm9yICoqZXJycCkKICAgICBpc2FfYnVzX2lycXMo aXNhX2J1cywgcy0+aXNhKTsKIAogICAgIHBpaXg0X2RldiA9IHBjaV9kZXY7Ci0gICAgcWVtdV9y ZWdpc3Rlcl9yZXNldChwaWl4NF9yZXNldCwgcyk7CiB9CiAKIHN0YXRpYyB2b2lkIHBpaXg0X2Ns YXNzX2luaXQoT2JqZWN0Q2xhc3MgKmtsYXNzLCB2b2lkICpkYXRhKQpAQCAtMTc3LDYgKzE3Niw3 IEBAIHN0YXRpYyB2b2lkIHBpaXg0X2NsYXNzX2luaXQoT2JqZWN0Q2xhc3MgKmtsYXNzLCB2b2lk ICpkYXRhKQogICAgIGstPnZlbmRvcl9pZCA9IFBDSV9WRU5ET1JfSURfSU5URUw7CiAgICAgay0+ ZGV2aWNlX2lkID0gUENJX0RFVklDRV9JRF9JTlRFTF84MjM3MUFCXzA7CiAgICAgay0+Y2xhc3Nf aWQgPSBQQ0lfQ0xBU1NfQlJJREdFX0lTQTsKKyAgICBkYy0+cmVzZXQgPSBwaWl4NF9yZXNldDsK ICAgICBkYy0+ZGVzYyA9ICJJU0EgYnJpZGdlIjsKICAgICBkYy0+dm1zZCA9ICZ2bXN0YXRlX3Bp aXg0OwogICAgIC8qCi0tIAoyLjIxLjAKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54 ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGlu Zm8veGVuLWRldmVs 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 C9127ECE588 for ; Tue, 15 Oct 2019 16:29:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A644C214AE for ; Tue, 15 Oct 2019 16:29:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388043AbfJOQ3s (ORCPT ); Tue, 15 Oct 2019 12:29:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55394 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727651AbfJOQ3s (ORCPT ); Tue, 15 Oct 2019 12:29:48 -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 E85F880167A; Tue, 15 Oct 2019 16:29:47 +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 C046B19C58; Tue, 15 Oct 2019 16:29:39 +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?= Subject: [PATCH 13/32] piix4: convert reset function to QOM Date: Tue, 15 Oct 2019 18:26:46 +0200 Message-Id: <20191015162705.28087-14-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.67]); Tue, 15 Oct 2019 16:29:48 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Hervé Poussineau Acked-by: Michael S. Tsirkin Acked-by: Paolo Bonzini Signed-off-by: Hervé Poussineau Message-Id: <20180106153730.30313-15-hpoussin@reactos.org> Signed-off-by: Philippe Mathieu-Daudé --- hw/isa/piix4.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index c3a2bd0d70..8998b0ca47 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -48,10 +48,10 @@ typedef struct PIIX4State { #define PIIX4_PCI_DEVICE(obj) \ OBJECT_CHECK(PIIX4State, (obj), TYPE_PIIX4_PCI_DEVICE) -static void piix4_reset(void *opaque) +static void piix4_reset(DeviceState *dev) { - PIIX4State *d = opaque; - uint8_t *pci_conf = d->dev.config; + PIIX4State *s = PIIX4_PCI_DEVICE(dev); + uint8_t *pci_conf = s->dev.config; pci_conf[0x04] = 0x07; // master, memory and I/O pci_conf[0x05] = 0x00; @@ -165,7 +165,6 @@ static void piix4_realize(PCIDevice *pci_dev, Error **errp) isa_bus_irqs(isa_bus, s->isa); piix4_dev = pci_dev; - qemu_register_reset(piix4_reset, s); } static void piix4_class_init(ObjectClass *klass, void *data) @@ -177,6 +176,7 @@ static void piix4_class_init(ObjectClass *klass, void *data) k->vendor_id = PCI_VENDOR_ID_INTEL; k->device_id = PCI_DEVICE_ID_INTEL_82371AB_0; k->class_id = PCI_CLASS_BRIDGE_ISA; + dc->reset = piix4_reset; dc->desc = "ISA bridge"; dc->vmsd = &vmstate_piix4; /* -- 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 25EDBECE58F for ; Tue, 15 Oct 2019 16:39:38 +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 F2F2C20650 for ; Tue, 15 Oct 2019 16:39:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F2F2C20650 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]:52794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKPrF-0005Rv-4V for qemu-devel@archiver.kernel.org; Tue, 15 Oct 2019 12:39:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41367) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKPhm-0002JU-2l for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:29:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iKPhk-0005GH-VP for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:29:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56276) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iKPhk-0005Fr-Pj for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:29:48 -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 E85F880167A; Tue, 15 Oct 2019 16:29:47 +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 C046B19C58; Tue, 15 Oct 2019 16:29:39 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 13/32] piix4: convert reset function to QOM Date: Tue, 15 Oct 2019 18:26:46 +0200 Message-Id: <20191015162705.28087-14-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.67]); Tue, 15 Oct 2019 16:29:48 +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" , 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: Herv=C3=A9 Poussineau Acked-by: Michael S. Tsirkin Acked-by: Paolo Bonzini Signed-off-by: Herv=C3=A9 Poussineau Message-Id: <20180106153730.30313-15-hpoussin@reactos.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/piix4.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index c3a2bd0d70..8998b0ca47 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -48,10 +48,10 @@ typedef struct PIIX4State { #define PIIX4_PCI_DEVICE(obj) \ OBJECT_CHECK(PIIX4State, (obj), TYPE_PIIX4_PCI_DEVICE) =20 -static void piix4_reset(void *opaque) +static void piix4_reset(DeviceState *dev) { - PIIX4State *d =3D opaque; - uint8_t *pci_conf =3D d->dev.config; + PIIX4State *s =3D PIIX4_PCI_DEVICE(dev); + uint8_t *pci_conf =3D s->dev.config; =20 pci_conf[0x04] =3D 0x07; // master, memory and I/O pci_conf[0x05] =3D 0x00; @@ -165,7 +165,6 @@ static void piix4_realize(PCIDevice *pci_dev, Error *= *errp) isa_bus_irqs(isa_bus, s->isa); =20 piix4_dev =3D pci_dev; - qemu_register_reset(piix4_reset, s); } =20 static void piix4_class_init(ObjectClass *klass, void *data) @@ -177,6 +176,7 @@ static void piix4_class_init(ObjectClass *klass, void= *data) k->vendor_id =3D PCI_VENDOR_ID_INTEL; k->device_id =3D PCI_DEVICE_ID_INTEL_82371AB_0; k->class_id =3D PCI_CLASS_BRIDGE_ISA; + dc->reset =3D piix4_reset; dc->desc =3D "ISA bridge"; dc->vmsd =3D &vmstate_piix4; /* --=20 2.21.0