From nobody Tue Apr 15 12:38:12 2025 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=pass; 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=pass(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1581607316029360.9313788801501; Thu, 13 Feb 2020 07:21:56 -0800 (PST) Received: from localhost ([::1]:54514 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2GFW-0008To-2s for importer@patchew.org; Thu, 13 Feb 2020 10:17:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60609) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2FhP-0004qy-Ke for qemu-devel@nongnu.org; Thu, 13 Feb 2020 09:42:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j2FhO-0002Qx-0j for qemu-devel@nongnu.org; Thu, 13 Feb 2020 09:42:39 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:52747) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j2FhN-0002M7-OM for qemu-devel@nongnu.org; Thu, 13 Feb 2020 09:42:37 -0500 Received: by mail-wm1-x335.google.com with SMTP id p9so6543264wmc.2 for ; Thu, 13 Feb 2020 06:42:37 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id e22sm3362454wme.45.2020.02.13.06.42.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2020 06:42:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=uzVG4rPZtI9QEgU8YI9WvM2Scl3ZA8+l5Ifz+hNMkdM=; b=Mw+QBuyDSWMLGHyUZGFJWyXB0b1/fz4xhmQJIKU2a+q3avfb2rF3voCPHkGkF7qJiY tniBTLu8OG5bMrT7qrsEF9d1fDUJbSrtN6TUtiLpse5WqLaZ6EBkMP6F4JONTJgTtyRl iBsOEkYXffm7VmJeqC0GBB9OW8r3jLYdWSZm2L4eMgldzw0fGzZwqLixwvLWV2/GjdD1 P7sbivq6L48iHVIPziHNvkwA5AX213O33oVdOBB6eaqDFB0/ooZgTLv5TYIUBUKjcYZu 4ZRWhHHt0OgNYk6i+S7/01iujJsVl72XgyNcLWFNVihnPmYtN/jLxBwpUGD0I5PwuhpM C28A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uzVG4rPZtI9QEgU8YI9WvM2Scl3ZA8+l5Ifz+hNMkdM=; b=gzJtKR10VK63g1zHN/ERmHpd6P7mf+rNfQhWBiY9tnIKVDvuKnk0lHuaJ2b9mg9suu jzDcWsNUx/87baaE8jUjHW0yJ/fR4lKrFCP7wI6YHmYeIYDHVrFBaolfB7LJoNzowO/d ronKe0lcRwEvn9AbI/htOSdPJtAqjm916zn4zQD7HYxv9Nc9LBuvRAAOubS592+t9ALo X+ezXwNqIMPaw8U4UZIMRFs3Tm4ZclCuD2a98B9qkh8hiJS4/ogPq5lfX67GocdN0z1m ZDg/sHDDeHLQLBLbb6tBj9hZbOIqhIldD0t0ugPydUwafHnXFCQmFQrrlOSSP7WrIzq3 rAFw== X-Gm-Message-State: APjAAAWJ6z5pJ+O3mJlR+k+//se/iuCF+Pl3GxZzdQ6PL4ULbd0TwV3k l+A8Elkilor4kdQMCB1rSNXTuyEJ1Z4= X-Google-Smtp-Source: APXvYqxgqLZkAGbM27b9E+u2gvPYWMVxCiL0lgbjWwAgz8PxFqRZ/xF6Jxn5CFpfuzX6RAJrPmTK4Q== X-Received: by 2002:a1c:7c11:: with SMTP id x17mr6624815wmc.168.1581604953549; Thu, 13 Feb 2020 06:42:33 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 41/46] hw/arm/raspi: Let class_init() directly call raspi_machine_init() Date: Thu, 13 Feb 2020 14:41:40 +0000 Message-Id: <20200213144145.818-42-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200213144145.818-1-peter.maydell@linaro.org> References: <20200213144145.818-1-peter.maydell@linaro.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::335 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Philippe Mathieu-Daud=C3=A9 raspi_machine_init() access to board_rev via RaspiMachineClass. raspi2_init() and raspi3_init() do nothing. Call raspi_machine_init directly. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Igor Mammedov Message-id: 20200208165645.15657-10-f4bug@amsat.org Signed-off-by: Peter Maydell --- hw/arm/raspi.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index fbfcd297326..1628b0dda7c 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -228,7 +228,7 @@ static void setup_boot(MachineState *machine, int versi= on, size_t ram_size) arm_load_kernel(ARM_CPU(first_cpu), machine, &binfo); } =20 -static void raspi_init(MachineState *machine) +static void raspi_machine_init(MachineState *machine) { RaspiMachineClass *mc =3D RASPI_MACHINE_GET_CLASS(machine); RaspiMachineState *s =3D RASPI_MACHINE(machine); @@ -280,11 +280,6 @@ static void raspi_init(MachineState *machine) setup_boot(machine, version, machine->ram_size - vcram_size); } =20 -static void raspi2_init(MachineState *machine) -{ - raspi_init(machine); -} - static void raspi2_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); @@ -293,7 +288,7 @@ static void raspi2_machine_class_init(ObjectClass *oc, = void *data) =20 rmc->board_rev =3D board_rev; mc->desc =3D "Raspberry Pi 2B"; - mc->init =3D raspi2_init; + mc->init =3D raspi_machine_init; mc->block_default_type =3D IF_SD; mc->no_parallel =3D 1; mc->no_floppy =3D 1; @@ -306,11 +301,6 @@ static void raspi2_machine_class_init(ObjectClass *oc,= void *data) }; =20 #ifdef TARGET_AARCH64 -static void raspi3_init(MachineState *machine) -{ - raspi_init(machine); -} - static void raspi3_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); @@ -319,7 +309,7 @@ static void raspi3_machine_class_init(ObjectClass *oc, = void *data) =20 rmc->board_rev =3D board_rev; mc->desc =3D "Raspberry Pi 3B"; - mc->init =3D raspi3_init; + mc->init =3D raspi_machine_init; mc->block_default_type =3D IF_SD; mc->no_parallel =3D 1; mc->no_floppy =3D 1; --=20 2.20.1