diff for duplicates of <20120921053825.GI15685@drongo> diff --git a/a/1.txt b/N1/1.txt index 489b2f2..fc790db 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -81,22 +81,22 @@ index 8e84625..dc34a69 100644 * If the vcore is already running, we may be able to start * this thread straight away and have it join in. */ -- if (prev_state = KVMPPC_VCPU_STOPPED) { +- if (prev_state == KVMPPC_VCPU_STOPPED) { + if (!signal_pending(current)) { - if (vc->vcore_state = VCORE_RUNNING && - VCORE_EXIT_COUNT(vc) = 0) { + if (vc->vcore_state == VCORE_RUNNING && + VCORE_EXIT_COUNT(vc) == 0) { vcpu->arch.ptid = vc->n_runnable - 1; kvmppc_create_dtl_entry(vcpu, vc); kvmppc_start_thread(vcpu); -+ } else if (vc->vcore_state = VCORE_SLEEPING) { ++ } else if (vc->vcore_state == VCORE_SLEEPING) { + wake_up(&vc->wq); } -- } else if (prev_state = KVMPPC_VCPU_BUSY_IN_HOST) +- } else if (prev_state == KVMPPC_VCPU_BUSY_IN_HOST) - --vc->n_busy; + } - while (vcpu->arch.state = KVMPPC_VCPU_RUNNABLE && + while (vcpu->arch.state == KVMPPC_VCPU_RUNNABLE && !signal_pending(current)) { - if (vc->n_busy || vc->vcore_state != VCORE_INACTIVE) { + if (vc->vcore_state != VCORE_INACTIVE) { @@ -110,7 +110,7 @@ index 8e84625..dc34a69 100644 - list_for_each_entry(v, &vc->runnable_threads, arch.run_list) - if (!v->arch.pending_exceptions) - n_ceded += v->arch.ceded; -- if (n_ceded = vc->n_runnable) +- if (n_ceded == vc->n_runnable) - kvmppc_vcore_blocked(vc); - else - kvmppc_run_core(vc); @@ -129,7 +129,7 @@ index 8e84625..dc34a69 100644 + list_for_each_entry(v, &vc->runnable_threads, arch.run_list) + if (!v->arch.pending_exceptions) + n_ceded += v->arch.ceded; -+ if (n_ceded = vc->n_runnable) ++ if (n_ceded == vc->n_runnable) + kvmppc_vcore_blocked(vc); + else + kvmppc_run_core(vc); @@ -137,35 +137,35 @@ index 8e84625..dc34a69 100644 } - if (signal_pending(current)) { -- while (vcpu->arch.state = KVMPPC_VCPU_RUNNABLE && -- (vc->vcore_state = VCORE_RUNNING || -- vc->vcore_state = VCORE_EXITING)) { +- while (vcpu->arch.state == KVMPPC_VCPU_RUNNABLE && +- (vc->vcore_state == VCORE_RUNNING || +- vc->vcore_state == VCORE_EXITING)) { - spin_unlock(&vc->lock); - kvmppc_wait_for_exec(vcpu, TASK_UNINTERRUPTIBLE); - spin_lock(&vc->lock); - } -- if (vcpu->arch.state = KVMPPC_VCPU_RUNNABLE) { +- if (vcpu->arch.state == KVMPPC_VCPU_RUNNABLE) { - kvmppc_remove_runnable(vc, vcpu); - vcpu->stat.signal_exits++; - kvm_run->exit_reason = KVM_EXIT_INTR; - vcpu->arch.ret = -EINTR; - } -+ while (vcpu->arch.state = KVMPPC_VCPU_RUNNABLE && -+ (vc->vcore_state = VCORE_RUNNING || -+ vc->vcore_state = VCORE_EXITING)) { ++ while (vcpu->arch.state == KVMPPC_VCPU_RUNNABLE && ++ (vc->vcore_state == VCORE_RUNNING || ++ vc->vcore_state == VCORE_EXITING)) { + spin_unlock(&vc->lock); + kvmppc_wait_for_exec(vcpu, TASK_UNINTERRUPTIBLE); + spin_lock(&vc->lock); + } + -+ if (vcpu->arch.state = KVMPPC_VCPU_RUNNABLE) { ++ if (vcpu->arch.state == KVMPPC_VCPU_RUNNABLE) { + kvmppc_remove_runnable(vc, vcpu); + vcpu->stat.signal_exits++; + kvm_run->exit_reason = KVM_EXIT_INTR; + vcpu->arch.ret = -EINTR; + } + -+ if (vc->n_runnable && vc->vcore_state = VCORE_INACTIVE) { ++ if (vc->n_runnable && vc->vcore_state == VCORE_INACTIVE) { + /* Wake up some vcpu to run the core */ + v = list_first_entry(&vc->runnable_threads, + struct kvm_vcpu, arch.run_list); diff --git a/a/content_digest b/N1/content_digest index 3cda525..e740d87 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020120921051606.GA15685@drongo\0" "From\0Paul Mackerras <paulus@samba.org>\0" "Subject\0[PATCH 08/10] KVM: PPC: Book3S HV: Run virtual core whenever any vcpus in it can run\0" - "Date\0Fri, 21 Sep 2012 05:38:25 +0000\0" + "Date\0Fri, 21 Sep 2012 15:38:25 +1000\0" "To\0Alexander Graf <agraf@suse.de>\0" "Cc\0kvm@vger.kernel.org" " kvm-ppc@vger.kernel.org\0" @@ -90,22 +90,22 @@ " \t * If the vcore is already running, we may be able to start\n" " \t * this thread straight away and have it join in.\n" " \t */\n" - "-\tif (prev_state = KVMPPC_VCPU_STOPPED) {\n" + "-\tif (prev_state == KVMPPC_VCPU_STOPPED) {\n" "+\tif (!signal_pending(current)) {\n" - " \t\tif (vc->vcore_state = VCORE_RUNNING &&\n" - " \t\t VCORE_EXIT_COUNT(vc) = 0) {\n" + " \t\tif (vc->vcore_state == VCORE_RUNNING &&\n" + " \t\t VCORE_EXIT_COUNT(vc) == 0) {\n" " \t\t\tvcpu->arch.ptid = vc->n_runnable - 1;\n" " \t\t\tkvmppc_create_dtl_entry(vcpu, vc);\n" " \t\t\tkvmppc_start_thread(vcpu);\n" - "+\t\t} else if (vc->vcore_state = VCORE_SLEEPING) {\n" + "+\t\t} else if (vc->vcore_state == VCORE_SLEEPING) {\n" "+\t\t\twake_up(&vc->wq);\n" " \t\t}\n" " \n" - "-\t} else if (prev_state = KVMPPC_VCPU_BUSY_IN_HOST)\n" + "-\t} else if (prev_state == KVMPPC_VCPU_BUSY_IN_HOST)\n" "-\t\t--vc->n_busy;\n" "+\t}\n" " \n" - " \twhile (vcpu->arch.state = KVMPPC_VCPU_RUNNABLE &&\n" + " \twhile (vcpu->arch.state == KVMPPC_VCPU_RUNNABLE &&\n" " \t !signal_pending(current)) {\n" "-\t\tif (vc->n_busy || vc->vcore_state != VCORE_INACTIVE) {\n" "+\t\tif (vc->vcore_state != VCORE_INACTIVE) {\n" @@ -119,7 +119,7 @@ "-\t\tlist_for_each_entry(v, &vc->runnable_threads, arch.run_list)\n" "-\t\t\tif (!v->arch.pending_exceptions)\n" "-\t\t\t\tn_ceded += v->arch.ceded;\n" - "-\t\tif (n_ceded = vc->n_runnable)\n" + "-\t\tif (n_ceded == vc->n_runnable)\n" "-\t\t\tkvmppc_vcore_blocked(vc);\n" "-\t\telse\n" "-\t\t\tkvmppc_run_core(vc);\n" @@ -138,7 +138,7 @@ "+\t\tlist_for_each_entry(v, &vc->runnable_threads, arch.run_list)\n" "+\t\t\tif (!v->arch.pending_exceptions)\n" "+\t\t\t\tn_ceded += v->arch.ceded;\n" - "+\t\tif (n_ceded = vc->n_runnable)\n" + "+\t\tif (n_ceded == vc->n_runnable)\n" "+\t\t\tkvmppc_vcore_blocked(vc);\n" "+\t\telse\n" "+\t\t\tkvmppc_run_core(vc);\n" @@ -146,35 +146,35 @@ " \t}\n" " \n" "-\tif (signal_pending(current)) {\n" - "-\t\twhile (vcpu->arch.state = KVMPPC_VCPU_RUNNABLE &&\n" - "-\t\t (vc->vcore_state = VCORE_RUNNING ||\n" - "-\t\t\tvc->vcore_state = VCORE_EXITING)) {\n" + "-\t\twhile (vcpu->arch.state == KVMPPC_VCPU_RUNNABLE &&\n" + "-\t\t (vc->vcore_state == VCORE_RUNNING ||\n" + "-\t\t\tvc->vcore_state == VCORE_EXITING)) {\n" "-\t\t\tspin_unlock(&vc->lock);\n" "-\t\t\tkvmppc_wait_for_exec(vcpu, TASK_UNINTERRUPTIBLE);\n" "-\t\t\tspin_lock(&vc->lock);\n" "-\t\t}\n" - "-\t\tif (vcpu->arch.state = KVMPPC_VCPU_RUNNABLE) {\n" + "-\t\tif (vcpu->arch.state == KVMPPC_VCPU_RUNNABLE) {\n" "-\t\t\tkvmppc_remove_runnable(vc, vcpu);\n" "-\t\t\tvcpu->stat.signal_exits++;\n" "-\t\t\tkvm_run->exit_reason = KVM_EXIT_INTR;\n" "-\t\t\tvcpu->arch.ret = -EINTR;\n" "-\t\t}\n" - "+\twhile (vcpu->arch.state = KVMPPC_VCPU_RUNNABLE &&\n" - "+\t (vc->vcore_state = VCORE_RUNNING ||\n" - "+\t\tvc->vcore_state = VCORE_EXITING)) {\n" + "+\twhile (vcpu->arch.state == KVMPPC_VCPU_RUNNABLE &&\n" + "+\t (vc->vcore_state == VCORE_RUNNING ||\n" + "+\t\tvc->vcore_state == VCORE_EXITING)) {\n" "+\t\tspin_unlock(&vc->lock);\n" "+\t\tkvmppc_wait_for_exec(vcpu, TASK_UNINTERRUPTIBLE);\n" "+\t\tspin_lock(&vc->lock);\n" "+\t}\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" "+\t\tkvm_run->exit_reason = KVM_EXIT_INTR;\n" "+\t\tvcpu->arch.ret = -EINTR;\n" "+\t}\n" "+\n" - "+\tif (vc->n_runnable && vc->vcore_state = VCORE_INACTIVE) {\n" + "+\tif (vc->n_runnable && vc->vcore_state == VCORE_INACTIVE) {\n" "+\t\t/* Wake up some vcpu to run the core */\n" "+\t\tv = list_first_entry(&vc->runnable_threads,\n" "+\t\t\t\t struct kvm_vcpu, arch.run_list);\n" @@ -185,4 +185,4 @@ "-- \n" 1.7.10 -0bdcd25722b50cdc180b4b8c9bada2b887937d2606a57f300d5b4ba3c82f5c84 +869fe6b2171f3453aa6d86d92571ce85856dca94eafc61f293dcb9c72c57f953
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.