From patchwork Fri Feb 24 19:28:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 61423 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1107463wrd; Fri, 24 Feb 2023 11:41:41 -0800 (PST) X-Google-Smtp-Source: AK7set+qwutf+VyFpoismUwON2b3cG7FImzx83FMZ4V/FPJ7sUHKa3gIaK09f9AxVdVy5ITkvO1M X-Received: by 2002:a17:907:8b85:b0:8ee:babc:d40b with SMTP id tb5-20020a1709078b8500b008eebabcd40bmr6437808ejc.58.1677267701121; Fri, 24 Feb 2023 11:41:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677267701; cv=none; d=google.com; s=arc-20160816; b=q9SvkCiQLfgpTzAIWOaGfzsow+YOQWpT4ljHgHkNtgjBx4V82q/DOMLi6UJENrpnfM TuEu283d0rXTKS9H4fw+MR5vFbqM7MjtQDuEmUQm9kCxZAMsfRmA7xMg/VKxxu5VgzYx SguMPAFLyRyc19RndnWEbxDdYWqSvCUSt05RxEw+yvta8jHcco79wBPVNf7OT4xFZVnK FNsVm+qWUOy/IffI30w0+0O7GBfHV/7Jz5X3EG8kCogtHEnpgyS+qrujNQ4WUspDt3Pg zIsdIrVGj3EKjqMnbQIMjJgz7rhqKuAfYnp27Kls+JaroOMJSyvM/1dXOQ0sfaqts3ID 5Bdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:cc:to:from:subject :message-id:mime-version:date:reply-to:dkim-signature; bh=t9//kZJYNl4izvytHF7z7Dnucu90xh6NKNXZlIG10fQ=; b=cW0KGNf4a2zW/oRRCbu1g9Y0qIEC0P7OBEj7pRy2j9M8zwYUOOqlRPWpulFzaDt8zK dnOd9bV6DPHV0l8xiVGPefbnlfe3DaFT6RgV96OAjNcRLxyE323E68yjO7yGZGrRNURT nGvtI6KCCaUIpvcGPwZ4AHGr60y8UIpNS8ebep7tjdqzoa4G6lMshhltXZKlGtmUaFZc SFpvtFmTs9xxUG6w5h/UpSHpE17/8r0tC1g+f9uWVPpoA5JVs5WunHvFGYtnJXIJVMjD uZMZtsloNfawxN0F5xsVmul3tRuOl6x62Rg5yOnQbVQIbtdj/C4HClS71yyhzfJ/sU2Y 32hA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=N4uMwwIz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id eu7-20020a170907298700b008e4dc2b4541si10477824ejc.959.2023.02.24.11.41.17; Fri, 24 Feb 2023 11:41:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=N4uMwwIz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229576AbjBXT2i (ORCPT + 99 others); Fri, 24 Feb 2023 14:28:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54708 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229479AbjBXT2g (ORCPT ); Fri, 24 Feb 2023 14:28:36 -0500 Received: from mail-pf1-x44a.google.com (mail-pf1-x44a.google.com [IPv6:2607:f8b0:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A87B241ED for ; Fri, 24 Feb 2023 11:28:35 -0800 (PST) Received: by mail-pf1-x44a.google.com with SMTP id p5-20020a056a0026c500b005cbeecd5c0dso52466pfw.3 for ; Fri, 24 Feb 2023 11:28:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=content-transfer-encoding:cc:to:from:subject:message-id :mime-version:date:reply-to:from:to:cc:subject:date:message-id :reply-to; bh=t9//kZJYNl4izvytHF7z7Dnucu90xh6NKNXZlIG10fQ=; b=N4uMwwIz4FqjJ9FM8/Jp2dnnYhdKN41elaX5w3ce3TcrdJG/W8EzXo3Yi6XXAApxat 80fUNj04Wt0Mse771QGq815Duvq4PiqIinQw/9T4b5o/7Ab8ktWzMNfcd0O2NPP4q1EJ h5GkgGVtdvXGynoBCOACvKv3NzUhoCRL3v01WsRueoyIDKdEzrr+AYcnm7F0S7TWrn5d nqMdz+krg34hQNLWGqMUn5qdkBNA96qSIj4DHhKD8xVs+B70heBy/Tc4xGa6Vs694+ne sX+45w5v0A2FobeG0JGG06WeLYgYsoaAbeGOHTuZMyhtpbEJ68nOgL84y1o4B5I/UTLO 86Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:cc:to:from:subject:message-id :mime-version:date:reply-to:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=t9//kZJYNl4izvytHF7z7Dnucu90xh6NKNXZlIG10fQ=; b=h2jpjmDBWNwVYtfQsk5SQtkx8/e/Vwieu07UMQ6GWYCebTPB4Oi3TPyTEa/HbT+jaz TuLe8mgTOEr2B25WsomLR/mEI2er9crJd0d0OX/gxlCyVq0Vi0pzbJ6Fp7dknE8OSH83 namqlmDNKVeTVDNu0QeKvJkVXzMWx1n4IHcm6MwMQRzn6ievNhcqr9pUv2s6s64HB+9B 6l90pa2xC3FHTiYbvmfTBWtTCVe1Q6OeBt3ei+tfwTIFLkdyzzkE63RzRJrETkPIXadF EXoe/2vIRgTLUQnJoUufHBDCdp3wBTx/K1Kg/db8tAm6qkt7fc6fPooz2BqKaXqbDnai Fi/A== X-Gm-Message-State: AO0yUKXfX9zUNhoNHsGJH6aSKE+vOqujwTJxHCszwGjANgHT3blQBmC9 UwYO1m/DFfCwFJ/zdt9ylP3fdo9iE70= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6a02:241:b0:502:f8a4:86db with SMTP id bi1-20020a056a02024100b00502f8a486dbmr333807pgb.1.1677266914636; Fri, 24 Feb 2023 11:28:34 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 24 Feb 2023 11:28:32 -0800 Mime-Version: 1.0 X-Mailer: git-send-email 2.39.2.722.g9855ee24e9-goog Message-ID: <20230224192832.1286267-1-seanjc@google.com> Subject: [PATCH] KVM: MIPS: Make kvm_mips_callbacks const From: Sean Christopherson To: Huacai Chen , Aleksandar Markovic Cc: linux-mips@vger.kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, " =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= " , Sean Christopherson X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758742656988998502?= X-GMAIL-MSGID: =?utf-8?q?1758742656988998502?= Make kvm_mips_callbacks fully const as it's now hardcoded to point at kvm_vz_callbacks, the only remaining the set of callbacks. Link: https://lore.kernel.org/all/beb697c2-dfad-780e-4638-76b229f28731@linaro.org Suggested-by: Philippe Mathieu-Daudé Signed-off-by: Sean Christopherson Reviewed-by: Philippe Mathieu-Daudé --- arch/mips/include/asm/kvm_host.h | 2 +- arch/mips/kvm/vz.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) base-commit: 3ad108511e1c19ff3a3fcb9a39b3eaebf4dd4054 diff --git a/arch/mips/include/asm/kvm_host.h b/arch/mips/include/asm/kvm_host.h index 2803c9c21ef9..957121a495f0 100644 --- a/arch/mips/include/asm/kvm_host.h +++ b/arch/mips/include/asm/kvm_host.h @@ -757,7 +757,7 @@ struct kvm_mips_callbacks { int (*vcpu_run)(struct kvm_vcpu *vcpu); void (*vcpu_reenter)(struct kvm_vcpu *vcpu); }; -extern struct kvm_mips_callbacks *kvm_mips_callbacks; +extern const struct kvm_mips_callbacks * const kvm_mips_callbacks; int kvm_mips_emulation_init(void); /* Debug: dump vcpu state */ diff --git a/arch/mips/kvm/vz.c b/arch/mips/kvm/vz.c index dafab003ea0d..3d21cbfa7443 100644 --- a/arch/mips/kvm/vz.c +++ b/arch/mips/kvm/vz.c @@ -3305,7 +3305,7 @@ static struct kvm_mips_callbacks kvm_vz_callbacks = { }; /* FIXME: Get rid of the callbacks now that trap-and-emulate is gone. */ -struct kvm_mips_callbacks *kvm_mips_callbacks = &kvm_vz_callbacks; +const struct kvm_mips_callbacks * const kvm_mips_callbacks = &kvm_vz_callbacks; int kvm_mips_emulation_init(void) {