From patchwork Sat May 31 05:45:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jidong Xiao X-Patchwork-Id: 4274901 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 173AA9F336 for ; Sat, 31 May 2014 05:45:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4579A2039E for ; Sat, 31 May 2014 05:45:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 64B8D20397 for ; Sat, 31 May 2014 05:45:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751763AbaEaFpO (ORCPT ); Sat, 31 May 2014 01:45:14 -0400 Received: from mail-ob0-f176.google.com ([209.85.214.176]:50896 "EHLO mail-ob0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751409AbaEaFpN (ORCPT ); Sat, 31 May 2014 01:45:13 -0400 Received: by mail-ob0-f176.google.com with SMTP id wo20so2682507obc.35 for ; Fri, 30 May 2014 22:45:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=8Hr0FOqSMTgI6EGvU5h8GOyMc4boPhlBuxL9OHAViQ8=; b=T9WKnqYe74VJjCZUUrrlLITLa3BWaYpzb/pRvJQREaJ2jE28LNMOM04k3eckulPTNa OItnoj12fTeCaP2Hlsme874f8ULeW6xBLa4CIV6nTVk3PBKeMtn0WQlfWrWT0+WDsuf9 8gvy/UtW7CKitvfxaJnCTNN1nxzO3wRaaFAJVT0p6Y8aVGG0UkNafuMsCflnQfOfGuHN rKIxwAjwqv6SuZYWV+qpD8+kiH7K2Q8tBfgMLRcmLWii9J0O31QO8cD2oWkf/mGHdW6v Vy/AKvuDcnGd9aXRS6HpCmtK93UQ3FMbMyUXMkO/kBocaW1hQdxWFiKjfVjwrmpDvqXH C+Pg== MIME-Version: 1.0 X-Received: by 10.182.115.199 with SMTP id jq7mr22759992obb.70.1401515112642; Fri, 30 May 2014 22:45:12 -0700 (PDT) Received: by 10.60.61.9 with HTTP; Fri, 30 May 2014 22:45:12 -0700 (PDT) Date: Sat, 31 May 2014 01:45:12 -0400 Message-ID: Subject: [PATCH] Fix typos and mark a local function as static in x86.c From: Jidong Xiao To: KVM Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 This patch fix typos in arch/x86/kvm/x86.c and mark the local function emulator_write_emulated() as static. Signed-off-by: Jidong Xiao --- .read_write_exit_mmio = write_exit_mmio, @@ -4382,17 +4382,17 @@ static int emulator_read_emulated(struct x86_emulate_ctxt *ctxt, struct x86_exception *exception) { return emulator_read_write(ctxt, addr, val, bytes, - exception, &read_emultor); + exception, &read_emulator); } -int emulator_write_emulated(struct x86_emulate_ctxt *ctxt, +static int emulator_write_emulated(struct x86_emulate_ctxt *ctxt, unsigned long addr, const void *val, unsigned int bytes, struct x86_exception *exception) { return emulator_read_write(ctxt, addr, (void *)val, bytes, - exception, &write_emultor); + exception, &write_emulator); } #define CMPXCHG_TYPE(t, ptr, old, new) \ -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 20316c6..5148562 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -4267,14 +4267,14 @@ static int write_exit_mmio(struct kvm_vcpu *vcpu, gpa_t gpa, return X86EMUL_CONTINUE; } -static const struct read_write_emulator_ops read_emultor = { +static const struct read_write_emulator_ops read_emulator = { .read_write_prepare = read_prepare, .read_write_emulate = read_emulate, .read_write_mmio = vcpu_mmio_read, .read_write_exit_mmio = read_exit_mmio, }; -static const struct read_write_emulator_ops write_emultor = { +static const struct read_write_emulator_ops write_emulator = { .read_write_emulate = write_emulate, .read_write_mmio = write_mmio,