From nobody Tue Oct 28 12:16:28 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 15153800733821010.9569110220972; Sun, 7 Jan 2018 18:54:33 -0800 (PST) Received: from localhost ([::1]:59384 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYNZv-0004qI-CS for importer@patchew.org; Sun, 07 Jan 2018 21:54:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51457) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYNSg-0006zY-ES for qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:46:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eYNSf-0002Yn-NB for qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:46:54 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:43133) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eYNSf-0002Yc-Id for qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:46:53 -0500 Received: by mail-qt0-x243.google.com with SMTP id w10so12061456qtb.10 for ; Sun, 07 Jan 2018 18:46:53 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id d10sm7156245qkg.16.2018.01.07.18.46.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Jan 2018 18:46:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HNW4/gvFil7lDbbY47/WAmP4CZ8NxhCc5olKTRqzabg=; b=gyi+nOyPAUucBDfJn4+rRhxxkg89leiAk6aWbS6R1bdpbc7UnEiShgwWz3tUm3ckcz ZQQiNyV0wEsd0inDOcnTL1kaKEGu9fJoJa7BLkUZycXfSRSCD5M/rssWR8Y9Jc6zmWhj G1DWB//WrH1FLX9sFQiL2oawvt0yS3TZO9D6xvEai0r2+hRhnD+E7l2pKvDoVf2d19U4 ksI0RXVcz38s94DrfGltZVRTiMSC/iztLonIoJmbd5IlpxtpQItJO07YAoWIaib/BjoP IJPPdIhZ1pFXjOoRqL1JQ7/02Ej0gMUmA8fOJqLi6yTIYmzUSGC9/YdjK3h1xEqLS8e4 BF4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=HNW4/gvFil7lDbbY47/WAmP4CZ8NxhCc5olKTRqzabg=; b=CTYuFQ88dFMqouUeGFH/ihghqzczwWkqXK6BTRKi2xviQ9fRdtOvl7ii99C2i4Jijh SdXjcLEtoTCM3gAgr58KH3tMwOqlCEiueNNKtNgPunDla3OK+Y/zPHfeUFQrJ8zOvW4S tKWoOUccGzv11CRN2gOJ73I3Fa5NdrsxdrFtw42WfDudk6VjKHbOSBjUI3m3n3XG4wet WxGYkSjds5y4PxeT8zDqH/ud6U/G9XgxrI29BOGOVorRFrj94lzU/6FP/p4PihHFuwX3 h4nYiCQROMi3TTlj9HdAAT4RWsttyXiJbs6KeuX8J/JdFj+HrCNZNjMhJZJhBccP3+Ya Qj1Q== X-Gm-Message-State: AKwxytfdJrlLERlh/Enh7ofzE9YPLOULUIY8HxPbJHfG/0NyjebPDZx3 F83+28l0zLmrzOtERa5HljU= X-Google-Smtp-Source: ACJfBot9oOSxfB8kEC2fJMryziPRKjPhgqEi1NrADtOMUR7NuJnPzqCnubMb4SMcnYFwhGgrUtg5yg== X-Received: by 10.237.42.198 with SMTP id t64mr13830564qtd.132.1515379613091; Sun, 07 Jan 2018 18:46:53 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , "Michael S. Tsirkin" , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , Eduardo Habkost , Marcel Apfelbaum Date: Sun, 7 Jan 2018 23:45:42 -0300 Message-Id: <20180108024558.17983-14-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180108024558.17983-1-f4bug@amsat.org> References: <20180108024558.17983-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH 13/29] piix4: convert reset function to QOM X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Igor Mammedov , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 From: Herv=C3=A9 Poussineau Acked-by: Michael S. Tsirkin Acked-by: Paolo Bonzini Signed-off-by: Herv=C3=A9 Poussineau --- 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 7b231b704b..314f7f7359 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -39,10 +39,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; @@ -97,7 +97,6 @@ static void piix4_realize(PCIDevice *pci_dev, Error **err= p) return; } piix4_dev =3D pci_dev; - qemu_register_reset(piix4_reset, s); } =20 int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn) @@ -118,6 +117,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.15.1