diff options
| author | Paul Mackerras <paulus@samba.org> | 2015-03-27 23:21:06 -0400 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2015-04-21 09:21:32 -0400 |
| commit | 5d5b99cd6818bdbea287d23ef055bba1a8a9e648 (patch) | |
| tree | 1696dcf7ad7f1e566611093e18a387711c80aab7 /arch/powerpc/kernel | |
| parent | 25fedfca94cfbf2461314c6c34ef58e74a31b025 (diff) | |
KVM: PPC: Book3S HV: Get rid of vcore nap_count and n_woken
We can tell when a secondary thread has finished running a guest by
the fact that it clears its kvm_hstate.kvm_vcpu pointer, so there
is no real need for the nap_count field in the kvmppc_vcore struct.
This changes kvmppc_wait_for_nap to poll the kvm_hstate.kvm_vcpu
pointers of the secondary threads rather than polling vc->nap_count.
Besides reducing the size of the kvmppc_vcore struct by 8 bytes,
this also means that we can tell which secondary threads have got
stuck and thus print a more informative error message.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/asm-offsets.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c index 92ec3fcb3415..8aa824681d76 100644 --- a/arch/powerpc/kernel/asm-offsets.c +++ b/arch/powerpc/kernel/asm-offsets.c | |||
| @@ -563,7 +563,6 @@ int main(void) | |||
| 563 | DEFINE(VCPU_WORT, offsetof(struct kvm_vcpu, arch.wort)); | 563 | DEFINE(VCPU_WORT, offsetof(struct kvm_vcpu, arch.wort)); |
| 564 | DEFINE(VCPU_SHADOW_SRR1, offsetof(struct kvm_vcpu, arch.shadow_srr1)); | 564 | DEFINE(VCPU_SHADOW_SRR1, offsetof(struct kvm_vcpu, arch.shadow_srr1)); |
| 565 | DEFINE(VCORE_ENTRY_EXIT, offsetof(struct kvmppc_vcore, entry_exit_count)); | 565 | DEFINE(VCORE_ENTRY_EXIT, offsetof(struct kvmppc_vcore, entry_exit_count)); |
| 566 | DEFINE(VCORE_NAP_COUNT, offsetof(struct kvmppc_vcore, nap_count)); | ||
| 567 | DEFINE(VCORE_IN_GUEST, offsetof(struct kvmppc_vcore, in_guest)); | 566 | DEFINE(VCORE_IN_GUEST, offsetof(struct kvmppc_vcore, in_guest)); |
| 568 | DEFINE(VCORE_NAPPING_THREADS, offsetof(struct kvmppc_vcore, napping_threads)); | 567 | DEFINE(VCORE_NAPPING_THREADS, offsetof(struct kvmppc_vcore, napping_threads)); |
| 569 | DEFINE(VCORE_KVM, offsetof(struct kvmppc_vcore, kvm)); | 568 | DEFINE(VCORE_KVM, offsetof(struct kvmppc_vcore, kvm)); |
