diff for duplicates of <55FBC81D.7050704@redhat.com> diff --git a/a/1.txt b/N1/1.txt index cbcaf7b..14951b8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -55,17 +55,17 @@ On 18/09/15 08:57, Paul Mackerras wrote: > +++ b/arch/powerpc/kvm/book3s_hv.c > @@ -2692,9 +2692,13 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) > -> while (vcpu->arch.state = KVMPPC_VCPU_RUNNABLE && -> (vc->vcore_state = VCORE_RUNNING || -> - vc->vcore_state = VCORE_EXITING)) -> + vc->vcore_state = VCORE_EXITING || -> + vc->vcore_state = VCORE_PIGGYBACK)) +> while (vcpu->arch.state == KVMPPC_VCPU_RUNNABLE && +> (vc->vcore_state == VCORE_RUNNING || +> - vc->vcore_state == VCORE_EXITING)) +> + vc->vcore_state == VCORE_EXITING || +> + vc->vcore_state == VCORE_PIGGYBACK)) > kvmppc_wait_for_exec(vc, vcpu, TASK_UNINTERRUPTIBLE); > -> + if (vc->vcore_state = VCORE_PREEMPT && vc->runner = NULL) +> + if (vc->vcore_state == VCORE_PREEMPT && vc->runner == NULL) > + kvmppc_vcore_end_preempt(vc); > + -> if (vcpu->arch.state = KVMPPC_VCPU_RUNNABLE) { +> if (vcpu->arch.state == KVMPPC_VCPU_RUNNABLE) { > kvmppc_remove_runnable(vc, vcpu); > vcpu->stat.signal_exits++; diff --git a/a/content_digest b/N1/content_digest index d5f75d2..a4636d9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020150918065723.GA2940@iris.ozlabs.ibm.com\0" "From\0Thomas Huth <thuth@redhat.com>\0" "Subject\0Re: [PATCH] KVM: PPC: Book3S HV: Fix handling of interrupted VCPUs\0" - "Date\0Fri, 18 Sep 2015 08:15:25 +0000\0" + "Date\0Fri, 18 Sep 2015 10:15:25 +0200\0" "To\0Paul Mackerras <paulus@ozlabs.org>" kvm@vger.kernel.org " kvm-ppc@vger.kernel.org\0" @@ -65,17 +65,17 @@ "> +++ b/arch/powerpc/kvm/book3s_hv.c\n" "> @@ -2692,9 +2692,13 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)\n" "> \n" - "> \twhile (vcpu->arch.state = KVMPPC_VCPU_RUNNABLE &&\n" - "> \t (vc->vcore_state = VCORE_RUNNING ||\n" - "> -\t\tvc->vcore_state = VCORE_EXITING))\n" - "> +\t\tvc->vcore_state = VCORE_EXITING ||\n" - "> +\t\tvc->vcore_state = VCORE_PIGGYBACK))\n" + "> \twhile (vcpu->arch.state == KVMPPC_VCPU_RUNNABLE &&\n" + "> \t (vc->vcore_state == VCORE_RUNNING ||\n" + "> -\t\tvc->vcore_state == VCORE_EXITING))\n" + "> +\t\tvc->vcore_state == VCORE_EXITING ||\n" + "> +\t\tvc->vcore_state == VCORE_PIGGYBACK))\n" "> \t\tkvmppc_wait_for_exec(vc, vcpu, TASK_UNINTERRUPTIBLE);\n" "> \n" - "> +\tif (vc->vcore_state = VCORE_PREEMPT && vc->runner = NULL)\n" + "> +\tif (vc->vcore_state == VCORE_PREEMPT && vc->runner == NULL)\n" "> +\t\tkvmppc_vcore_end_preempt(vc);\n" "> +\n" - "> \tif (vcpu->arch.state = KVMPPC_VCPU_RUNNABLE) {\n" + "> \tif (vcpu->arch.state == KVMPPC_VCPU_RUNNABLE) {\n" "> \t\tkvmppc_remove_runnable(vc, vcpu);\n" "> \t\tvcpu->stat.signal_exits++;\n" "\n" @@ -83,4 +83,4 @@ "\n" Tested-by: Thomas Huth <thuth@redhat.com> -5274354e1f12e416e68f85cd2efffdae9f98b8d8dae0a386f2ead24237dbb41e +24c14bfb921842221eb224c2e2b178a7ba54b36dbf67657da823f684f4f9f982
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.