From nobody Tue Feb 10 05:45:42 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1586195970; cv=none; d=zohomail.com; s=zohoarc; b=l2AetpedsI2gtdiUv5VCkBz8A8N4j2uov243xP7bj7M3cdB1r5u5Jcb6+yUtzxNnyAn3LYtmUwDrXPbzHdMc0m3s3jKZP30o97d2fiNBuv3rCVBRTarAQ8v8yDHZkKUTwsd4nttebUQH76u4vhqnkLs/tUnFte61mnUtL3ci8LM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586195970; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=n53pt0qup4Bja42ysNmHw44EY6rNqSSO2uSNuR4e+2E=; b=KN6XlUUDvfdlF72alHY7nb2TPs9v6HCz0p2VRKRU7OV2H4tz6Sh5goqKAeF/36m9yz8CLDvBuVID6NQI+PyGNEsiZXzErL08/FlKl7Vpp/e8juhI5nIF/+WksuHOK+oApwAMiOW59SA0K320z5u675pKKU56R4xVWR8e+PXO6sw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1586195970528952.2296005849058; Mon, 6 Apr 2020 10:59:30 -0700 (PDT) Received: from localhost ([::1]:36076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLW1u-0005Wz-Uo for importer@patchew.org; Mon, 06 Apr 2020 13:59:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36377) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLVrF-0002IR-UY for qemu-devel@nongnu.org; Mon, 06 Apr 2020 13:48:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jLVrA-00036k-Ha for qemu-devel@nongnu.org; Mon, 06 Apr 2020 13:48:25 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:54705) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jLVrA-00033j-Ao; Mon, 06 Apr 2020 13:48:20 -0400 Received: by mail-wm1-x342.google.com with SMTP id h2so283112wmb.4; Mon, 06 Apr 2020 10:48:20 -0700 (PDT) Received: from x1w.redhat.com (116.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.116]) by smtp.gmail.com with ESMTPSA id a67sm364880wmc.30.2020.04.06.10.48.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2020 10:48:18 -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=n53pt0qup4Bja42ysNmHw44EY6rNqSSO2uSNuR4e+2E=; b=r9V51Y1xouns4swlMGeNtpuxw+oQavIJ/c9mpdu2LCGIbVrGK1kRlGdNoixeGzATtE UWGY4aI4RIc1AzBg5KEUzySGBSELe6AAoS+vPZeFgqmS2uw5AREWo9H8NySwQbOXDPUd zrKRiclIwWnQuK2WASc4pf/9X9JzkGAQWMrHaSonCSDB3FrR+KRUBfisyJsnaDbvJ28T WZ3HsobJok8RaVMknOCwZPowiC5PIV4iQaiUREOh++wY4FzqJSvJu/lbHdty63aVdXpc 8fn27fKfdmBe51TJA0IXrasNmP3zKtFBJaTQMWDagGNwEKyiPpnyGFjWpQ06J01Odo7s lrsw== 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=n53pt0qup4Bja42ysNmHw44EY6rNqSSO2uSNuR4e+2E=; b=pCT2owFhmfi8920C+ME2qnfPegX34pJ7f+H1uwPM8OFbR9CShuvOXe0K9gAd7qYhc5 1anJfbeP1ldPbrr7J/9fllYttfQP6tdINzzB3UnT5vDdlvd+l4UWMyKofFBK2H/bSwT2 EvS5sGVjZR71YBMWEmfpdWhnwE1DSGw4smzP8vcUUsLoSUMqp4DIke95kmS9c5xuLevT YIG+QOqQPGB1eh1w5OvqDvqjptFN7ivfzbThAuVn4u/Biu3w9AfjF2JexCNmMAsCEIbK PjXKFpwxpG+LeNum7YE2Uml3Okn1wxF+UpTsN8vREeVxpXF90CfWFqY8jZntpJ7AcJaX ePdA== X-Gm-Message-State: AGi0PuYGCvkHKXaNP7G2YRITRbFBOZPePA++ayqqiG0l/yQJeGDlzoYB 9sZspp8BBaTgJSfCeGPppdUh/o+wtpQ= X-Google-Smtp-Source: APiQypIuiPc2GUAaxQjcigKrXvSPriurNaUO+3xMcESy5OJB7RM1rwN+sb5yoML4b63vYmiMCYPbkA== X-Received: by 2002:a1c:a344:: with SMTP id m65mr206848wme.20.1586195299094; Mon, 06 Apr 2020 10:48:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Markus Armbruster Subject: [PATCH-for-5.1 v2 24/54] hw/riscv/sifive_u: Rename MachineClass::init() Date: Mon, 6 Apr 2020 19:47:13 +0200 Message-Id: <20200406174743.16956-25-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200406174743.16956-1-f4bug@amsat.org> References: <20200406174743.16956-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::342 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: Peter Maydell , Vladimir Sementsov-Ogievskiy , "open list:RISC-V TCG CPUs" , Sagar Karandikar , Bastian Koppelmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis , Palmer Dabbelt Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) As there already is the riscv_sifive_u_soc_init() method, rename riscv_sifive_u_init() as riscv_sifive_u_machine_init(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/riscv/sifive_u.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 7bf1f30a35..e13ab34de4 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -312,7 +312,7 @@ static void create_fdt(SiFiveUState *s, const struct Me= mmapEntry *memmap, g_free(nodename); } =20 -static void riscv_sifive_u_init(MachineState *machine) +static void riscv_sifive_u_machine_init(MachineState *machine) { const struct MemmapEntry *memmap =3D sifive_u_memmap; SiFiveUState *s =3D RISCV_U_MACHINE(machine); @@ -606,7 +606,7 @@ static void riscv_sifive_u_machine_class_init(ObjectCla= ss *oc, void *data) MachineClass *mc =3D MACHINE_CLASS(oc); =20 mc->desc =3D "RISC-V Board compatible with SiFive U SDK"; - mc->init =3D riscv_sifive_u_init; + mc->init =3D riscv_sifive_u_machine_init; mc->max_cpus =3D SIFIVE_U_MANAGEMENT_CPU_COUNT + SIFIVE_U_COMPUTE_CPU_= COUNT; mc->min_cpus =3D SIFIVE_U_MANAGEMENT_CPU_COUNT + 1; mc->default_cpus =3D mc->min_cpus; --=20 2.21.1