Received: by 2002:adf:e804:0:0:0:0:0 with SMTP id o4csp5234358wrm; Tue, 8 Oct 2019 07:26:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqzK46R4Vp4Q3qOl1NNJHrMLiW8AoOsRezNnue8Cw5POK7LjsVz+MA8WyD/cQSwRiWkghmYb X-Received: by 2002:a50:fc0c:: with SMTP id i12mr4499895edr.82.1570544810246; Tue, 08 Oct 2019 07:26:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570544810; cv=none; d=google.com; s=arc-20160816; b=UIKAsuRP5Q61ZDE1X6NbWbWdwcaqlhfQ7I3qqP0WJOdBuohvVOai4GJ/ePGRa0jXLY MygLl1Ew5rVuBhiJ4Gwqkr+sf/+P9tUdetgBR/+2UJPkk5+C1XZOhCe0XxGNikGrNQm3 DHQ3XC4H/W1+j0Ld24wSMKW9uWrdO/UJAoyqiDkrXH/trjwZTvj/p9oDZffcP85mOwyy jCGly4Eo+26vgLvkjx3F4b5i0zBdmIrGKshLcbq7zp/q1Qv/8rHKIjtu/ZA1PUFiOzKB oyWfn4fYw4GuLykcGW120+F5JG0PRrnxU0+Kj3f9mC8hU+NpBC/fuuvF6e+07+5PslM+ 9UhA== 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=sDbXzIS1Se+QTfpJNuy7szMpKrhpQ/d3eaMgNbT88Nk=; b=wgtUtvQyfPggrAQ/UUKm15EfJPHXrSsp5/k6UOS3nijvvKt1yE3uXhI/OyXKT7ca5X LwjS2lNUFv/oKYVGSUf4hqsENzl4DB9V1Td06JTHMjm8LMH/EAqk6Uqw9hd3Z4KTNUTD Kvq7TvPAD7p1zq2GnT1I/4krJ2oadNGKbfQG5DOFC+Zntf/y4jgYYfD61ZfuCGxmbgU9 YxBbAmirSgIXJKs3waiHcdwPULbg/iXthy8L1Z8jmXWQQwty54qts5RoSwSxZyeKRPL3 85Mvued51CFpHoaCvtouz/wmZ/aBH3DbHUzJo5YxcVfRFmlUw7v0BRgDyjb1Q67nOgEV gEPg== 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 z16si10580463edb.420.2019.10.08.07.26.50 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Oct 2019 07:26:50 -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]:56516 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iHqRs-0006Cn-8a for alex.bennee@linaro.org; Tue, 08 Oct 2019 10:26:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49898) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iHqRQ-0006Ar-Pa for qemu-arm@nongnu.org; Tue, 08 Oct 2019 10:26:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iHqRP-0008OX-Ne for qemu-arm@nongnu.org; Tue, 08 Oct 2019 10:26:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10503) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iHqRP-0008OI-Cx; Tue, 08 Oct 2019 10:26:19 -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 8330710DCC9C; Tue, 8 Oct 2019 14:26:18 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-43.brq.redhat.com [10.40.204.43]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C81CD19C69; Tue, 8 Oct 2019 14:26:00 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Eduardo Habkost , qemu-devel@nongnu.org Subject: [PATCH v2 1/8] hw/acpi/piix4: Convert reset handler to DeviceReset Date: Tue, 8 Oct 2019 16:25:32 +0200 Message-Id: <20191008142539.7793-2-philmd@redhat.com> In-Reply-To: <20191008142539.7793-1-philmd@redhat.com> References: <20191008142539.7793-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.64]); Tue, 08 Oct 2019 14:26:18 +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 , Marcel Apfelbaum , qemu-block@nongnu.org, "Michael S. Tsirkin" , Aleksandar Rikalo , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , BALATON Zoltan , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Aleksandar Markovic , Igor Mammedov , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Andrzej Zaborowski Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: Le+crZnUX9fO The PIIX4/PM 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: Igor Mammedov Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/acpi/piix4.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 5742c3df87..4e079b39bd 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -27,7 +27,6 @@ #include "hw/pci/pci.h" #include "hw/qdev-properties.h" #include "hw/acpi/acpi.h" -#include "sysemu/reset.h" #include "sysemu/runstate.h" #include "sysemu/sysemu.h" #include "qapi/error.h" @@ -344,9 +343,9 @@ static const VMStateDescription vmstate_acpi =3D { } }; =20 -static void piix4_reset(void *opaque) +static void piix4_pm_reset(DeviceState *dev) { - PIIX4PMState *s =3D opaque; + PIIX4PMState *s =3D PIIX4_PM(dev); PCIDevice *d =3D PCI_DEVICE(s); uint8_t *pci_conf =3D d->config; =20 @@ -542,7 +541,6 @@ static void piix4_pm_realize(PCIDevice *dev, Error **= errp) =20 s->machine_ready.notify =3D piix4_pm_machine_ready; qemu_add_machine_init_done_notifier(&s->machine_ready); - qemu_register_reset(piix4_reset, s); =20 piix4_acpi_system_hot_add_init(pci_address_space_io(dev), pci_get_bus(dev), s); @@ -692,6 +690,7 @@ static void piix4_pm_class_init(ObjectClass *klass, v= oid *data) k->device_id =3D PCI_DEVICE_ID_INTEL_82371AB_3; k->revision =3D 0x03; k->class_id =3D PCI_CLASS_BRIDGE_OTHER; + dc->reset =3D piix4_pm_reset; dc->desc =3D "PM"; dc->vmsd =3D &vmstate_acpi; dc->props =3D piix4_pm_properties; --=20 2.21.0