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 0930CC4332F for ; Sun, 27 Nov 2022 22:30:52 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ozQAZ-0007Ul-6G; Sun, 27 Nov 2022 17:30:39 -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 1ozQAV-0007TG-3M; Sun, 27 Nov 2022 17:30:35 -0500 Received: from mail-vk1-xa31.google.com ([2607:f8b0:4864:20::a31]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ozQAS-0002uM-Iq; Sun, 27 Nov 2022 17:30:33 -0500 Received: by mail-vk1-xa31.google.com with SMTP id o24so4437600vkl.9; Sun, 27 Nov 2022 14:30:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=IzLELE2/eXDuGDIW1pSyUFcbsTjmOMUlxGZOw4MnXt4=; b=iR1HuCLw1NEH3dIEmPiavxIz3sP1GJ3BFvUaZgTwy51DKVxNBUbbhUMq2U5SRGwIcl zYmFouk274xwe+wo4Ok0PrgmneeJbHIBZvlpbpZ3p2OTWBIMqv2lm5v3GX0Oz5GI6Ybc za8VX6SHQzXNCSQgePeJh0VGas0hYEHmLzwSaCTz5BzZf+Ki66KUF9rhkrwui32tWPyp uciPTCeeFWXIqOxAl6AUpniYSPhJnuxnyQZmAyVbwFaAcjd9trBjRW2efrq3rnG5dhY1 eoHH0Fe6KifDA8Yp/yBolE7WxiATk+K1FeFXz4jblGnQutLB1w1VwX2srgWTBSZp/crk Swew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=IzLELE2/eXDuGDIW1pSyUFcbsTjmOMUlxGZOw4MnXt4=; b=AcTeXjLZ+w8cYtOBROmoRH2TDfJxKxpjXf9FoaNV1JHlEVs8wO7RJ783JAtOoanbaG DPjuvZIsb4g4N2VVbQQaJDoycCwAOcCdekzDYvOoaFX+2yUWW0DxWa4Mqp1kVkKVqi2/ lpMfpx2XW2+kQcwc+5bnAKL2GKXQudoBDo5uzKOhYt8JVXYutN18RXZCAJCqqjWvZKvm 5k3PNzrxXpjH0TCuDRPYxzu0TFOb3TNeDVoRpa4mx7QylEZofVKFrXbk/aSaSdam+Mn8 QCiQrQVwh2WsEZF3PFh9fqqA+ENxB18wuHHz8BKVhAeCaRzmrmMM2j1RkeJiSQh8og1Q Uebg== X-Gm-Message-State: ANoB5pn+7d7iUkqztdDooobracQrZMP+B7Yyem8FTOlaEwGbXX2BGalt tjt801xlu0Wv/oB97TlQbrZpUM2ZEpdx7mb9ZdU= X-Google-Smtp-Source: AA0mqf6lrqL7VAdf8Pd+TbG3lolx39NMKymR9BQN2wm7wtjGCcsm2DNlVYGVGQN611fz7SQ2p1X3Ifrqxs+8Ehb/f/U= X-Received: by 2002:a05:6122:c97:b0:3b7:cbb8:bbf1 with SMTP id ba23-20020a0561220c9700b003b7cbb8bbf1mr27461531vkb.25.1669588230018; Sun, 27 Nov 2022 14:30:30 -0800 (PST) MIME-Version: 1.0 References: <20221124115023.2437291-1-peter.maydell@linaro.org> <20221124115023.2437291-2-peter.maydell@linaro.org> In-Reply-To: <20221124115023.2437291-2-peter.maydell@linaro.org> From: Alistair Francis Date: Mon, 28 Nov 2022 08:30:03 +1000 Message-ID: Subject: Re: [PATCH for-8.0 01/19] hw/core/cpu-common: Convert TYPE_CPU class to 3-phase reset To: Peter Maydell Cc: qemu-devel@nongnu.org, Michael Rolnik , "Edgar E. Iglesias" , Taylor Simpson , Song Gao , Xiaojuan Yang , Laurent Vivier , =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= , Aurelien Jarno , Jiaxun Yang , Aleksandar Rikalo , Chris Wulff , Marek Vasut , Stafford Horne , Daniel Henrique Barboza , =?UTF-8?Q?C=C3=A9dric_Le_Goater?= , David Gibson , Greg Kurz , Palmer Dabbelt , Alistair Francis , Bin Meng , Yoshinori Sato , Mark Cave-Ayland , Artyom Tarasenko , Bastian Koppelmann , Max Filippov , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org Content-Type: text/plain; charset="UTF-8" Received-SPF: pass client-ip=2607:f8b0:4864:20::a31; envelope-from=alistair23@gmail.com; helo=mail-vk1-xa31.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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 Thu, Nov 24, 2022 at 9:57 PM Peter Maydell wrote: > > Convert the parent class TYPE_CPU to 3-phase reset. This > is a necessary prerequisite to converting the subclasses. > > Signed-off-by: Peter Maydell Reviewed-by: Alistair Francis Alistair > --- > hw/core/cpu-common.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c > index f9fdd46b9d7..78b5f350a00 100644 > --- a/hw/core/cpu-common.c > +++ b/hw/core/cpu-common.c > @@ -116,9 +116,9 @@ void cpu_reset(CPUState *cpu) > trace_guest_cpu_reset(cpu); > } > > -static void cpu_common_reset(DeviceState *dev) > +static void cpu_common_reset_hold(Object *obj) > { > - CPUState *cpu = CPU(dev); > + CPUState *cpu = CPU(obj); > CPUClass *cc = CPU_GET_CLASS(cpu); > > if (qemu_loglevel_mask(CPU_LOG_RESET)) { > @@ -259,6 +259,7 @@ static int64_t cpu_common_get_arch_id(CPUState *cpu) > static void cpu_class_init(ObjectClass *klass, void *data) > { > DeviceClass *dc = DEVICE_CLASS(klass); > + ResettableClass *rc = RESETTABLE_CLASS(klass); > CPUClass *k = CPU_CLASS(klass); > > k->parse_features = cpu_common_parse_features; > @@ -269,7 +270,7 @@ static void cpu_class_init(ObjectClass *klass, void *data) > set_bit(DEVICE_CATEGORY_CPU, dc->categories); > dc->realize = cpu_common_realizefn; > dc->unrealize = cpu_common_unrealizefn; > - dc->reset = cpu_common_reset; > + rc->phases.hold = cpu_common_reset_hold; > cpu_class_init_props(dc); > /* > * Reason: CPUs still need special care by board code: wiring up > -- > 2.25.1 > >