From patchwork Mon Jun 30 09:02:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 4446751 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 90729BEEAA for ; Mon, 30 Jun 2014 09:03:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B6D0D202F8 for ; Mon, 30 Jun 2014 09:03:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DF5E9202FE for ; Mon, 30 Jun 2014 09:03:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755004AbaF3JDF (ORCPT ); Mon, 30 Jun 2014 05:03:05 -0400 Received: from mail.skyhub.de ([78.46.96.112]:37386 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754722AbaF3JDE (ORCPT ); Mon, 30 Jun 2014 05:03:04 -0400 X-Virus-Scanned: Nedap ESD1 at mail.skyhub.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alien8.de; s=alien8; t=1404118981; bh=ivtCG4kfw0Au2fVyaF4XyxNmBp1yW2tQEi4IxUY/+LI=; h=From:To:Cc:Subject:Date:Message-Id; b=WImg0seerSYESVQFyr8yvJi8BOB Zw9Th+c/5XSrmIXgYHd9Xw1Md/MPTL65pfa/h4TLmDAeXDXmb0M5eg0om6PUwfMWo5P 6usOM+52escIcsXLhskxHRcauAY3WRXmLN6AxiQW97hvEhD2wfmE9lVMbGEczIZqzVk nXJMIQu5Vw= Received: from mail.skyhub.de ([127.0.0.1]) by localhost (door.skyhub.de [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id OlXet1j9qGFW; Mon, 30 Jun 2014 11:03:01 +0200 (CEST) Received: from liondog.tnic (p5DDC4615.dip0.t-ipconnect.de [93.220.70.21]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.skyhub.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id 591B324494B; Mon, 30 Jun 2014 11:03:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alien8.de; s=alien8; t=1404118981; bh=ivtCG4kfw0Au2fVyaF4XyxNmBp1yW2tQEi4IxUY/+LI=; h=From:To:Cc:Subject:Date:Message-Id; b=WImg0seerSYESVQFyr8yvJi8BOB Zw9Th+c/5XSrmIXgYHd9Xw1Md/MPTL65pfa/h4TLmDAeXDXmb0M5eg0om6PUwfMWo5P 6usOM+52escIcsXLhskxHRcauAY3WRXmLN6AxiQW97hvEhD2wfmE9lVMbGEczIZqzVk nXJMIQu5Vw= Received: by liondog.tnic (Postfix, from userid 1000) id 8B86910047C; Mon, 30 Jun 2014 11:02:59 +0200 (CEST) From: Borislav Petkov To: KVM Cc: LKML Subject: [PATCH TRIVIAL] kvm: Correct kvm_multiple_exception's naming Date: Mon, 30 Jun 2014 11:02:59 +0200 Message-Id: <1404118979-12109-1-git-send-email-bp@alien8.de> X-Mailer: git-send-email 2.0.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Borislav Petkov While staring at kvm exception code in conjunction with the recent #DF splat, this function's name was bugging me because it clearly deals with multiple exceptionS(!) but it is missing the plural in the naming. Fix that so that I can sleep at night :-) Signed-off-by: Borislav Petkov --- arch/x86/kvm/x86.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index f32a02578c0d..10a144c5456f 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -310,7 +310,7 @@ static int exception_class(int vector) return EXCPT_BENIGN; } -static void kvm_multiple_exception(struct kvm_vcpu *vcpu, +static void kvm_multiple_exceptions(struct kvm_vcpu *vcpu, unsigned nr, bool has_error, u32 error_code, bool reinject) { @@ -354,13 +354,13 @@ static void kvm_multiple_exception(struct kvm_vcpu *vcpu, void kvm_queue_exception(struct kvm_vcpu *vcpu, unsigned nr) { - kvm_multiple_exception(vcpu, nr, false, 0, false); + kvm_multiple_exceptions(vcpu, nr, false, 0, false); } EXPORT_SYMBOL_GPL(kvm_queue_exception); void kvm_requeue_exception(struct kvm_vcpu *vcpu, unsigned nr) { - kvm_multiple_exception(vcpu, nr, false, 0, true); + kvm_multiple_exceptions(vcpu, nr, false, 0, true); } EXPORT_SYMBOL_GPL(kvm_requeue_exception); @@ -398,13 +398,13 @@ EXPORT_SYMBOL_GPL(kvm_inject_nmi); void kvm_queue_exception_e(struct kvm_vcpu *vcpu, unsigned nr, u32 error_code) { - kvm_multiple_exception(vcpu, nr, true, error_code, false); + kvm_multiple_exceptions(vcpu, nr, true, error_code, false); } EXPORT_SYMBOL_GPL(kvm_queue_exception_e); void kvm_requeue_exception_e(struct kvm_vcpu *vcpu, unsigned nr, u32 error_code) { - kvm_multiple_exception(vcpu, nr, true, error_code, true); + kvm_multiple_exceptions(vcpu, nr, true, error_code, true); } EXPORT_SYMBOL_GPL(kvm_requeue_exception_e);