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 A63A7C47071 for ; Thu, 16 Nov 2023 09:53:09 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3Z2m-0001yp-4X; Thu, 16 Nov 2023 04:52:16 -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 1r3Z2k-0001y9-9r for qemu-devel@nongnu.org; Thu, 16 Nov 2023 04:52:14 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r3Z2h-0007hS-Pq for qemu-devel@nongnu.org; Thu, 16 Nov 2023 04:52:14 -0500 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-33139ecdca7so387124f8f.0 for ; Thu, 16 Nov 2023 01:52:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700128330; x=1700733130; 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=eJbwXVt2Z6najqF1TVzKDP+6ZWX+M46efpJixXq1zIk=; b=TIaR9wNrOBGtN4NyiR8xr6A29FrW4hgB7226w+Qwst/lxDb1jpAlB9SMWQk3MRg4u9 yKjbCRA1VzqFqvGgmYu826wqrzQ522D52YCSfQjcgCihtI6S+ofyLBXabXL8DbuKliC5 NQQMxN99qonu+26GfOqQTmf/xpwDAAAYVVeGEQ9A/K1okSJMxJg4vIGQi3xw8U7zi9nr SqjP0UHUjvuixLyJ9LyM2xxbEo+2EmgCTzgTBDUEMwlhpl2MdzDrmABgmkH4MgTfOoIo VQ4TP4Aa5vIDA6rf9iOhDHJ39o8rf0gj0VCRTb7emCcq4yqIjWRjTvbZjVxamKoSyjyD Eytw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700128330; x=1700733130; 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=eJbwXVt2Z6najqF1TVzKDP+6ZWX+M46efpJixXq1zIk=; b=Nv0QK6kV5GbE4ezMBOZSLWdPWn8XwT1gG/CtsGIjUgCcfjAkKC+NagwLCxSpsgODpy xdNYdZtJbygwuH8xERStgWe0z9yGZ76ZTx8ceFgh51x+qtV/c7f22ZkU44dxbHVNCx3x vn1GqcWkcqWEnQXdIAuljSwgzW+6mfIp1DPlDjx3hPp2K8yTGU191ja4mWMO+hWJyaAx X51RwO+6qZ5ZKlk+NMjrhx2YsOPynTtNopYEUbfW4g9G0ba0OtSlPuStEedPfATbjgSQ OovsrPPAVsHxRKZfAZVhUCiOP1ggIuyfJoQbo4ciNASculGTRrNg2jNS0ZRWuCh3I64o erRw== X-Gm-Message-State: AOJu0YwGumrhmarrb8RQ48AcSbs7riQYf6Ke2FVrcMj4G8VjiG+ZmQAj i/YWhA2vm00sJxk81+zG4FXhAg== X-Google-Smtp-Source: AGHT+IEAIgUPS1JS0xNpf4FVCAqwXMUQpzOJhJjL+OXXkziOcno7C00ZISMYFE1Ys/C2aF80vS4/kQ== X-Received: by 2002:a5d:4584:0:b0:32d:88f6:ec2f with SMTP id p4-20020a5d4584000000b0032d88f6ec2fmr9906336wrq.60.1700128329483; Thu, 16 Nov 2023 01:52:09 -0800 (PST) Received: from [192.168.69.100] ([176.187.220.205]) by smtp.gmail.com with ESMTPSA id e1-20020a056000120100b003296b488961sm12812220wrx.31.2023.11.16.01.52.05 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 16 Nov 2023 01:52:09 -0800 (PST) Message-ID: <08b7421e-f261-45e7-b741-34eb0ccd818d@linaro.org> Date: Thu, 16 Nov 2023 10:52:04 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v5 23/31] machine: Constify MachineClass::valid_cpu_types[i] Content-Language: en-US To: Gavin Shan , qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org, qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, imp@bsdimp.com, kevans@freebsd.org, richard.henderson@linaro.org, pbonzini@redhat.com, peter.maydell@linaro.org, imammedo@redhat.com, b.galvani@gmail.com, strahinja.p.jankovic@gmail.com, sundeep.lkml@gmail.com, kfting@nuvoton.com, wuhaotsh@google.com, nieklinnenbank@gmail.com, rad@semihalf.com, quic_llindhol@quicinc.com, marcin.juszkiewicz@linaro.org, eduardo@habkost.net, marcel.apfelbaum@gmail.com, wangyanan55@huawei.com, laurent@vivier.eu, vijai@behindbytes.com, palmer@dabbelt.com, alistair.francis@wdc.com, bin.meng@windriver.com, liwei1518@gmail.com, dbarboza@ventanamicro.com, zhiwei_liu@linux.alibaba.com, mrolnik@gmail.com, edgar.iglesias@gmail.com, bcain@quicinc.com, gaosong@loongson.cn, aurelien@aurel32.net, jiaxun.yang@flygoat.com, aleksandar.rikalo@syrmia.com, chenhuacai@kernel.org, shorne@gmail.com, npiggin@gmail.com, clg@kaod.org, ysato@users.sourceforge.jp, kbastian@mail.uni-paderborn.de, jcmvbkbc@gmail.com, shan.gavin@gmail.com References: <20231114235628.534334-1-gshan@redhat.com> <20231114235628.534334-24-gshan@redhat.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=C3=A9?= In-Reply-To: <20231114235628.534334-24-gshan@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.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 15/11/23 00:56, Gavin Shan wrote: > Constify MachineClass::valid_cpu_types[i], as suggested by Richard > Henderson. > > Suggested-by: Richard Henderson > Signed-off-by: Gavin Shan > Reviewed-by: Philippe Mathieu-Daudé > --- > hw/m68k/q800.c | 2 +- > include/hw/boards.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Preferably: -- >8 -- diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index 1d7cd5ff1c..83d1571d02 100644 --- a/hw/m68k/q800.c +++ b/hw/m68k/q800.c @@ -726,19 +726,18 @@ static GlobalProperty hw_compat_q800[] = { }; static const size_t hw_compat_q800_len = G_N_ELEMENTS(hw_compat_q800); -static const char *q800_machine_valid_cpu_types[] = { - M68K_CPU_TYPE_NAME("m68040"), - NULL -}; - static void q800_machine_class_init(ObjectClass *oc, void *data) { + static const char * const valid_cpu_types[] = { + M68K_CPU_TYPE_NAME("m68040"), + NULL + }; MachineClass *mc = MACHINE_CLASS(oc); mc->desc = "Macintosh Quadra 800"; mc->init = q800_machine_init; mc->default_cpu_type = M68K_CPU_TYPE_NAME("m68040"); - mc->valid_cpu_types = q800_machine_valid_cpu_types; + mc->valid_cpu_types = valid_cpu_types; mc->max_cpus = 1; mc->block_default_type = IF_SCSI; mc->default_ram_id = "m68k_mac.ram"; --- Since commit 3d1611bfa1 ("hw/hppa: Allow C3700 with 64-bit and B160L with 32-bit CPU only") we need to update hw/hppa/machine.c: -- >8 -- diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index 9d08f39490..c8da7c18d5 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -672,19 +672,18 @@ static void hppa_nmi(NMIState *n, int cpu_index, Error **errp) } } -static const char *HP_B160L_machine_valid_cpu_types[] = { - TYPE_HPPA_CPU, - NULL -}; - static void HP_B160L_machine_init_class_init(ObjectClass *oc, void *data) { + static const char * const valid_cpu_types[] = { + TYPE_HPPA_CPU, + NULL + }; MachineClass *mc = MACHINE_CLASS(oc); NMIClass *nc = NMI_CLASS(oc); mc->desc = "HP B160L workstation"; mc->default_cpu_type = TYPE_HPPA_CPU; - mc->valid_cpu_types = HP_B160L_machine_valid_cpu_types; + mc->valid_cpu_types = valid_cpu_types; mc->init = machine_HP_B160L_init; mc->reset = hppa_machine_reset; mc->block_default_type = IF_SCSI; @@ -709,19 +708,18 @@ static const TypeInfo HP_B160L_machine_init_typeinfo = { }, }; -static const char *HP_C3700_machine_valid_cpu_types[] = { - TYPE_HPPA64_CPU, - NULL -}; - static void HP_C3700_machine_init_class_init(ObjectClass *oc, void *data) { + static const char * const valid_cpu_types[] = { + TYPE_HPPA64_CPU, + NULL + }; MachineClass *mc = MACHINE_CLASS(oc); NMIClass *nc = NMI_CLASS(oc); mc->desc = "HP C3700 workstation"; mc->default_cpu_type = TYPE_HPPA64_CPU; - mc->valid_cpu_types = HP_C3700_machine_valid_cpu_types; + mc->valid_cpu_types = valid_cpu_types; mc->init = machine_HP_C3700_init; mc->reset = hppa_machine_reset; mc->block_default_type = IF_SCSI; ---