From patchwork Wed Feb 14 16:33:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: WANG Xuerui X-Patchwork-Id: 201034 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp1341508dyb; Wed, 14 Feb 2024 08:39:46 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXjMIq0tCnNWYMvVE9XmrU89W6VjuXDhxGfOGnAOMBdZgpQdubDkehbWjWW3xCC2M4iH28VvBMlo2eFmTb+0WiP8wB9yw== X-Google-Smtp-Source: AGHT+IHpqnLucrMohkM/PPnjpcERAgsxWwYfToFf4P/WQmhvrS+HjN0Bphu6rLVrLBrJgUskq7AQ X-Received: by 2002:a17:902:f705:b0:1db:5b41:c59a with SMTP id h5-20020a170902f70500b001db5b41c59amr3160400plo.45.1707928786570; Wed, 14 Feb 2024 08:39:46 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707928786; cv=pass; d=google.com; s=arc-20160816; b=vDoF5EFk6Uwv4KmxcD8qRsEgVU6XfCiYEg5+Psq+ONlrqxP8rsDY70DJXfoges/d5b vGSNN1U2nQUf0dcx9jSZT/2a9tMnUTvgicI1e7KPByFoTdejA/dZrjS9s4Sj5Yur2Os8 KIDnLAOkFZzEIK8jkve0xKlM7sxYJxbotymhgkqEyKxByW7E59Hwgdt8FCWIf7P+EXX8 E+iMJHU2wa1kRxSk+oEcQtT/noNfFPXzu1dS8NBEUqX8hon4oLmeFkE5phDsbK1Nr+kr 674jByx4HMDMGrIRMRu1AzoQRzD6pkoGrhyVmL34/8TWwopbrKiQT8iNSrlqRMFJclyw QwbA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=Pyj7psfQ9omEicu4WWM5idDO2TxPx1IprjGbZwJCuzc=; fh=IXS/UOQx8T/HIAwo6kNMO66FUH3MGE2grpl8KqWyqbA=; b=Syagrn2PM0dboJ5UEhW8Qw0RX9yFU3RtJvxW8A/6bFzib5UXqHfCgcXcBBP/zdhqNG sbOG6GL9is/OnqS9QLj7L1HGz6KSC6AFv/wh14SxvdUqQ0uD/uLr+BgbJfpCOHX9LafC U/hYWQLuGnCIo6q2kGY0SCDUesBgJOd32W6yKnQd/Tc1HxjgUQOFuhTvB2fppVQAXmW0 wCwlVaKsSsBgNq55T68Ce478c8bkC4nW6iIWmb5Mu8HCrSigNKs4Q6s3EcvvGfxKOAeL 5FYIpsUXqrW0K7IplGtAtI8wela9l4KnQ8qw+dKEti6qLVDnsKmzMbT7IZbKtDF72bfn ywQQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@xen0n.name header.s=mail header.b=naMmfsy+; arc=pass (i=1 spf=pass spfdomain=xen0n.name dkim=pass dkdomain=xen0n.name); spf=pass (google.com: domain of linux-kernel+bounces-65557-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-65557-ouuuleilei=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=2; AJvYcCV1tXrnxXxq9a2334ahxMe+z57W8fTk55I3jUUG1lsO9mL2Kv116mu1ZV98ligU2zet0sOaldl1D9CWM9tXmgF0ePCyDw== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id h2-20020a170902f54200b001d9ef3f39bbsi4075332plf.548.2024.02.14.08.39.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Feb 2024 08:39:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-65557-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@xen0n.name header.s=mail header.b=naMmfsy+; arc=pass (i=1 spf=pass spfdomain=xen0n.name dkim=pass dkdomain=xen0n.name); spf=pass (google.com: domain of linux-kernel+bounces-65557-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-65557-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id D2FA1284E15 for ; Wed, 14 Feb 2024 16:38:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A8A7C65BCA; Wed, 14 Feb 2024 16:34:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=xen0n.name header.i=@xen0n.name header.b="naMmfsy+" Received: from mailbox.box.xen0n.name (mail.xen0n.name [115.28.160.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 57C126166F; Wed, 14 Feb 2024 16:34:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.28.160.31 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707928448; cv=none; b=ED2qFXpLXmtNmHpzKJQRHCglvrb7vplCFjWIJsxpOuDsOJZ2UQYqlCC8Ew1NYwsWsKGYumkFXuBCobyayDEEAWxt/pBmeR7jcuFKvlvFP7Qtro2z32wPSdRtQ5+M8nqLpakvQpJuTFxMSa7kneNMDBfXyXtApHYgkgSNmB3Jq8U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707928448; c=relaxed/simple; bh=VP6OWLTFU7Iwj95xAdgUR/i01Q0SJTbE9ZgKz6xmu84=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fbT7imKRk50jMsLAbR8c3XFuaqzi5t7/M3ga/WpP7yY66Wfw6L84QYhuVwa15KxdCSULcvKSGfYGjca3fmLU4hxNUZL6c73OIOojQpcGOpfwdfkK8I7LiJgc3JgV/7j+nNOb3+70femSLTOQicVthEzpZgqM5rEvzPmM3vV0CH4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=xen0n.name; spf=pass smtp.mailfrom=xen0n.name; dkim=pass (1024-bit key) header.d=xen0n.name header.i=@xen0n.name header.b=naMmfsy+; arc=none smtp.client-ip=115.28.160.31 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=xen0n.name Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=xen0n.name DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=xen0n.name; s=mail; t=1707928443; bh=VP6OWLTFU7Iwj95xAdgUR/i01Q0SJTbE9ZgKz6xmu84=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=naMmfsy+ntQ5Ahxt+D9gh8gQ4S3XLqAraQ3mSDPFsjwvXQyaXRn4eExZ2KSiUnnmX X55S4dnrrdhApVmlUj8J8GCA6AqWyTsSwo7T+9hT8doo57WHXTLjK+wCtf+AaZQ7Ry eCGBSKZ5vA4v3sNWgNOyyxQJ+Ei0nQebeaC0F4EM= Received: from ld50.lan (unknown [IPv6:240e:388:8d00:6500:42e8:c06f:a0dc:12f8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailbox.box.xen0n.name (Postfix) with ESMTPSA id EA013601C6; Thu, 15 Feb 2024 00:34:02 +0800 (CST) From: WANG Xuerui To: Paolo Bonzini , Huacai Chen Cc: Tianrui Zhao , Bibo Mao , kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, WANG Xuerui Subject: [PATCH for-6.8 v2 3/4] KVM: LoongArch: Rename _kvm_get_cpucfg to _kvm_get_cpucfg_mask Date: Thu, 15 Feb 2024 00:33:56 +0800 Message-ID: <20240214163358.2913090-4-kernel@xen0n.name> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240214163358.2913090-1-kernel@xen0n.name> References: <20240214163358.2913090-1-kernel@xen0n.name> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790893135270864739 X-GMAIL-MSGID: 1790893135270864739 From: WANG Xuerui The function is not actually a getter of guest CPUCFG, but rather validation of the input CPUCFG ID plus information about the supported bit flags of that CPUCFG leaf. So rename it to avoid confusion. Signed-off-by: WANG Xuerui --- arch/loongarch/kvm/vcpu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/loongarch/kvm/vcpu.c b/arch/loongarch/kvm/vcpu.c index cc2332b056ba..e973500611b4 100644 --- a/arch/loongarch/kvm/vcpu.c +++ b/arch/loongarch/kvm/vcpu.c @@ -298,7 +298,7 @@ static int _kvm_setcsr(struct kvm_vcpu *vcpu, unsigned int id, u64 val) return ret; } -static int _kvm_get_cpucfg(int id, u64 *v) +static int _kvm_get_cpucfg_mask(int id, u64 *v) { switch (id) { case 2: @@ -330,7 +330,7 @@ static int kvm_check_cpucfg(int id, u64 val) u64 mask; int ret; - ret = _kvm_get_cpucfg(id, &mask); + ret = _kvm_get_cpucfg_mask(id, &mask); if (ret) return ret; @@ -557,7 +557,7 @@ static int kvm_loongarch_get_cpucfg_attr(struct kvm_vcpu *vcpu, uint64_t val; uint64_t __user *uaddr = (uint64_t __user *)attr->addr; - ret = _kvm_get_cpucfg(attr->attr, &val); + ret = _kvm_get_cpucfg_mask(attr->attr, &val); if (ret) return ret;