Received: by 2002:adf:e804:0:0:0:0:0 with SMTP id o4csp2371958wrm; Thu, 10 Oct 2019 06:24:05 -0700 (PDT) X-Google-Smtp-Source: APXvYqzFTdz+UN5bWHGd339S03tkginn/OxdHttaaZIvovl7Osi9PSckZlEEiopK1Sx4/9wUfDtl X-Received: by 2002:aed:2794:: with SMTP id a20mr10303628qtd.353.1570713845327; Thu, 10 Oct 2019 06:24:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570713845; cv=none; d=google.com; s=arc-20160816; b=x2zG0mWeDAah9Ebet/sTlyHgQXkoUSSpy15GX/fpahUirbcn2aCkGQhqkSYV3qAIzM fiukNGipfXsMW+FA/Ts/TmYr0nrlffNZAJ/hx45u/K01NJatnjQggErC7dgby9hZYFI2 /e/3rKYIS6eh8D+nJKgu4fsu8PQNg3rH9DF7dH0FcvanTMp762JdtOPUze/d8kl2gL2R 1svVWfx3AbnVMM+SZb+8tC19XpKBq4hal6atZ9uQvElY7wntyy4Sf4qyb3vl3aWpaqj1 iFRV4SZDQWOj9SSVzvUcVzIpO555+cNRfJ14a+67aZLe1fH9A0sQN2V9LsvW8ESw3w/G xc7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from; bh=Lt3BlfszPKhdObFiu+znH1KadBX+IZ8Nnr9aNd/bIrI=; b=II8fqW8tkUeRJhZ8khRWqixyHg7U7cdYsT6hH20qU4kQUvov2dlntT3ZkRZQpnM7xz HQTbIk8PpwN8Qi13BqhEjx++oz0ml+09JOUSzdPI6OTZ3kvhqri/A9k1Lef4Kmw+vXPo opBOIk8uye+Z8S/o5o3UrNujiTG8VPyDpLw2KdiAXze50OB7Mdd3zjXYwvB69HWpObvh isvj5nRI2qS7mPGHuIYLbAOah+ml4kgVeF6K9TJzelb+PQKbSHO7EdWK/AsoXS3JeUbA QUSV6KfLEfCnosRvIswgkPqCrHndD2Wa5Y4cXUbOYmDl4kDo9fp5YbcEA+ot+VKIjl0m nFIA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e40si5552733qtc.54.2019.10.10.06.24.05 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Oct 2019 06:24:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:39440 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIYQG-0000sI-5u for alex.bennee@linaro.org; Thu, 10 Oct 2019 09:24:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40430) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIYIh-0007vw-1S for qemu-arm@nongnu.org; Thu, 10 Oct 2019 09:16:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIYIg-0001zX-05 for qemu-arm@nongnu.org; Thu, 10 Oct 2019 09:16:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:31514) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIYIf-0001zD-Qq; Thu, 10 Oct 2019 09:16:13 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EAC193065603; Thu, 10 Oct 2019 13:16:12 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.241]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BE5BD600C4; Thu, 10 Oct 2019 13:15:52 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Eduardo Habkost , qemu-devel@nongnu.org Subject: [PATCH v3 2/8] hw/isa/piix4: Convert reset handler to DeviceReset Date: Thu, 10 Oct 2019 15:15:21 +0200 Message-Id: <20191010131527.32513-3-philmd@redhat.com> In-Reply-To: <20191010131527.32513-1-philmd@redhat.com> References: <20191010131527.32513-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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Thu, 10 Oct 2019 13:16:13 +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-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Aleksandar Markovic , qemu-block@nongnu.org, "Michael S. Tsirkin" , Aleksandar Rikalo , Andrzej Zaborowski , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Li Qiang , BALATON Zoltan , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Marcel Apfelbaum , Igor Mammedov , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , John Snow Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: qe84/Jk9+HwY The PIIX4/ISA is a PCI device within the PIIX4 chipset, it will be reset when the PCI bus it stands on is reset. Convert its reset handler into a proper Device reset method. Reviewed-by: Li Qiang Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/piix4.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index 3294056cd5..890d999abf 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -28,7 +28,6 @@ #include "hw/isa/isa.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "sysemu/reset.h" =20 PCIDevice *piix4_dev; =20 @@ -40,9 +39,9 @@ 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_isa_reset(DeviceState *dev) { - PIIX4State *d =3D opaque; + PIIX4State *d =3D PIIX4_PCI_DEVICE(dev); uint8_t *pci_conf =3D d->dev.config; =20 pci_conf[0x04] =3D 0x07; // master, memory and I/O @@ -97,7 +96,6 @@ static void piix4_realize(PCIDevice *dev, Error **errp) return; } piix4_dev =3D &d->dev; - qemu_register_reset(piix4_reset, d); } =20 int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn) @@ -118,6 +116,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_isa_reset; dc->desc =3D "ISA bridge"; dc->vmsd =3D &vmstate_piix4; /* --=20 2.21.0