From patchwork Mon Aug 20 18:37:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongjiu Geng X-Patchwork-Id: 10570129 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 338FA920 for ; Mon, 20 Aug 2018 10:33:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 208B029267 for ; Mon, 20 Aug 2018 10:33:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 11A822926F; Mon, 20 Aug 2018 10:33:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BD04829267 for ; Mon, 20 Aug 2018 10:33:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:To :From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=l79vJuudR3Heop7WBwug6SNcbl63v9YjW65RscnID3Y=; b=p7zjIJG6CM/B8H XkuvLNJ8M/3OdOeY7FqOHvnnktSBTTsoUSbSidvHE0JCOMpJRHLeNDhn6C2TpjlOm7v25wrzZP7pw zEn+QNtH+gtC9LTlwMCcK0E9ZHZM/lEO+Sog0XiTKPRbNAIriU/CkZMyOZbT6cqlcgrCzLW1zy9Tg pfAy3KzjjBTo30a4eZ2euP4QOKx5dQm/KcSVkBsyiK/mLElvkHK2YjHRWH3CkDAVarsdF7kw7Nq37 bfXBZlNxD65I5YBee3HBhjD37FisgO2aUy/Q/PuAUmruuts/MEkGzThGZt5JKsieX8BnMB+t64yNA GfGxVBF9DckgiM/NhOsw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1frhUo-0005xc-5m; Mon, 20 Aug 2018 10:33:14 +0000 Received: from szxga07-in.huawei.com ([45.249.212.35] helo=huawei.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1frhUk-0005vc-Ts for linux-arm-kernel@lists.infradead.org; Mon, 20 Aug 2018 10:33:12 +0000 Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id B440EEFC3AEEB; Mon, 20 Aug 2018 18:32:48 +0800 (CST) Received: from localhost.localdomain (10.143.28.90) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.399.0; Mon, 20 Aug 2018 18:32:43 +0800 From: Dongjiu Geng To: , , , , , , Subject: [PATCH] arm64: KVM: rename the capability to set guest SError syndrome Date: Mon, 20 Aug 2018 14:37:31 -0400 Message-ID: <1534790251-15847-1-git-send-email-gengdongjiu@huawei.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-Originating-IP: [10.143.28.90] X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180820_033311_126283_973442E9 X-CRM114-Status: GOOD ( 11.93 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP In the documentation description, this capability's name is KVM_CAP_ARM_SET_SERROR_ESR, but in the header file this capability's name is KVM_CAP_ARM_INJECT_SERROR_ESR, so it is better to use a same name. Signed-off-by: Dongjiu Geng --- In the Documentation/virtual/kvm/api.txt: +8.19 KVM_CAP_ARM_SET_SERROR_ESR In the include/uapi/linux/kvm.h: +#define KVM_CAP_ARM_INJECT_SERROR_ESR 156 So in above two files, the capability's name is not same, it is better to use a same name. --- arch/arm64/kvm/reset.c | 2 +- include/uapi/linux/kvm.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c index e37c78b..57dc6be 100644 --- a/arch/arm64/kvm/reset.c +++ b/arch/arm64/kvm/reset.c @@ -77,7 +77,7 @@ int kvm_arch_dev_ioctl_check_extension(struct kvm *kvm, long ext) case KVM_CAP_ARM_PMU_V3: r = kvm_arm_support_pmu_v3(); break; - case KVM_CAP_ARM_INJECT_SERROR_ESR: + case KVM_CAP_ARM_SET_SERROR_ESR: r = cpus_have_const_cap(ARM64_HAS_RAS_EXTN); break; case KVM_CAP_SET_GUEST_DEBUG: diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 07548de..fab7525 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -951,7 +951,7 @@ struct kvm_ppc_resize_hpt { #define KVM_CAP_HYPERV_TLBFLUSH 155 #define KVM_CAP_S390_HPAGE_1M 156 #define KVM_CAP_NESTED_STATE 157 -#define KVM_CAP_ARM_INJECT_SERROR_ESR 158 +#define KVM_CAP_ARM_SET_SERROR_ESR 158 #ifdef KVM_CAP_IRQ_ROUTING