From: Alexander Graf <agraf@suse.de>
To: kvm-ppc@vger.kernel.org
Cc: kvm@vger.kernel.org, Paul Mackerras <paulus@samba.org>
Subject: [PATCH 48/56] KVM: PPC: Book 3S: Fix compilation for !HV configs
Date: Thu, 15 Mar 2012 12:11:17 +0000 [thread overview]
Message-ID: <1331813485-14722-49-git-send-email-agraf@suse.de> (raw)
In-Reply-To: <1331813485-14722-1-git-send-email-agraf@suse.de>
From: Paul Mackerras <paulus@samba.org>
Commits 2f5cdd5487 ("KVM: PPC: Book3S HV: Make secondary threads more
robust against stray IPIs") and 1c2066b0f7 ("KVM: PPC: Book3S HV: Make
virtual processor area registration more robust") added fields to
struct kvm_vcpu_arch inside #ifdef CONFIG_KVM_BOOK3S_64_HV regions,
and added lines to arch/powerpc/kernel/asm-offsets.c to generate
assembler constants for their offsets. Unfortunately this led to
compile errors on Book 3S machines for configs that had KVM enabled
but not CONFIG_KVM_BOOK3S_64_HV. This fixes the problem by moving
the offending lines inside #ifdef CONFIG_KVM_BOOK3S_64_HV regions.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
---
arch/powerpc/kernel/asm-offsets.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index 8c8b2ce..86d43cc 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -464,6 +464,7 @@ int main(void)
DEFINE(KVM_VRMA_SLB_V, offsetof(struct kvm, arch.vrma_slb_v));
DEFINE(VCPU_DSISR, offsetof(struct kvm_vcpu, arch.shregs.dsisr));
DEFINE(VCPU_DAR, offsetof(struct kvm_vcpu, arch.shregs.dar));
+ DEFINE(VCPU_VPA, offsetof(struct kvm_vcpu, arch.vpa.pinned_addr));
#endif
#ifdef CONFIG_PPC_BOOK3S
DEFINE(VCPU_VCPUID, offsetof(struct kvm_vcpu, vcpu_id));
@@ -480,7 +481,6 @@ int main(void)
DEFINE(VCPU_PENDING_EXC, offsetof(struct kvm_vcpu, arch.pending_exceptions));
DEFINE(VCPU_CEDED, offsetof(struct kvm_vcpu, arch.ceded));
DEFINE(VCPU_PRODDED, offsetof(struct kvm_vcpu, arch.prodded));
- DEFINE(VCPU_VPA, offsetof(struct kvm_vcpu, arch.vpa.pinned_addr));
DEFINE(VCPU_MMCR, offsetof(struct kvm_vcpu, arch.mmcr));
DEFINE(VCPU_PMC, offsetof(struct kvm_vcpu, arch.pmc));
DEFINE(VCPU_SLB, offsetof(struct kvm_vcpu, arch.slb));
@@ -554,10 +554,10 @@ int main(void)
HSTATE_FIELD(HSTATE_IN_GUEST, in_guest);
HSTATE_FIELD(HSTATE_RESTORE_HID5, restore_hid5);
HSTATE_FIELD(HSTATE_NAPPING, napping);
- HSTATE_FIELD(HSTATE_HWTHREAD_REQ, hwthread_req);
- HSTATE_FIELD(HSTATE_HWTHREAD_STATE, hwthread_state);
#ifdef CONFIG_KVM_BOOK3S_64_HV
+ HSTATE_FIELD(HSTATE_HWTHREAD_REQ, hwthread_req);
+ HSTATE_FIELD(HSTATE_HWTHREAD_STATE, hwthread_state);
HSTATE_FIELD(HSTATE_KVM_VCPU, kvm_vcpu);
HSTATE_FIELD(HSTATE_KVM_VCORE, kvm_vcore);
HSTATE_FIELD(HSTATE_XICS_PHYS, xics_phys);
--
1.6.0.2
next prev parent reply other threads:[~2012-03-15 12:11 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-15 12:10 [PULL 00/56] ppc patch queue 2012-03-15 Alexander Graf
2012-03-15 12:10 ` [PATCH 01/56] KVM: PPC: Book3s_32: Fix compile error Alexander Graf
2012-03-15 12:10 ` [PATCH 02/56] powerpc/booke: Set CPU_FTR_DEBUG_LVL_EXC on 32-bit Alexander Graf
2012-03-15 12:10 ` [PATCH 03/56] powerpc/e500: split CPU_FTRS_ALWAYS/CPU_FTRS_POSSIBLE Alexander Graf
2012-03-15 12:10 ` [PATCH 04/56] KVM: PPC: factor out lpid allocator from book3s_64_mmu_hv Alexander Graf
2012-03-15 12:10 ` [PATCH 05/56] KVM: PPC: booke: add booke-level vcpu load/put Alexander Graf
2012-03-15 12:10 ` [PATCH 06/56] KVM: PPC: booke: Move vm core init/destroy out of booke.c Alexander Graf
2012-03-15 12:10 ` [PATCH 07/56] KVM: PPC: e500: rename e500_tlb.h to e500.h Alexander Graf
2012-03-15 12:10 ` [PATCH 08/56] KVM: PPC: e500: merge <asm/kvm_e500.h> into arch/powerpc/kvm/e500.h Alexander Graf
2012-03-15 12:10 ` [PATCH 09/56] KVM: PPC: e500: clean up arch/powerpc/kvm/e500.h Alexander Graf
2012-03-15 12:10 ` [PATCH 10/56] KVM: PPC: e500: refactor core-specific TLB code Alexander Graf
2012-03-15 12:10 ` [PATCH 11/56] KVM: PPC: e500: Track TLB1 entries with a bitmap Alexander Graf
2012-03-15 12:10 ` [PATCH 12/56] KVM: PPC: e500: emulate tlbilx Alexander Graf
2012-03-15 12:10 ` [PATCH 13/56] powerpc/booke: Provide exception macros with interrupt name Alexander Graf
2012-03-15 12:10 ` [PATCH 14/56] KVM: PPC: booke: category E.HV (GS-mode) support Alexander Graf
2012-03-15 12:10 ` [PATCH 15/56] KVM: PPC: booke: standard PPC floating point support Alexander Graf
2012-03-15 12:10 ` [PATCH 16/56] KVM: PPC: e500mc support Alexander Graf
2012-03-15 12:10 ` [PATCH 17/56] KVM: PPC: e500mc: Add doorbell emulation support Alexander Graf
2012-03-15 12:10 ` [PATCH 18/56] KVM: PPC: e500mc: implicitly set MSR_GS Alexander Graf
2012-03-15 12:10 ` [PATCH 19/56] KVM: PPC: e500mc: Move r1/r2 restoration very early Alexander Graf
2012-03-15 12:10 ` [PATCH 20/56] KVM: PPC: e500mc: add load inst fixup Alexander Graf
2012-03-15 12:10 ` [PATCH 21/56] KVM: PPC: rename CONFIG_KVM_E500 -> CONFIG_KVM_E500V2 Alexander Graf
2012-03-15 12:10 ` [PATCH 22/56] KVM: PPC: make e500v2 kvm and e500mc cpu mutually exclusive Alexander Graf
2012-03-15 12:10 ` [PATCH 23/56] KVM: PPC: booke: remove leftover debugging Alexander Graf
2012-03-15 12:10 ` [PATCH 24/56] KVM: PPC: booke: deliver program int on emulation failure Alexander Graf
2012-03-15 12:10 ` [PATCH 25/56] KVM: PPC: booke: rework rescheduling checks Alexander Graf
2012-03-15 12:10 ` [PATCH 26/56] KVM: PPC: booke: BOOKE_IRQPRIO_MAX is n+1 Alexander Graf
2012-03-15 12:10 ` [PATCH 27/56] KVM: PPC: bookehv: fix exit timing Alexander Graf
2012-03-15 12:10 ` [PATCH 28/56] KVM: PPC: bookehv: remove negation for CONFIG_64BIT Alexander Graf
2012-03-15 12:10 ` [PATCH 29/56] KVM: PPC: bookehv: remove SET_VCPU Alexander Graf
2012-03-15 12:10 ` [PATCH 30/56] KVM: PPC: bookehv: disable MAS register updates early Alexander Graf
2012-03-15 12:11 ` [PATCH 31/56] KVM: PPC: bookehv: add comment about shadow_msr Alexander Graf
2012-03-15 12:11 ` [PATCH 32/56] KVM: PPC: booke: Readd debug abort code for machine check Alexander Graf
2012-03-15 12:11 ` [PATCH 33/56] KVM: PPC: booke: add GS documentation for program interrupt Alexander Graf
2012-03-15 12:11 ` [PATCH 34/56] KVM: PPC: bookehv: remove unused code Alexander Graf
2012-03-15 12:11 ` [PATCH 35/56] KVM: PPC: e500: fix typo in tlb code Alexander Graf
2012-03-15 12:11 ` [PATCH 36/56] KVM: PPC: booke: Support perfmon interrupts Alexander Graf
2012-03-15 12:11 ` [PATCH 37/56] KVM: PPC: booke: expose good state on irq reinject Alexander Graf
2012-03-15 12:11 ` [PATCH 38/56] KVM: PPC: booke: Reinject performance monitor interrupts Alexander Graf
2012-03-15 12:11 ` [PATCH 39/56] KVM: PPC: Booke: only prepare to enter when we enter Alexander Graf
2012-03-15 12:11 ` [PATCH 40/56] KVM: PPC: Book3s: PR: Add SPAPR H_BULK_REMOVE support Alexander Graf
2012-03-15 12:11 ` [PATCH 41/56] KVM: PPC: Book3S HV: Fix kvm_alloc_linear in case where no linears exist Alexander Graf
2012-03-15 12:11 ` [PATCH 42/56] KVM: PPC: Book3S HV: Save and restore CR in __kvmppc_vcore_entry Alexander Graf
2012-03-15 12:11 ` [PATCH 43/56] KVM: PPC: Save/Restore CR over vcpu_run Alexander Graf
2012-03-15 12:11 ` [PATCH 44/56] KVM: PPC: Book3S HV: Make secondary threads more robust against stray IPIs Alexander Graf
2012-03-15 12:11 ` [PATCH 45/56] KVM: PPC: Book3S HV: Make virtual processor area registration more robust Alexander Graf
2012-03-15 12:11 ` [PATCH 46/56] KVM: PPC: Book3S HV: Report stolen time to guest through dispatch trace log Alexander Graf
2012-03-15 12:11 ` [PATCH 47/56] Restore guest CR after exit timing calculation Alexander Graf
2012-03-15 12:11 ` Alexander Graf [this message]
2012-03-15 12:11 ` [PATCH 49/56] KVM: PPC: Work around POWER7 DABR corruption problem Alexander Graf
2012-03-15 12:11 ` [PATCH 50/56] KVM: PPC: Pass EA to updating emulation ops Alexander Graf
2012-03-15 12:11 ` [PATCH 51/56] KVM: PPC: Book3S: Compile fix for ppc32 in HIOR Alexander Graf
2012-03-15 12:11 ` [PATCH 52/56] KVM: PPC: Emulate tw and td instructions Alexander Graf
2012-03-15 12:11 ` [PATCH 53/56] KVM: PPC: Book3s: PR: Add HV traps so we can run in HV=1 mode on p7 Alexander Graf
2012-03-15 12:11 ` [PATCH 54/56] KVM: PPC: Book3S: PR: Fix preemption Alexander Graf
2012-03-15 12:11 ` [PATCH 55/56] KVM: PPC: Ignore unhalt request from kvm_vcpu_block Alexander Graf
2012-03-15 12:11 ` [PATCH 56/56] powerpc/kvm: Fix magic page vs. 32-bit RTAS on ppc64 Alexander Graf
2012-03-20 14:47 ` [PULL 00/56] ppc patch queue 2012-03-15 Avi Kivity
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=1331813485-14722-49-git-send-email-agraf@suse.de \
--to=agraf@suse.de \
--cc=kvm-ppc@vger.kernel.org \
--cc=kvm@vger.kernel.org \
--cc=paulus@samba.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