From patchwork Thu Sep 29 11:42:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610616 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp928890pvb; Thu, 29 Sep 2022 07:31:50 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7ql/MlQF5hF6ID/ZNN3QOOCq8F906iY+vo72jNdmP1goNQdOCG2eEdiZzMeDBXKlCYbkiv X-Received: by 2002:ac8:57ca:0:b0:35b:b51f:94fc with SMTP id w10-20020ac857ca000000b0035bb51f94fcmr2598458qta.276.1664461910772; Thu, 29 Sep 2022 07:31:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664461910; cv=none; d=google.com; s=arc-20160816; b=GkDnmz+eBAHRS7dET9jjKrM0KCG23CB4M0kxRIMJPrvTm5C178CPUl0J5BxFbkzcte 7wzuD5BgJG7TnJ8xmnZssTu3l0BCcDZ/Nivx1TT8K1+ZRRushuYT59Flsk8u9LOPwwve 93W1K+lF5umOQC0aFGOB2ZjOcajk+CK7wZSO3km09xaIXMtA8W9CI2Q8RmskRANgMP70 twxMK6doz+1i7kY4i4c8nLUFbDj1hKZvh2UWKpJLbiOLxdyVpL7YzC5Ek0kPU33/RTRw GEzRv8iF7hcUkWzw2gLOTpg+eyTXjBh0Ol4NeTzQ5mxfkuz1swHPPA/iD6Kb8jglHGJ0 PErg== 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=DHq1AQi9rI4q4IRUhBPRUGpA6QqNDihLOg2w93Jsa1M=; b=yiWjnMV/Uzwr/BDaALssjs1ldYSI7cDrgUu6f/TgSnjBZNaVqHS/2VA91YqJ7NQSBx 4OH6bTsJbKNkunvVaZ1Zu0q4AYvwqrtSy5fW+86Nao630kduKyPn16WbZ5eLJoieKqdL O1OHCdPxiM/5TzHXTQd25FTuvDeYLr2izYLH3Lt7qoiskXTo5onoL0rmjOy8TbIUPkMA umbHLlacl69wcnoJ5z759GSeCKa2WnN8iZ0H+9wfaFJBi/E+TtEgFKUOyBwqyH0xvafj twWV4BQXDo/7tIS2cMCm/Krot8KGDrRb8FrwrqSaZ0/hWS/EB16KqRNq8rNUVDpkGHI0 KXqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dO8Scfs3; 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 hf6-20020a05622a608600b0035ce734e127si1263888qtb.432.2022.09.29.07.31.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 07:31:50 -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=dO8Scfs3; 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]:60740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oduZn-0006GY-VQ for patch@linaro.org; Thu, 29 Sep 2022 10:31:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odsD1-0007V8-MQ for qemu-devel@nongnu.org; Thu, 29 Sep 2022 08:00:07 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:37841) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1odsCw-0004Qe-Va for qemu-devel@nongnu.org; Thu, 29 Sep 2022 08:00:07 -0400 Received: by mail-wr1-x431.google.com with SMTP id bq9so1827548wrb.4 for ; Thu, 29 Sep 2022 05:00:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=DHq1AQi9rI4q4IRUhBPRUGpA6QqNDihLOg2w93Jsa1M=; b=dO8Scfs3gyKI6/yrarry+x5ozfjeCSpMmMBfWkU3fulJ/IfH+mivqbXlavSpYddHBN 4FU9FoUyKtrlra5Zp30rBHvxub98kRAeTAIbzV1dFAVEIN2SGp9ya20VT46D6eQIAZ0M pbBpci9fdrLV/dI/BHa8xYLnpbf+JeWw5cOITrvXdSu/2z506YuCaTaoy9Lf70RMiGpK BMaHaFrNN5P5XA2j10PIXkkUYGQx2yAWOrfsUPwCxJ0ARTcZb46ajzieh1EJHNh6SphE IX4vh+jyzbCstEIjXSnj5qGageTBJ0Wfdq6HdWuJChGA8RPQ0A3h7/w99lbVU2vFyHm6 TI9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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; bh=DHq1AQi9rI4q4IRUhBPRUGpA6QqNDihLOg2w93Jsa1M=; b=uOIrd6YcWbNoO9LOlQ0E0hWS8W8+8GUNXuL2X9NAf0kiz7jKywl/AfiKG4jjbaEkJs tYiTVF+1fPG0VMh8shJtQRo4avyY/N8g+eG25ZRelEGVLydf0BkixBxlcMey+yFruHZm PZIZ8Dq3m3QRaOf/xdDgtYSRb92NhkojSAwwFPSul81rfOd9rewsXvmse6sCwv3xu55S 3RGfxR/K/eVTfAUxa+UbwfXDlxlw0zCaXSfzD89w43LEllRqr8xeEFKhXrDZnN+7Bp+J qoalFiE8O3FsWkCa36J0jVtJJk3HPTd94liivYd9IOnTalN0eXqqK1t5VVuNUFcvV0Ad bbqw== X-Gm-Message-State: ACrzQf07WP0+dCHD5uKVmBZx2bUkjEuIxO/WhiwBMVR+0b95i28hGaqa I+aXdE49pI9w8EiLwZfaWcxpLcurn9wjWw== X-Received: by 2002:a05:6000:689:b0:228:e2cf:d20e with SMTP id bo9-20020a056000068900b00228e2cfd20emr1894309wrb.147.1664452801164; Thu, 29 Sep 2022 05:00:01 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id o9-20020a05600c510900b003a5c244fc13sm4817516wms.2.2022.09.29.04.59.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:59:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C12E01FFDF; Thu, 29 Sep 2022 12:42:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= , kvm@vger.kernel.org (open list:Overall KVM CPUs) Subject: [PATCH v1 46/51] accel/kvm: move kvm_update_guest_debug to inline stub Date: Thu, 29 Sep 2022 12:42:26 +0100 Message-Id: <20220929114231.583801-47-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.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" Signed-off-by: Alex Bennée Message-Id: <20220927141504.3886314-16-alex.bennee@linaro.org> --- include/sysemu/kvm.h | 16 ++++++++++++++++ accel/kvm/kvm-all.c | 6 ------ accel/stubs/kvm-stub.c | 5 ----- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 6e1bd01725..790d35ef78 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -247,7 +247,23 @@ int kvm_on_sigbus(int code, void *addr); void kvm_flush_coalesced_mmio_buffer(void); +/** + * kvm_update_guest_debug(): ensure KVM debug structures updated + * @cs: the CPUState for this cpu + * @reinject_trap: KVM trap injection control + * + * There are usually per-arch specifics which will be handled by + * calling down to kvm_arch_update_guest_debug after the generic + * fields have been set. + */ +#ifdef KVM_CAP_SET_GUEST_DEBUG int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap); +#else +static inline int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap) +{ + return -EINVAL; +} +#endif /* internal API */ diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 6ebff6e5a6..423fb1936f 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -3395,12 +3395,6 @@ void kvm_remove_all_breakpoints(CPUState *cpu) } } -#else /* !KVM_CAP_SET_GUEST_DEBUG */ - -static int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap) -{ - return -EINVAL; -} #endif /* !KVM_CAP_SET_GUEST_DEBUG */ static int kvm_set_signal_mask(CPUState *cpu, const sigset_t *sigset) diff --git a/accel/stubs/kvm-stub.c b/accel/stubs/kvm-stub.c index 2d79333143..5d2dd8f351 100644 --- a/accel/stubs/kvm-stub.c +++ b/accel/stubs/kvm-stub.c @@ -46,11 +46,6 @@ int kvm_has_many_ioeventfds(void) return 0; } -int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap) -{ - return -ENOSYS; -} - int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr) { return 1;