From: Alexander Graf <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>
Subject: [PATCH 5/7] KVM: PPC: protect use of kvmppc_h_pr
Date: Sun, 25 Dec 2011 11:58:33 +0100 [thread overview]
Message-ID: <1324810715-28312-6-git-send-email-agraf@suse.de> (raw)
In-Reply-To: <1324810715-28312-1-git-send-email-agraf@suse.de>
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) {
--
1.6.0.2
next prev parent reply other threads:[~2011-12-25 10:58 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-25 10:58 [PULL 0/7] avi patch queue 2011-12-25 Alexander Graf
2011-12-25 10:58 ` [PATCH 1/7] KVM: PPC: Whitespace fix for kvm.h Alexander Graf
2011-12-25 10:58 ` [PATCH 2/7] KVM: Fix whitespace in kvm_para.h Alexander Graf
2011-12-25 10:58 ` [PATCH 3/7] powerpc/kvm: annotate kvm_rma_init as __init Alexander Graf
2011-12-25 10:58 ` [PATCH 4/7] KVM: PPC: move compute_tlbie_rb to book3s_64 common header Alexander Graf
2011-12-25 10:58 ` Alexander Graf [this message]
2011-12-25 10:58 ` [PATCH 6/7] powerpc kvm: fix kvmppc_start_thread() for CONFIG_SMP=N Alexander Graf
2011-12-25 10:58 ` [PATCH 7/7] KVM: PPC: e500: include linux/export.h Alexander Graf
2011-12-25 11:03 ` [PULL 0/7] avi patch queue 2011-12-25 Avi Kivity
2011-12-25 11:29 ` Alexander Graf
2011-12-25 11:32 ` Avi Kivity
2011-12-25 11:33 ` Avi Kivity
2011-12-27 9:45 ` Avi Kivity
2012-01-09 12:48 ` Alexander Graf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1324810715-28312-6-git-send-email-agraf@suse.de \
--to=agraf@suse.de \
--cc=avi@redhat.com \
--cc=kvm-ppc@vger.kernel.org \
--cc=kvm@vger.kernel.org \
--cc=mtosatti@redhat.com \
--cc=schwab@linux-m68k.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).