From patchwork Tue Aug 27 16:04:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vitaly Kuznetsov X-Patchwork-Id: 11117241 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 85C041395 for ; Tue, 27 Aug 2019 16:04:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6F58D21883 for ; Tue, 27 Aug 2019 16:04:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730333AbfH0QEd (ORCPT ); Tue, 27 Aug 2019 12:04:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37875 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729903AbfH0QEL (ORCPT ); Tue, 27 Aug 2019 12:04:11 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8DBE77BDA5 for ; Tue, 27 Aug 2019 16:04:11 +0000 (UTC) Received: by mail-wm1-f71.google.com with SMTP id r9so1243207wme.8 for ; Tue, 27 Aug 2019 09:04:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/XqWagcDFu3I/3+ooG2WadK5AEABMMtW/Vv17jrsAvY=; b=lb6cOoFK1PNhO5UBVc6KKZDi+cTXA6GtXFkeJviFH+NHy5l0QnwJQM9WD8+OtqE/0b crZUc76EtHHA0NUn5JwwaWpl2ALKJeszFNlYuOtNTdFa+FvUFfv5cq/Md0G/u8Cf6DJg lnugfvh89Q13PXoob9EJ+i9j2+wqoVH1YNphAK2YIWmr4tYLpSDR9p0nNbiPOpuVRZ4W wsa4pSo1BvgwBCw2tRm7EVi8l5gu89du9ODagpd33zQK9Vt1jhBUuoZb1zQONq+I4mX1 QaGf5KdQMNTr0gjCYIdNk5N/iwtQLS4mVKaAg4CckCGwsqFJ0BF0/mBSmAGliVKaTKYu Jqrg== X-Gm-Message-State: APjAAAXncnRJbwMnjmrFAM9ECg+B0NEVu/DfLjtD/MM4KFNgPdm5BQZX H6jGt58gnGr2JlS1KjqTfUGv3jSxbPFdmtI74bD/vY6PNzonIqxxtYZ0TVzbqTCYbOoQzUIuAss Hfp8xrG+nqdMI X-Received: by 2002:a7b:c157:: with SMTP id z23mr29337869wmi.104.1566921849783; Tue, 27 Aug 2019 09:04:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqybdX7p/8QSoNaXF11fp+waAg3kYnqCagdBNshParsrqdkSV4cb0vJ1fCD53SJ5jbyMRhQ3aw== X-Received: by 2002:a7b:c157:: with SMTP id z23mr29337838wmi.104.1566921849575; Tue, 27 Aug 2019 09:04:09 -0700 (PDT) Received: from vitty.brq.redhat.com (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id n8sm13461246wro.89.2019.08.27.09.04.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Aug 2019 09:04:08 -0700 (PDT) From: Vitaly Kuznetsov To: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Paolo Bonzini , =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= , Joerg Roedel , Jim Mattson , Sean Christopherson , Roman Kagan Subject: [PATCH 2/3] KVM: x86: svm: remove unneeded nested_enable_evmcs() hook Date: Tue, 27 Aug 2019 18:04:03 +0200 Message-Id: <20190827160404.14098-3-vkuznets@redhat.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190827160404.14098-1-vkuznets@redhat.com> References: <20190827160404.14098-1-vkuznets@redhat.com> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Since commit 5158917c7b019 ("KVM: x86: nVMX: Allow nested_enable_evmcs to be NULL") the code in x86.c is prepared to see nested_enable_evmcs being NULL and in VMX case it actually is when nesting is disabled. Remove the unneeded stub from SVM code. Signed-off-by: Vitaly Kuznetsov Reviewed-by: Jim Mattson --- arch/x86/kvm/svm.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 40175c42f116..6d52c65d625b 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -7122,13 +7122,6 @@ static int svm_unregister_enc_region(struct kvm *kvm, return ret; } -static int nested_enable_evmcs(struct kvm_vcpu *vcpu, - uint16_t *vmcs_version) -{ - /* Intel-only feature */ - return -ENODEV; -} - static bool svm_need_emulation_on_page_fault(struct kvm_vcpu *vcpu) { unsigned long cr4 = kvm_read_cr4(vcpu); @@ -7337,7 +7330,7 @@ static struct kvm_x86_ops svm_x86_ops __ro_after_init = { .mem_enc_reg_region = svm_register_enc_region, .mem_enc_unreg_region = svm_unregister_enc_region, - .nested_enable_evmcs = nested_enable_evmcs, + .nested_enable_evmcs = NULL, .nested_get_evmcs_version = NULL, .need_emulation_on_page_fault = svm_need_emulation_on_page_fault,