From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B6DB2C46CD2 for ; Wed, 24 Jan 2024 23:16:06 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSmTB-00014D-S3; Wed, 24 Jan 2024 18:15:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rSmT4-00012s-Sv for qemu-devel@nongnu.org; Wed, 24 Jan 2024 18:15:40 -0500 Received: from mail-pg1-x535.google.com ([2607:f8b0:4864:20::535]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rSmT2-00051z-Dq for qemu-devel@nongnu.org; Wed, 24 Jan 2024 18:15:38 -0500 Received: by mail-pg1-x535.google.com with SMTP id 41be03b00d2f7-5cfd95130c6so1706140a12.1 for ; Wed, 24 Jan 2024 15:15:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706138135; x=1706742935; darn=nongnu.org; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=ZEvcfSc9zNHla6Blo1/aB39jbaSk7ePfsxr0fAp1UyY=; b=Ie/4lTQr6ZzJEF7qs8wfq9qYRJlglvU5td3iSo7ZOAeIdyM5aEV+hGc/dzIXnyoLZp WQj8CEw5+4a5xxs8Nmw3gtF4Z9V4QWJjElBmYxWCr//hZvYd4e4ZliGeeys4ccY8c548 MH3cJDiPa6m7WkBA5tJNPjLGfHTIZKxf+rgkIy8mPlOFbbSazoSiMUhjLqsLijrNXhu6 BemmdXd38tGl1QE2wiLcykvXDsMDuDDteQN+11Z+cHSKENhfvWcWAgitHqPNvbZ6vt8g Wn8KgdynUJf/bTjqu+LzbKSnpZNb5iQsfJEuEnRJplUHX2F+t8Se21UTwQrK0mzLEctM awJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706138135; x=1706742935; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ZEvcfSc9zNHla6Blo1/aB39jbaSk7ePfsxr0fAp1UyY=; b=Wp7ffVzqJD8ZwXVADS6pHAkGb+CtakjjsrKCgeGns8rbz1Ln5zJVGnWYAztxOsqB/g Wm2nVEbeNstzvXUDSHEN1pdUOPBzbQXm8p1xhGNjmmb/78/vT84ozzNT8lXf4RqvnKpG RVzPwWSrcP0HQBsQVGnMWV0JBx5ONE3NX/6sno7wRRAFd/EfK6rMUxgZ+uzu8Hf7qZvf hRgByDmsUOcAyMzGeN0AsYEbjiu/QWxSfGmnhcgUqFVyeT1SMf2xUc3Wu/im7E6qv51o qPvPZUHBVhp1rd9baOCrfEhFjEqgvWfXDbKeWdojS3/aPfzFuDKt3sjRehI2kVcMIuJU p5Fg== X-Gm-Message-State: AOJu0YwEyln4BFKdLYbxs+G30YKunrT0eHE9lTSgOok16pAeA+pFpKdp hK0aEM5URh1Tb34Gru7firofC17lxPkBdfymoT66mrCFP8casZuC1LBA1yTsrio= X-Google-Smtp-Source: AGHT+IFdfnkrIRsw8DNDE21EH8t4WYf30JzGUD+Gpu8T7mQqnEHRE8McRi4aQt+hkkBrobQzOiJlQg== X-Received: by 2002:a17:90a:c691:b0:28c:8478:f4aa with SMTP id n17-20020a17090ac69100b0028c8478f4aamr78233pjt.66.1706138134844; Wed, 24 Jan 2024 15:15:34 -0800 (PST) Received: from ?IPV6:2001:44b8:2176:c800:5fcf:9e3:2e58:9c7? (2001-44b8-2176-c800-5fcf-09e3-2e58-09c7.static.ipv6.internode.on.net. [2001:44b8:2176:c800:5fcf:9e3:2e58:9c7]) by smtp.gmail.com with ESMTPSA id ei20-20020a17090ae55400b0028feef0f956sm192121pjb.17.2024.01.24.15.15.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 24 Jan 2024 15:15:34 -0800 (PST) Message-ID: Date: Thu, 25 Jan 2024 09:15:28 +1000 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 3/5] hw/arm/aspeed: Init CPU defaults in a common helper Content-Language: en-US To: =?UTF-8?Q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Joel Stanley , Andrew Jeffery , =?UTF-8?Q?C=C3=A9dric_Le_Goater?= References: <20240123224842.18485-1-philmd@linaro.org> <20240123224842.18485-4-philmd@linaro.org> From: Richard Henderson In-Reply-To: <20240123224842.18485-4-philmd@linaro.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::535; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x535.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 1/24/24 08:48, Philippe Mathieu-Daudé wrote: > Rework aspeed_soc_num_cpus() as a new init_cpus_defaults() > helper to reduce code duplication. > > Signed-off-by: Philippe Mathieu-Daudé > --- > hw/arm/aspeed.c | 71 +++++++++++++++++++------------------------------ > 1 file changed, 28 insertions(+), 43 deletions(-) > > diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c > index 5b01a4dd28..636a6269aa 100644 > --- a/hw/arm/aspeed.c > +++ b/hw/arm/aspeed.c > @@ -1141,10 +1141,14 @@ static void aspeed_machine_class_props_init(ObjectClass *oc) > "Change the SPI Flash model"); > } > > -static int aspeed_soc_num_cpus(const char *soc_name) > +static void aspeed_machine_class_init_cpus_defaults(MachineClass *mc) > { > - AspeedSoCClass *sc = ASPEED_SOC_CLASS(object_class_by_name(soc_name)); > - return sc->num_cpus; > + AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(mc); > + AspeedSoCClass *sc = ASPEED_SOC_CLASS(object_class_by_name(amc->soc_name)); > + > + mc->default_cpus = mc->min_cpus > + = mc->max_cpus > + = sc->num_cpus; Not keen on that layout. If you don't want to repeat sc->num_cpus, maybe just pull out int n = sc->num_cpus; at the top. Otherwise, Reviewed-by: Richard Henderson r~