From patchwork Sun Dec 25 10:58:33 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [5/7] KVM: PPC: protect use of kvmppc_h_pr
From: Alexander Graf <agraf@suse.de>
X-Patchwork-Id: 133196
Message-Id: <1324810715-28312-6-git-send-email-agraf@suse.de>
To: KVM devel mailing list <kvm@vger.kernel.org>
Cc: kvm-ppc@vger.kernel.org, Marcelo Tosatti <mtosatti@redhat.com>,
 Avi Kivity <avi@redhat.com>, Andreas Schwab <schwab@linux-m68k.org>
Date: Sun, 25 Dec 2011 11:58:33 +0100

From: Andreas Schwab <schwab@linux-m68k.org>

kvmppc_h_pr is only available if CONFIG_KVM_BOOK3S_64_PR.

Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: Alexander Graf <agraf@suse.de>

---
arch/powerpc/kvm/book3s_pr.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c
index 3c791e1..e2cfb9e 100644
--- a/arch/powerpc/kvm/book3s_pr.c
+++ b/arch/powerpc/kvm/book3s_pr.c
@@ -658,10 +658,12 @@ program_interrupt:
 			ulong cmd = kvmppc_get_gpr(vcpu, 3);
 			int i;
 
+#ifdef CONFIG_KVM_BOOK3S_64_PR
 			if (kvmppc_h_pr(vcpu, cmd) == EMULATE_DONE) {
 				r = RESUME_GUEST;
 				break;
 			}
+#endif
 
 			run->papr_hcall.nr = cmd;
 			for (i = 0; i < 9; ++i) {