From nobody Thu May 9 08:02:41 2024 Delivered-To: importer@patchew.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 ARC-Seal: i=1; a=rsa-sha256; t=1675775875; cv=none; d=zohomail.com; s=zohoarc; b=H5vNFYK58BXy+ggyzsK6CQicCfpvGCULQma6Kr7NjCYKXnZf3PnTvq/z/f37E+vDYDvhOvQ2jzRBmoKJBp2zREkOToSx0Stj4tuMC8fcR1oRqxcfQBFtdgmFY83FafVivR1wdsUAOn5T/Lym59OhZHh1gMDAcxh4Tq0RauaeRrc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675775875; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=4koTmGFghxH9p515oDZHzYWWym0WdP5hSrTFLNtFnFc=; b=Vj685oZr1qhcyXIVHEBiuwENOT3nyQstL/xPtsjGH1uEhmUsIBy72mvzkOt5PrTRcf2TNNwOFc2Xh+f5ChJhSi9sPHJbrsk+QZkP6xhjtyK9Ptf4CjqJjn7r4AJLlsUqMZAvlJY+Yi4DvMaDusl7ntziEyW39+o85k3from7VQE= ARC-Authentication-Results: i=1; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675775875373183.31342621453996; Tue, 7 Feb 2023 05:17:55 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPNqo-0001Re-N2; Tue, 07 Feb 2023 08:17:34 -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 1pPNqk-0001RC-Uo for qemu-devel@nongnu.org; Tue, 07 Feb 2023 08:17:31 -0500 Received: from mr85p00im-ztdg06011801.me.com ([17.58.23.199]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPNqj-0002Jt-5q for qemu-devel@nongnu.org; Tue, 07 Feb 2023 08:17:30 -0500 Received: from localhost.localdomain (mr38p00im-dlb-asmtp-mailmevip.me.com [17.57.152.18]) by mr85p00im-ztdg06011801.me.com (Postfix) with ESMTPSA id 0F3A59C10CA; Tue, 7 Feb 2023 13:17:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ynddal.dk; s=sig1; t=1675775846; bh=4koTmGFghxH9p515oDZHzYWWym0WdP5hSrTFLNtFnFc=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=ad+QmyY2KXDmrPQYZflyUMKalgPxtJ7P1sp9RSaxfwgDglr9iXp6eSsuTe0ceoJyk mFdFH7TnezK1NuaNsWTuitqb+nH1Gq4uGaqCq1TaQRPub+ZuJJzPxOecp5zue+P21P nWvZ2cLcC89SwAgI43hO0OpdftjAwnWIMd1LLESyRzeXz97CC+TirgYVbIAGP1kK7V 7z4ZZHcAJHfcppRbStZ13Nl+WgWaXu0MEV3GcqFQqkJhPJ4SPbI8I6nyR0QUWUhuRS KlGCHzKuPjO6Te790RpMSSM/YjKhvaLPH9VtU1XaUrAgjnm4dSn9PoeEn8OrW1NQyx i2jb+lLOPTajA== From: Mads Ynddal To: qemu-devel@nongnu.org Cc: Eduardo Habkost , kvm@vger.kernel.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Yanan Wang , Marcel Apfelbaum , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Richard Henderson , Mads Ynddal Subject: [PATCH v2] gdbstub: move update guest debug to accel ops Date: Tue, 7 Feb 2023 14:17:21 +0100 Message-Id: <20230207131721.49233-1-mads@ynddal.dk> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: Cs7l49o46oZmj3kQmNbQQtq474EaCvda X-Proofpoint-GUID: Cs7l49o46oZmj3kQmNbQQtq474EaCvda X-Proofpoint-Virus-Version: =?UTF-8?Q?vendor=3Dfsecure_engine=3D1.1.170-22c6f66c430a71ce266a39bfe25bc?= =?UTF-8?Q?2903e8d5c8f:6.0.138,18.0.572,17.11.62.513.0000000_definitions?= =?UTF-8?Q?=3D2020-02-14=5F11:2020-02-14=5F02,2020-02-14=5F11,2021-12-02?= =?UTF-8?Q?=5F01_signatures=3D0?= X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 adultscore=0 mlxlogscore=999 mlxscore=0 clxscore=1030 spamscore=0 malwarescore=0 suspectscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2209130000 definitions=main-2302070118 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; Received-SPF: pass client-ip=17.58.23.199; envelope-from=mads@ynddal.dk; helo=mr85p00im-ztdg06011801.me.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ynddal.dk) X-ZM-MESSAGEID: 1675775877985100001 Content-Type: text/plain; charset="utf-8" From: Mads Ynddal Continuing the refactor of a48e7d9e52 (gdbstub: move guest debug support check to ops) by removing hardcoded kvm_enabled() from generic cpu.c code, and replace it with a property of AccelOpsClass. Signed-off-by: Mads Ynddal Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- accel/kvm/kvm-accel-ops.c | 5 +++++ cpu.c | 11 ++++++++--- include/sysemu/accel-ops.h | 1 + 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/accel/kvm/kvm-accel-ops.c b/accel/kvm/kvm-accel-ops.c index fbf4fe3497..5e0fb42408 100644 --- a/accel/kvm/kvm-accel-ops.c +++ b/accel/kvm/kvm-accel-ops.c @@ -86,6 +86,10 @@ static bool kvm_cpus_are_resettable(void) return !kvm_enabled() || kvm_cpu_check_are_resettable(); } =20 +static int kvm_update_guest_debug_ops(CPUState *cpu) { + return kvm_update_guest_debug(cpu, 0); +} + static void kvm_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops =3D ACCEL_OPS_CLASS(oc); @@ -99,6 +103,7 @@ static void kvm_accel_ops_class_init(ObjectClass *oc, vo= id *data) ops->synchronize_pre_loadvm =3D kvm_cpu_synchronize_pre_loadvm; =20 #ifdef KVM_CAP_SET_GUEST_DEBUG + ops->update_guest_debug =3D kvm_update_guest_debug_ops; ops->supports_guest_debug =3D kvm_supports_guest_debug; ops->insert_breakpoint =3D kvm_insert_breakpoint; ops->remove_breakpoint =3D kvm_remove_breakpoint; diff --git a/cpu.c b/cpu.c index 21cf809614..fb9f0e3d22 100644 --- a/cpu.c +++ b/cpu.c @@ -31,8 +31,8 @@ #include "hw/core/sysemu-cpu-ops.h" #include "exec/address-spaces.h" #endif +#include "sysemu/cpus.h" #include "sysemu/tcg.h" -#include "sysemu/kvm.h" #include "sysemu/replay.h" #include "exec/cpu-common.h" #include "exec/exec-all.h" @@ -396,9 +396,14 @@ void cpu_single_step(CPUState *cpu, int enabled) { if (cpu->singlestep_enabled !=3D enabled) { cpu->singlestep_enabled =3D enabled; - if (kvm_enabled()) { - kvm_update_guest_debug(cpu, 0); + +#if !defined(CONFIG_USER_ONLY) + const AccelOpsClass *ops =3D cpus_get_accel(); + if (ops->update_guest_debug) { + ops->update_guest_debug(cpu); } +#endif + trace_breakpoint_singlestep(cpu->cpu_index, enabled); } } diff --git a/include/sysemu/accel-ops.h b/include/sysemu/accel-ops.h index 8cc7996def..cd6a4ef7a5 100644 --- a/include/sysemu/accel-ops.h +++ b/include/sysemu/accel-ops.h @@ -48,6 +48,7 @@ struct AccelOpsClass { =20 /* gdbstub hooks */ bool (*supports_guest_debug)(void); + int (*update_guest_debug)(CPUState *cpu); int (*insert_breakpoint)(CPUState *cpu, int type, hwaddr addr, hwaddr = len); int (*remove_breakpoint)(CPUState *cpu, int type, hwaddr addr, hwaddr = len); void (*remove_all_breakpoints)(CPUState *cpu); --=20 2.38.1