From nobody Wed Nov 5 23:44:30 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 1538432960550813.5745902881159; Mon, 1 Oct 2018 15:29:20 -0700 (PDT) Received: from localhost ([::1]:40962 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76gp-0004lU-HR for importer@patchew.org; Mon, 01 Oct 2018 18:29:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35142) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76XU-00041R-93 for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:19:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g76OP-0007Nv-87 for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:22 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:50387) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g76ON-0007Lu-9k for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:16 -0400 Received: by mail-wm1-x344.google.com with SMTP id s12-v6so302381wmc.0 for ; Mon, 01 Oct 2018 15:10:11 -0700 (PDT) Received: from x1.local (11.red-88-24-160.staticip.rima-tde.net. [88.24.160.11]) by smtp.gmail.com with ESMTPSA id 185-v6sm13554914wmy.38.2018.10.01.15.10.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 15:10:09 -0700 (PDT) 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=H/cquYdlhsglwiE+uwh6nI3f2i7WvrFejkdhmd0I3l8=; b=FQ4P4FS3niSemXYMA4fJVpjQM/kL8huqWLlm82eHGMqrhQA3eNvpwt3c9B5uYdXQMI 9NmGxAsnEVBB4mkB4llYYGKu3yVvPwwLhyNRpo/HDvjRK5Z8edhGY34jf6wUiHiNZjXV BMsq/WJY1nPSdczcVz2Ecwik477oaiE6/OaiKGj3tzb6x2CaD2NMow6SPPlnFC5R2Xwf 9yghxOYAFOKjn22SH5e1LTnXswxE9U9uaIQzMzszKHW+6kpA4zW1L9y9LgwAfkrMhiRg Z5JQyegIkdwpT4m1SewlvxzQQQFWKQ1HDDz43+MH5XOKttaP6dBJTWTaNXayIMWmquGP DxFA== 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=H/cquYdlhsglwiE+uwh6nI3f2i7WvrFejkdhmd0I3l8=; b=lmpHC6zL0ujwfaAERpXCccpDIippOWSgd4WjRDczvlnUMbj8xuDH1tQLSuc74q8uHA VTB0M6HUoD9w8adhIjoCHvo9t7F/JRLd4EAEiWvbpN9mS0HHEpSu2VZxMZzPAwI/4Scm JIa9qcpuWz1fjz4XmFhfYrew8k06cCzuynCOa0KXw2vAvpsyyKwQ7uA/9o6hoW1UA2BX NrumNU2pPay5HrQJpqizjFfsNLnF2jwiKzcYq187eb6IkdFlAUJoIWLb72slQNKbbj/o txT/2ReSnQFBQXRj3FlLIFhm45gXByYAZ79rwn45zkdBVEpq3JR3pNq3TQZ7BYabmwFL +zyA== X-Gm-Message-State: ABuFfojMbW5yIfryj7RK53Wg570F5jt8+orrkd7x7qXYbmlLtumswAd+ fe9NX1ZToLatC+eUNWWGnFFv9lqc X-Google-Smtp-Source: ACcGV63byBOszF2674C9X9wIFXjaaMo9JDzi/pBWNAFIDHdqKn8fD5yoGwVKgcFTU2XE0oMc5A+BcA== X-Received: by 2002:a1c:6782:: with SMTP id b124-v6mr12671wmc.30.1538431810133; Mon, 01 Oct 2018 15:10:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Date: Tue, 2 Oct 2018 00:09:34 +0200 Message-Id: <20181001220942.2382-8-f4bug@amsat.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181001220942.2382-1-f4bug@amsat.org> References: <20181001220942.2382-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: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH 07/15] hw/mips/gt64xxx_pci: Convert gt64120_reset() function into Device reset method 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: Aleksandar Markovic , Aurelien Jarno , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , 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 Convert the gt64120_reset() function into a proper Device reset method. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Peter Maydell --- hw/mips/gt64xxx_pci.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c index 24ad0ad024..dcd1a66329 100644 --- a/hw/mips/gt64xxx_pci.c +++ b/hw/mips/gt64xxx_pci.c @@ -992,9 +992,9 @@ static void gt64120_pci_set_irq(void *opaque, int irq_n= um, int level) } =20 =20 -static void gt64120_reset(void *opaque) +static void gt64120_reset(DeviceState *dev) { - GT64120State *s =3D opaque; + GT64120State *s =3D GT64120_PCI_HOST_BRIDGE(dev); =20 /* FIXME: Malta specific hw assumptions ahead */ =20 @@ -1184,16 +1184,6 @@ PCIBus *gt64120_register(qemu_irq *pic) return phb->bus; } =20 -static int gt64120_init(SysBusDevice *dev) -{ - GT64120State *s; - - s =3D GT64120_PCI_HOST_BRIDGE(dev); - - qemu_register_reset(gt64120_reset, s); - return 0; -} - static void gt64120_pci_realize(PCIDevice *d, Error **errp) { /* FIXME: Malta specific hw assumptions ahead */ @@ -1241,9 +1231,8 @@ static const TypeInfo gt64120_pci_info =3D { static void gt64120_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *sdc =3D SYS_BUS_DEVICE_CLASS(klass); =20 - sdc->init =3D gt64120_init; + dc->reset =3D gt64120_reset; dc->vmsd =3D &vmstate_gt64120; } =20 --=20 2.19.0