From patchwork Wed Aug 23 20:22:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 716129 Delivered-To: patch@linaro.org Received: by 2002:adf:f747:0:b0:317:ecd7:513f with SMTP id z7csp1003093wrp; Wed, 23 Aug 2023 13:28:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE2KsRwuUaJMs0vh1LAsRTSRr9tgGM1Y7CakJg5hdJT0Utal35bBDZoJmisEoElThBspcWQ X-Received: by 2002:a05:6870:c10c:b0:1c0:e4e6:7112 with SMTP id f12-20020a056870c10c00b001c0e4e67112mr14386528oad.39.1692822489970; Wed, 23 Aug 2023 13:28:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692822489; cv=none; d=google.com; s=arc-20160816; b=MsDW3K+pTK62LZgtemYO18BSLocix+L0qxivFG/wEXw5kVjVo0TwwxQ1NBPXAq00n2 7rBAeLi3NRAp37v49mIxlFi+pY2F4wREB8r9tncjyYgLCy2S80+MvCCutbITXmTN9/AK NhTdoOQujQDaPYj5W3V/HX6IM4YQAeiyBQeIGZCXP7SFE5XooIbHtNuwDo/ChrsLexkL yg+ih1Z2EhrI/pXKvoFhfNYo5Or9eld6ntAqXF/cA5jkcg1mq/ggrAPkUoaZ+nobT/ww 6kxPLeyuBzfxvX777QQtvZTp9en22lzJd2QW3cf+jVrboMG2c9GNOm1JOrbN4CAjQ2X4 TpzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Sag9wYjn+T6sNPgSHmtKDLhQdqb9BHIQ8q3YF6+2bV0=; fh=i53HmQH8ogkFLEAGHKavbm8W6+9/FINwiyX11eWiycE=; b=UCMGIXtVwXNcg6maC4SzvjF+xMNjaXxKmD1jx8XzMiM+x6WmhAHrtbd305OwEFEzEp kaF3/3sDPl3h/f0jLvw78eReMsr4eSSoV/oTAuAo42YlvHDascbJIL2tsGshTlCo5+Kk yRTku2+k5YxRAsxJwGwVz+/BGGOdGHnNedaWeV9p0USbVFlaxNxuh3QlWCcStrIw/2PD 1ohFXaB7ngXmLdzkkl7Xs6ECneOyB8nqySewGWDw3PvTWRdLAWnzZpyEtM/niUNfU3Yw I3q88lfjVL4+JBr/QFJH5puxxTjFqPQqZUvgtDKzTBpS/HD9rjInN6v0q837767NNsic AuQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=C0qtO0Kl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e8-20020a0cf348000000b0064f48ce8ff3si3427914qvm.279.2023.08.23.13.28.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 Aug 2023 13:28:09 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=C0qtO0Kl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYuOj-0000K5-4m; Wed, 23 Aug 2023 16:24:13 -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 1qYuOT-0008KA-4k for qemu-devel@nongnu.org; Wed, 23 Aug 2023 16:23:58 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qYuOB-0005TM-VO for qemu-devel@nongnu.org; Wed, 23 Aug 2023 16:23:49 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-1bda9207132so48316985ad.0 for ; Wed, 23 Aug 2023 13:23:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692822209; x=1693427009; 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=Sag9wYjn+T6sNPgSHmtKDLhQdqb9BHIQ8q3YF6+2bV0=; b=C0qtO0Kl87dxlFvgLLgkHnHWv/+fc9hWcETKjsH8OsH5clCkBhGvwA6ebOLqpnquks ZqPHevlc4ZrnvE17BUw2TNXUv0IXsav/yUYGGB7USqoYfexhfjiCXkMfuqlXDQ77ozt0 I9OxF71hulGYdGxMzqkyfHT4gJGk7b8J/KvgsD4u70HjXGiZBxmaIoqegGAwLWsOhSgz KoNzbjwIxFGCPEKTWbT7ayR7bk9nVL44VYpThqAYNlUzKyjywn1OT5uRX5dtDdpMGokm FkCzoAjKSFq/R8yI/PnaA8RMdMNian1/+KOa9MKFTviEIJxKi/NoqmnK3XMPPjYZ9Ooz kcwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692822209; x=1693427009; 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=Sag9wYjn+T6sNPgSHmtKDLhQdqb9BHIQ8q3YF6+2bV0=; b=Fk7OeTr1Xe1eKNEt7EH57u/o9udeZrOMdB1vbg1/5Z5N589XXbOarnVMYP6W3FrAqI fc9zo3v3NmEbG/Tp0hPKFUBo4yT4Jnv1NLq4EnwU9EOzPnkzDiJxMFbJ59TuidQj5h30 PDU3tPdGUWmpWA/WODfyGcCpn+C8tD0RcIcC5HXYJtQZ2fbvepOrHw64qi2H8LD/9gZ0 2uVR2HQgmHyewRu5ru3IB3+eeNL+GkKdHqizeJWmtJYLpNNwRyruEg5330M02CpXTAom qw2lu1FVfKMJGRFx0lwlW12kgrWhTttO9s3X2NZTvl232ULe+3SyT/DeOmUXB1dO3RAa CTFw== X-Gm-Message-State: AOJu0YwNw4uDVZ6++cI22Af7GkercRMm/RwiMbGz9JZxN9FsOJhAer5m bDhCaXwhaTXGy2Vws6+2eYmgLfHbMaKnz00CbW8= X-Received: by 2002:a17:902:c20d:b0:1c0:bf62:c921 with SMTP id 13-20020a170902c20d00b001c0bf62c921mr908199pll.18.1692822209146; Wed, 23 Aug 2023 13:23:29 -0700 (PDT) Received: from stoup.. ([2602:47:d483:7301:72f0:1ea7:85d2:141e]) by smtp.gmail.com with ESMTPSA id iz22-20020a170902ef9600b001b9da42cd7dsm11418641plb.279.2023.08.23.13.23.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Aug 2023 13:23:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Anton Johansson Subject: [PULL 01/48] accel/kvm: Widen pc/saved_insn for kvm_sw_breakpoint Date: Wed, 23 Aug 2023 13:22:39 -0700 Message-Id: <20230823202326.1353645-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230823202326.1353645-1-richard.henderson@linaro.org> References: <20230823202326.1353645-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62f.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Anton Johansson via Widens the pc and saved_insn fields of kvm_sw_breakpoint from target_ulong to vaddr. The pc argument of kvm_find_sw_breakpoint is also widened to match. Signed-off-by: Anton Johansson Reviewed-by: Richard Henderson Message-Id: <20230807155706.9580-2-anjo@rev.ng> Signed-off-by: Richard Henderson --- include/sysemu/kvm.h | 6 +++--- accel/kvm/kvm-all.c | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 115f0cca79..5670306dbf 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -411,14 +411,14 @@ struct kvm_guest_debug; struct kvm_debug_exit_arch; struct kvm_sw_breakpoint { - target_ulong pc; - target_ulong saved_insn; + vaddr pc; + vaddr saved_insn; int use_count; QTAILQ_ENTRY(kvm_sw_breakpoint) entry; }; struct kvm_sw_breakpoint *kvm_find_sw_breakpoint(CPUState *cpu, - target_ulong pc); + vaddr pc); int kvm_sw_breakpoints_active(CPUState *cpu); diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 7b3da8dc3a..76a6d91d15 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -3306,8 +3306,7 @@ bool kvm_arm_supports_user_irq(void) } #ifdef KVM_CAP_SET_GUEST_DEBUG -struct kvm_sw_breakpoint *kvm_find_sw_breakpoint(CPUState *cpu, - target_ulong pc) +struct kvm_sw_breakpoint *kvm_find_sw_breakpoint(CPUState *cpu, vaddr pc) { struct kvm_sw_breakpoint *bp;