Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp604720pxb; Wed, 3 Nov 2021 09:19:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwBW0+HWqcum18Codd+qNQ4PFHVFngE/N6ge+MM8c3H8pw/QsQ7BjItRdW+dmRFzQVytUrr X-Received: by 2002:a1c:27c1:: with SMTP id n184mr16292780wmn.190.1635956363447; Wed, 03 Nov 2021 09:19:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635956363; cv=none; d=google.com; s=arc-20160816; b=arywkicflrByfkdnULo1ht8LvJ3vs3No/kUldZaMTQvNv3XIfFF0+UFEy7AdYcHULU Gw6G3mMTH70vwI2VCv33HpVPemVck8Zd88DYCgHKLnr/JvSJP4PQCvBSknCU57kvATy9 rQuUpjTdLOKxAQBpbpUMsDg8nt05Itl0yvQBLSjHP+9i+lp2KhiPD70FG0syFuE5eQRg OjF5eUyJ4E9mmmRkNeQDiJYNuL1LTu2kq/Tco4RMU+Pe8w9Yuc+3CoEsXlgkkx0m3kOY u1V0l9yCOxhdeBaWMvsyqX8KcN0a2UykCCOechFdK7JN++8/ZLyGBA4dGFiqpJq3embu 39Rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=+Opb5XjIjvU4WythImF8wPWmsUb4lObJFswO1EWR5cA=; b=OQcVUDkOkd8hF3ktmT+EwTW/VEI4WHcd3pJmfBIzxxccRC4H631/H4orZHMsoqUi7s ckAa9WsdFMhxTMlxgiDBv+6E+pdMB3WmG2x8rOKZGa32Igc++/90eNu8KEjlpJTURRcM 0Yd+z9zAGYqrfsGatRzusMcQBO/3NKspX6acMnss1IF4NWrpQ0SHHZfvGYRmtCiy91dF 1FvYiOfp1LDnti43gqDlUsanEfu3MRvqEDPdYBDmdVTuYnHChrYSusmedVcOG2wU5lhy pPbBxd9xh8ZiavNPnnXPJS63A489iyvstncKDf1zOHQbiKHwJlTpcd88hj1o8nKKDdWW T/wg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=QnAthvRo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p23si4802878edw.186.2021.11.03.09.18.57; Wed, 03 Nov 2021 09:19:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=QnAthvRo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232911AbhKCQSw (ORCPT + 99 others); Wed, 3 Nov 2021 12:18:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:24496 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232888AbhKCQSl (ORCPT ); Wed, 3 Nov 2021 12:18:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635956164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=+Opb5XjIjvU4WythImF8wPWmsUb4lObJFswO1EWR5cA=; b=QnAthvRoDJ1/6CFzuMDYP8jpWMzeB8U10e4XFbeQnQ+HJ+CjwnyuzEdq/BOhmqfmCGYn6A CdoWShGEIHcX7LyTRJSab2dC4lu40d0M996MjqmyzYxAw6vcKpnFSGh22zCpouInvVjPhY HqYYJ+T5TuWw711bSsXTdMfyN3ofOLw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-243-G_MzGzteMOyKF7Qgby8XBw-1; Wed, 03 Nov 2021 12:15:57 -0400 X-MC-Unique: G_MzGzteMOyKF7Qgby8XBw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C4EB81808318; Wed, 3 Nov 2021 16:15:56 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5698A60C04; Wed, 3 Nov 2021 16:15:56 +0000 (UTC) From: Emanuele Giuseppe Esposito To: kvm@vger.kernel.org Cc: Paolo Bonzini , Maxim Levitsky , linux-kernel@vger.kernel.org, Emanuele Giuseppe Esposito Subject: [PATCH v1] nested.c: replace spaces with tabs Date: Wed, 3 Nov 2021 12:15:13 -0400 Message-Id: <20211103161513.789230-1-eesposit@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For some reasons, some code blocks are indented with spaces instead of tabs. Checkpatch also complains when having to deal with this code. Fix this at least in nested.c Signed-off-by: Emanuele Giuseppe Esposito --- arch/x86/kvm/svm/nested.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index f8b7bc04b3e7..3cf04ef8738a 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -55,19 +55,20 @@ static void nested_svm_inject_npf_exit(struct kvm_vcpu *vcpu, static void svm_inject_page_fault_nested(struct kvm_vcpu *vcpu, struct x86_exception *fault) { - struct vcpu_svm *svm = to_svm(vcpu); - WARN_ON(!is_guest_mode(vcpu)); + struct vcpu_svm *svm = to_svm(vcpu); + + WARN_ON(!is_guest_mode(vcpu)); - if (vmcb_is_intercept(&svm->nested.ctl, INTERCEPT_EXCEPTION_OFFSET + PF_VECTOR) && + if (vmcb_is_intercept(&svm->nested.ctl, INTERCEPT_EXCEPTION_OFFSET + PF_VECTOR) && !svm->nested.nested_run_pending) { - svm->vmcb->control.exit_code = SVM_EXIT_EXCP_BASE + PF_VECTOR; - svm->vmcb->control.exit_code_hi = 0; - svm->vmcb->control.exit_info_1 = fault->error_code; - svm->vmcb->control.exit_info_2 = fault->address; - nested_svm_vmexit(svm); - } else { - kvm_inject_page_fault(vcpu, fault); - } + svm->vmcb->control.exit_code = SVM_EXIT_EXCP_BASE + PF_VECTOR; + svm->vmcb->control.exit_code_hi = 0; + svm->vmcb->control.exit_info_1 = fault->error_code; + svm->vmcb->control.exit_info_2 = fault->address; + nested_svm_vmexit(svm); + } else { + kvm_inject_page_fault(vcpu, fault); + } } static u64 nested_svm_get_tdp_pdptr(struct kvm_vcpu *vcpu, int index) @@ -1175,7 +1176,7 @@ static int svm_check_nested_events(struct kvm_vcpu *vcpu) * vmcb field, while delivering the pending exception. */ if (svm->nested.nested_run_pending) - return -EBUSY; + return -EBUSY; if (!nested_exit_on_exception(svm)) return 0; nested_svm_inject_exception_vmexit(svm); @@ -1376,7 +1377,7 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu, * valid for guest mode (see nested_vmcb_check_save). */ cr0 = kvm_read_cr0(vcpu); - if (((cr0 & X86_CR0_CD) == 0) && (cr0 & X86_CR0_NW)) + if (((cr0 & X86_CR0_CD) == 0) && (cr0 & X86_CR0_NW)) goto out_free; /* -- 2.27.0