From patchwork Fri Oct 4 11:45:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Mackerras X-Patchwork-Id: 280577 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 96BA22C00E3 for ; Fri, 4 Oct 2013 21:45:28 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754389Ab3JDLp1 (ORCPT ); Fri, 4 Oct 2013 07:45:27 -0400 Received: from ozlabs.org ([203.10.76.45]:58637 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754362Ab3JDLp0 (ORCPT ); Fri, 4 Oct 2013 07:45:26 -0400 Received: from iris.au.ibm.com (ppp121-45-195-172.lns20.cbr1.internode.on.net [121.45.195.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPSA id 7D2962C00CD; Fri, 4 Oct 2013 21:45:25 +1000 (EST) From: Paul Mackerras To: Alexander Graf Cc: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org Subject: [PATCH 1/2] KVM: PPC: Book3S HV: Add missing break statements in ONE_REG switches Date: Fri, 4 Oct 2013 21:45:03 +1000 Message-Id: <1380887104-805-2-git-send-email-paulus@samba.org> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1380887104-805-1-git-send-email-paulus@samba.org> References: <1380887104-805-1-git-send-email-paulus@samba.org> Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org This adds break statements after the KVM_REG_PPC_PPR case in kvmppc_get_one_reg() and kvmppc_set_one_reg(). The error was introduced in commit d3ecc54390 ("KVM: PPC: Book3S HV: Support POWER6 compatibility mode on POWER7"). That commit also forgot to update Documentation/virtual/kvm/api.txt with the new one_reg identifier, so we do that here too. Signed-off-by: Paul Mackerras --- Documentation/virtual/kvm/api.txt | 1 + arch/powerpc/kvm/book3s_hv.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt index 34a32b6..4e68169 100644 --- a/Documentation/virtual/kvm/api.txt +++ b/Documentation/virtual/kvm/api.txt @@ -1837,6 +1837,7 @@ registers, find a list below: PPC | KVM_REG_PPC_VRSAVE | 32 PPC | KVM_REG_PPC_LPCR | 64 PPC | KVM_REG_PPC_PPR | 64 + PPC | KVM_REG_PPC_ARCH_COMPAT 32 PPC | KVM_REG_PPC_TM_GPR0 | 64 ... PPC | KVM_REG_PPC_TM_GPR31 | 64 diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index 0a50051..d3dc183 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -854,6 +854,7 @@ int kvmppc_get_one_reg(struct kvm_vcpu *vcpu, u64 id, union kvmppc_one_reg *val) break; case KVM_REG_PPC_PPR: *val = get_reg_val(id, vcpu->arch.ppr); + break; case KVM_REG_PPC_ARCH_COMPAT: *val = get_reg_val(id, vcpu->arch.vcore->arch_compat); break; @@ -966,6 +967,7 @@ int kvmppc_set_one_reg(struct kvm_vcpu *vcpu, u64 id, union kvmppc_one_reg *val) break; case KVM_REG_PPC_PPR: vcpu->arch.ppr = set_reg_val(id, *val); + break; case KVM_REG_PPC_ARCH_COMPAT: r = kvmppc_set_arch_compat(vcpu, set_reg_val(id, *val)); break;