From patchwork Tue Dec 19 19:12:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 755962 Delivered-To: patch@linaro.org Received: by 2002:adf:b181:0:b0:336:6142:bf13 with SMTP id q1csp1601878wra; Tue, 19 Dec 2023 11:17:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IEF4DKJPguF2JjbgtJh6SWf4X8PA7+9QW2h6AOPhMKA2nX4n5ho/UDkyxN/pHA0LvZTAqhm X-Received: by 2002:a05:6102:440e:b0:466:9f15:3338 with SMTP id df14-20020a056102440e00b004669f153338mr2551463vsb.6.1703013458281; Tue, 19 Dec 2023 11:17:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703013458; cv=none; d=google.com; s=arc-20160816; b=WFQ7mAe1hFhXCCdBKsHNPaUslpQv1fsyYFewwGUCsZ3rauYOyBKOVOU9NWMrshuajn PDaw7kLiGw8ZCWyDgpYjWDQDyEbvOwhqwK07jIy1cnORfCOft9T9MG800DcOXv8sROUu Qjpn9YM4tkub/jgpa2GVQPBYArzB6PVw5CP9xZ+6iDMvOL5icZmnBSqcFdrOKvEnI1XD GRUSIFTHQOQi4luZ8msC7wGZ1y1mLGlFhQ4zMx5f9wVgJ0ipYfWgMTilU1eWB+Qd58el CLh+R0SWCu1FBMuWNvu8ixZTIYipJ9ZLZCZ7+uyS+f4nS1wac/Km8QT/wuwWc7sSewct 3cVQ== 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:to:from :dkim-signature; bh=135l4jPTDgYjvIL4sef6Tds4MaZV2O2YSPv0Rtlb/8c=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=LKEbId3Mgq/nOyY3cqr2vk3u+bM0VdXSHJDT1fdLj8JxNqeUXv7YGrLXY4Wy84HWh2 8yhQz9WDaAFAv3KkdTDz2MrNmAC6FomclrF5FRZMPjL3Hw4iD2rBTB+aMGu2xpQ/MBt7 mJ0JxNfuln4b5vGHSFC7dPOx9eALNeV2NsbJ8+F6Zf15VYx5xE28uhxTKt84hDBHXjoD FlvZYhNtlB+f4U3J7GrPlMGMdRcQXWMwz3TANjz1jzD8IENYHNNHKqLuIbv0IGYM7aiV 5sAiTII0aaUe4DIl9cY0o8Q61YXkB74UdDI+h0pF5UYVEO1V5wmORhVHcJJRMvfbduNm MKbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=P92X0m2E; 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 m21-20020a67bb15000000b0046689328057si1073640vsn.759.2023.12.19.11.17.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Dec 2023 11:17:38 -0800 (PST) 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=P92X0m2E; 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 1rFfWq-0001pT-D9; Tue, 19 Dec 2023 14:13:20 -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 1rFfWn-0001lW-2q for qemu-devel@nongnu.org; Tue, 19 Dec 2023 14:13:17 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rFfWj-0001lX-Nx for qemu-devel@nongnu.org; Tue, 19 Dec 2023 14:13:15 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-40d3352b525so727485e9.1 for ; Tue, 19 Dec 2023 11:13:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1703013192; x=1703617992; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=135l4jPTDgYjvIL4sef6Tds4MaZV2O2YSPv0Rtlb/8c=; b=P92X0m2E9jDxHwZZNTrzRF3zUeiFmcLZlVHvWPBsqZucpZZXpOdbiHjLNc/WPPS6zD XrPpBDAutM6BgK6qKJr8y/tsAPWHjrIQhFe+2DMBHeown8RcXYdI9VEcwMNzecRCtIQq DR3dzsMb7xWD7cG76W1sLzsiwMdFHghXccZS75NxqaFpyA9gMD49KdAhOnuxym6cF9kW Hkk1WgiZkXYfx+U2XXjUdV8Gz1aASxrH7oh1327gE1MLB+LyNVZDsCP3UDqcGY4USSCs P/Z1+8Dw0XrWHyhEjLn8CEMhhMfHlp9zxkObMbUGRP2vhaNtwVh9uISJSZzMaEldsfjQ klNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703013192; x=1703617992; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=135l4jPTDgYjvIL4sef6Tds4MaZV2O2YSPv0Rtlb/8c=; b=FmkRA3td47S796rLHtKN1cyMv0yN/vv5da5kPskCSJoXTMGd2H7YhsVrpZWnyGVYm9 bzodh1LSCJgFzbAcy6D0z+hsybc8RNP7e3rgK9vzXSF/jsNeQ9yyefb5DSr0PdBZOvtq zcQH1HNctNpYOJlXE6O41KXiLKU8Y4qCNUHHy63SDhneUEp3FiUjdiMGVYo0owReGGoT 5NcT/VnEx66Fni/odU5i18k6IgAtWvchuk7midHkfJ6u61x+punyS6Aip1xFqkINBYCg zCfNz9CTUQ809zq53QRReIk0Rw7vcAH7XztUJnWLTjS9FrhozAqnooH6vO/1mdr8YqaO YAQA== X-Gm-Message-State: AOJu0YxjKfJHmeLs0OZ9+Nl0wKSm9iP1IbiwgOQa+pCK7gZmoxkS/atF CWY8BA/nbittOwjPmz+kg7rGN0PKXO1072O8MjE= X-Received: by 2002:a05:600c:1c90:b0:401:b6f6:d8fd with SMTP id k16-20020a05600c1c9000b00401b6f6d8fdmr9088316wms.6.1703013192202; Tue, 19 Dec 2023 11:13:12 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id f5-20020a5d5685000000b0033657376b62sm12007754wrv.105.2023.12.19.11.13.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 11:13:12 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 06/43] target/arm/kvm: Move kvm_arm_hw_debug_active and unexport Date: Tue, 19 Dec 2023 19:12:30 +0000 Message-Id: <20231219191307.2895919-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231219191307.2895919-1-peter.maydell@linaro.org> References: <20231219191307.2895919-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32e.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=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: Richard Henderson Signed-off-by: Richard Henderson Reviewed-by: Gavin Shan Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Peter Maydell --- target/arm/kvm_arm.h | 8 -------- target/arm/kvm.c | 11 +++++++++++ target/arm/kvm64.c | 5 ----- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index 207b7f21b0a..ac4856cb46e 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -454,12 +454,4 @@ static inline uint32_t kvm_arm_sve_get_vls(CPUState *cs) */ bool kvm_arm_handle_debug(CPUState *cs, struct kvm_debug_exit_arch *debug_exit); -/** - * kvm_arm_hw_debug_active: - * @cs: CPU State - * - * Return: TRUE if any hardware breakpoints in use. - */ -bool kvm_arm_hw_debug_active(CPUState *cs); - #endif diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 2898e680fc5..4608bea7df4 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -1021,6 +1021,17 @@ int kvm_arch_process_async_events(CPUState *cs) return 0; } +/** + * kvm_arm_hw_debug_active: + * @cs: CPU State + * + * Return: TRUE if any hardware breakpoints in use. + */ +static bool kvm_arm_hw_debug_active(CPUState *cs) +{ + return ((cur_hw_wps > 0) || (cur_hw_bps > 0)); +} + /** * kvm_arm_copy_hw_debug_data: * @ptr: kvm_guest_debug_arch structure diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c index ac3120adaff..352643e0665 100644 --- a/target/arm/kvm64.c +++ b/target/arm/kvm64.c @@ -73,11 +73,6 @@ void kvm_arch_remove_all_hw_breakpoints(void) } } -bool kvm_arm_hw_debug_active(CPUState *cs) -{ - return ((cur_hw_wps > 0) || (cur_hw_bps > 0)); -} - static bool kvm_arm_set_device_attr(CPUState *cs, struct kvm_device_attr *attr, const char *name) {