From patchwork Wed May 22 18:43:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Daney X-Patchwork-Id: 2603091 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 16C0240077 for ; Wed, 22 May 2013 18:47:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756869Ab3EVSqu (ORCPT ); Wed, 22 May 2013 14:46:50 -0400 Received: from mail-pd0-f179.google.com ([209.85.192.179]:59509 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753375Ab3EVSoI (ORCPT ); Wed, 22 May 2013 14:44:08 -0400 Received: by mail-pd0-f179.google.com with SMTP id q11so2002308pdj.10 for ; Wed, 22 May 2013 11:44:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=3S3jqyZefuF+me5XGTGvkSRBH8Tk1ehaJ4J7UJW8LB0=; b=mS4ydCzsrTMEzVLW1Il5INRfrEcxXxK+MUu7HzIKeqdJmxhrcfjeAWhOOypvsCLdBx vlb/7hLGu8CFyPN8noRLZbhvWFUkbdIpSRinlok8yjfsyOrN603FT+llc/DgoEreGh4b iaUVBS5GDDw7gDZwA3OgYT0ifngHslnuPs2C5+i3w9lNRaU4zP3XOsTY6eCQGuk2F9YG xkUvWAh6PU5r9/mE38Zm2NBrG50O+fJguRERpn/D/lgjs0np/4u0P9duAo9BhXlEUDmm YcxKcH4QeffwxVmy3rWyze1eRlOCd0vnzWe43n5OsepeU9n988lVoDe7BJhXsnCZB36o 5yyA== X-Received: by 10.66.177.46 with SMTP id cn14mr10052972pac.4.1369248247398; Wed, 22 May 2013 11:44:07 -0700 (PDT) Received: from dl.caveonetworks.com (64.2.3.195.ptr.us.xo.net. [64.2.3.195]) by mx.google.com with ESMTPSA id tq8sm8217695pbc.30.2013.05.22.11.44.06 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 22 May 2013 11:44:06 -0700 (PDT) Received: from dl.caveonetworks.com (localhost.localdomain [127.0.0.1]) by dl.caveonetworks.com (8.14.5/8.14.5) with ESMTP id r4MIi4bS027289; Wed, 22 May 2013 11:44:04 -0700 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id r4MIi4hu027288; Wed, 22 May 2013 11:44:04 -0700 From: David Daney To: linux-mips@linux-mips.org, ralf@linux-mips.org, kvm@vger.kernel.org, Sanjay Lal , Gleb Natapov Cc: linux-kernel@vger.kernel.org, David Daney Subject: [PATCH v5 3/6] mips/kvm: Fix name of gpr field in struct kvm_regs. Date: Wed, 22 May 2013 11:43:53 -0700 Message-Id: <1369248236-27237-4-git-send-email-ddaney.cavm@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1369248236-27237-1-git-send-email-ddaney.cavm@gmail.com> References: <1369248236-27237-1-git-send-email-ddaney.cavm@gmail.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: David Daney Signed-off-by: David Daney --- arch/mips/include/asm/kvm.h | 3 ++- arch/mips/kvm/kvm_mips.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/mips/include/asm/kvm.h b/arch/mips/include/asm/kvm.h index 86812fb..d145ead 100644 --- a/arch/mips/include/asm/kvm.h +++ b/arch/mips/include/asm/kvm.h @@ -26,7 +26,8 @@ * extended to 64-bits. */ struct kvm_regs { - __u64 gprs[32]; + /* out (KVM_GET_REGS) / in (KVM_SET_REGS) */ + __u64 gpr[32]; __u64 hi; __u64 lo; __u64 pc; diff --git a/arch/mips/kvm/kvm_mips.c b/arch/mips/kvm/kvm_mips.c index e0dad02..93da750 100644 --- a/arch/mips/kvm/kvm_mips.c +++ b/arch/mips/kvm/kvm_mips.c @@ -678,7 +678,7 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) int i; for (i = 0; i < 32; i++) - vcpu->arch.gprs[i] = regs->gprs[i]; + vcpu->arch.gprs[i] = regs->gpr[i]; vcpu->arch.hi = regs->hi; vcpu->arch.lo = regs->lo; @@ -692,7 +692,7 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) int i; for (i = 0; i < 32; i++) - regs->gprs[i] = vcpu->arch.gprs[i]; + regs->gpr[i] = vcpu->arch.gprs[i]; regs->hi = vcpu->arch.hi; regs->lo = vcpu->arch.lo;