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 3346BC7115B for ; Fri, 20 Jun 2025 17:15:33 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSfKk-0001Ph-JD; Fri, 20 Jun 2025 13:15:26 -0400 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 1uSfKF-0000un-L4 for qemu-devel@nongnu.org; Fri, 20 Jun 2025 13:14:53 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uSfKA-0004F5-0v for qemu-devel@nongnu.org; Fri, 20 Jun 2025 13:14:48 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-3a5257748e1so1407393f8f.2 for ; Fri, 20 Jun 2025 10:14:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750439682; x=1751044482; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=m++QAWn68oR/wAf10GvmxCXlcnF7Q9ls48E9G4xXerw=; b=t8xljwMEMOvTJF+8MM4/PD8fNkOufjf5T+n+G3Anyeb+lDf5WW35cujDZAT/lwfLl1 SW1hOC3n9kPa71hPG2sH0FdoWLmpVkJ1Skch6cpYHpaaZowVvLcSAh7LPp9EI5GPrRIz V2TZmFwZU6368C6RbLzhSQJew1NlhYOPSUDhZgJvGU7S02M/9FPHwtBB5Bo/rbwUx49x d6tfCD+l4pkxnaC+ORi59uvk+G3Meqs/UOWoWkGZ+yKAvjLpaTxqFd9OrJcqXJTH9EYh 1sre3ik9iuKktG+ktOAoDkg0BYwsmkB5ax+lRdj9rgBpk82GJ1hGxUWhQL1Se4NcNlDP Ye7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750439682; x=1751044482; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=m++QAWn68oR/wAf10GvmxCXlcnF7Q9ls48E9G4xXerw=; b=ZMDAry8dm6GrVTzZwQeyOGqXaTq4ZpEl3hsuGK9TUmPCGQPhoFb/wp47RcusMqIbqB I67LdnW+yT7LDjlqJy+aGP1dhBoGGDl68CoNbaMuAuV+noF+e3PNZfZFel6bRC5gdIPK eKTm2RD5QeAgpOq0A9uYoK3s2u03wPzef6O8PR5+h951hvc1O+M4wrjiKFO88W4r3h6n 92F4r7d2iPT++MIXJSjO9d6xXD8gRgaKdHFZev4hC9OnIusrelsoEsFetcmZXVlp6dsy TSxgklGqrDmPzGpcr8YMnNeN7r/R1BWbzhTU6oShBIxGIVx/npNtY+TlNq+C7ikyBctB MjgQ== X-Gm-Message-State: AOJu0YzVjmPoeLd+rnIsd48zielSZJwwaadBrBw0AH6acbzf/C+/SeSP 7NeB+4ACuBsy7lUiSsKSaqh0Gz0woufK/dLN2dWWQIyEEsBWPfpFsE9WASL17poVpa0Fy3HuQjc fP/WasZc= X-Gm-Gg: ASbGncu7lO/lvMPoh5lsdqofuuU9ETtsRReccMd/IghdoRDjNtI2GuyXE2S7vEJguxO ygRa7aM98oMGIlD4YgN/fWnj3umyqMdCbwVl2aRKKlNXirq0dHtZ6ACU/GvtC8L88z4NSy5aXA9 mJpRLKfrGVEyM7faIOa96uhCm30hHn29VB6ie1pcQP+VvGYfz9EysG0bXwxc8y3fE4tTTQpJzqX BaqUI9BfJsZsp9ZDnTDeXEkaYbVmVyNd/8aAOP5usJP+8k2M5WyzUxdV0VcXBrUtZTrW75pas7V bajrhuaJfO8l3c5k4fRFrEKziJjHunyhx5JkVroNQrtiuBWGZQmTnivgZsMrg4WtlXw/AtPvkUg yGjIDUGk4lUOz19BBKxqwjz2Ie1V+LD93Lba9vdr9C1rWrO4= X-Google-Smtp-Source: AGHT+IHUxLiwww2455Jz6rIInxAvDRSVrBj5tsdWKBxNBTYSXExqroO3mlqUrwWcP+YGgkBUy1tdMw== X-Received: by 2002:a05:6000:4109:b0:3a3:6415:96c8 with SMTP id ffacd0b85a97d-3a6d130e79bmr3043269f8f.41.1750439682465; Fri, 20 Jun 2025 10:14:42 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4535e97a915sm65995355e9.7.2025.06.20.10.14.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Jun 2025 10:14:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Alexander Graf , Richard Henderson , Pierrick Bouvier , Peter Maydell , Thomas Huth , Cameron Esfahani , Julian Armistead , Paolo Bonzini , "Edgar E. Iglesias" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH v2 12/48] accel: Move cpus_are_resettable() declaration to AccelClass Date: Fri, 20 Jun 2025 19:13:05 +0200 Message-ID: <20250620171342.92678-13-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250620171342.92678-1-philmd@linaro.org> References: <20250620171342.92678-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.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 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 AccelOpsClass is for methods dealing with vCPUs. When only dealing with AccelState, AccelClass is sufficient. Move cpus_are_resettable() declaration to accel/accel-system.c. In order to have AccelClass methods instrospect their state, we need to pass AccelState by argument. Adapt KVM handler. Signed-off-by: Philippe Mathieu-Daudé --- include/qemu/accel.h | 1 + include/system/accel-ops.h | 1 - accel/accel-system.c | 10 ++++++++++ accel/kvm/kvm-accel-ops.c | 6 ------ accel/kvm/kvm-all.c | 6 ++++++ system/cpus.c | 8 -------- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/include/qemu/accel.h b/include/qemu/accel.h index b807cca6678..04d252d3d65 100644 --- a/include/qemu/accel.h +++ b/include/qemu/accel.h @@ -48,6 +48,7 @@ typedef struct AccelClass { void (*setup_post)(MachineState *ms, AccelState *accel); bool (*has_memory)(MachineState *ms, AddressSpace *as, hwaddr start_addr, hwaddr size); + bool (*cpus_are_resettable)(AccelState *as); /* gdbstub related hooks */ bool (*supports_guest_debug)(AccelState *as); diff --git a/include/system/accel-ops.h b/include/system/accel-ops.h index 51faf47ac69..d854b84a66a 100644 --- a/include/system/accel-ops.h +++ b/include/system/accel-ops.h @@ -34,7 +34,6 @@ struct AccelOpsClass { /* initialization function called when accel is chosen */ void (*ops_init)(AccelClass *ac); - bool (*cpus_are_resettable)(void); bool (*cpu_target_realize)(CPUState *cpu, Error **errp); void (*cpu_reset_hold)(CPUState *cpu); diff --git a/accel/accel-system.c b/accel/accel-system.c index 68d2f28388b..1db146139c4 100644 --- a/accel/accel-system.c +++ b/accel/accel-system.c @@ -62,6 +62,16 @@ void accel_setup_post(MachineState *ms) } } +bool cpus_are_resettable(void) +{ + AccelState *accel = current_accel(); + AccelClass *acc = ACCEL_GET_CLASS(accel); + if (acc->cpus_are_resettable) { + return acc->cpus_are_resettable(accel); + } + return true; +} + /* initialize the arch-independent accel operation interfaces */ void accel_init_ops_interfaces(AccelClass *ac) { diff --git a/accel/kvm/kvm-accel-ops.c b/accel/kvm/kvm-accel-ops.c index e5c15449aa6..be960bde5c4 100644 --- a/accel/kvm/kvm-accel-ops.c +++ b/accel/kvm/kvm-accel-ops.c @@ -78,11 +78,6 @@ static bool kvm_vcpu_thread_is_idle(CPUState *cpu) return !kvm_halt_in_kernel(); } -static bool kvm_cpus_are_resettable(void) -{ - return !kvm_enabled() || !kvm_state->guest_state_protected; -} - #ifdef TARGET_KVM_HAVE_GUEST_DEBUG static int kvm_update_guest_debug_ops(CPUState *cpu) { @@ -96,7 +91,6 @@ static void kvm_accel_ops_class_init(ObjectClass *oc, const void *data) ops->create_vcpu_thread = kvm_start_vcpu_thread; ops->cpu_thread_is_idle = kvm_vcpu_thread_is_idle; - ops->cpus_are_resettable = kvm_cpus_are_resettable; ops->synchronize_post_reset = kvm_cpu_synchronize_post_reset; ops->synchronize_post_init = kvm_cpu_synchronize_post_init; ops->synchronize_state = kvm_cpu_synchronize_state; diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 2a44d9eaabb..37faf615cbc 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -3968,6 +3968,11 @@ static void kvm_accel_instance_init(Object *obj) s->msr_energy.enable = false; } +static bool kvm_cpus_are_resettable(AccelState *as) +{ + return !kvm_enabled() || !kvm_state->guest_state_protected; +} + /** * kvm_gdbstub_sstep_flags(): * @@ -3986,6 +3991,7 @@ static void kvm_accel_class_init(ObjectClass *oc, const void *data) ac->init_machine = kvm_init; ac->has_memory = kvm_accel_has_memory; ac->allowed = &kvm_allowed; + ac->cpus_are_resettable = kvm_cpus_are_resettable; ac->gdbstub_supported_sstep_flags = kvm_gdbstub_sstep_flags; object_class_property_add(oc, "kernel-irqchip", "on|off|split", diff --git a/system/cpus.c b/system/cpus.c index a43e0e4e796..4fb764ac880 100644 --- a/system/cpus.c +++ b/system/cpus.c @@ -195,14 +195,6 @@ void cpu_synchronize_pre_loadvm(CPUState *cpu) } } -bool cpus_are_resettable(void) -{ - if (cpus_accel->cpus_are_resettable) { - return cpus_accel->cpus_are_resettable(); - } - return true; -} - void cpu_exec_reset_hold(CPUState *cpu) { if (cpus_accel->cpu_reset_hold) { -- 2.49.0