diff for duplicates of <20120927060559.GB15856@drongo> diff --git a/a/1.txt b/N1/1.txt index 0355323..da3254c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -109,14 +109,14 @@ index 61d2934..8b3c470 100644 { struct kvmppc_vcore *vc = vcpu->arch.vcore; -- if (vc->runner = vcpu && vc->vcore_state != VCORE_INACTIVE) +- if (vc->runner == vcpu && vc->vcore_state != VCORE_INACTIVE) + spin_lock(&vcpu->arch.tbacct_lock); -+ if (vc->runner = vcpu && vc->vcore_state != VCORE_INACTIVE && ++ if (vc->runner == vcpu && vc->vcore_state != VCORE_INACTIVE && + vc->preempt_tb != TB_NIL) { vc->stolen_tb += mftb() - vc->preempt_tb; + vc->preempt_tb = TB_NIL; + } -+ if (vcpu->arch.state = KVMPPC_VCPU_BUSY_IN_HOST && ++ if (vcpu->arch.state == KVMPPC_VCPU_BUSY_IN_HOST && + vcpu->arch.busy_preempt != TB_NIL) { + vcpu->arch.busy_stolen += mftb() - vcpu->arch.busy_preempt; + vcpu->arch.busy_preempt = TB_NIL; @@ -129,9 +129,9 @@ index 61d2934..8b3c470 100644 struct kvmppc_vcore *vc = vcpu->arch.vcore; + spin_lock(&vcpu->arch.tbacct_lock); - if (vc->runner = vcpu && vc->vcore_state != VCORE_INACTIVE) + if (vc->runner == vcpu && vc->vcore_state != VCORE_INACTIVE) vc->preempt_tb = mftb(); -+ if (vcpu->arch.state = KVMPPC_VCPU_BUSY_IN_HOST) ++ if (vcpu->arch.state == KVMPPC_VCPU_BUSY_IN_HOST) + vcpu->arch.busy_preempt = mftb(); + spin_unlock(&vcpu->arch.tbacct_lock); } @@ -297,7 +297,7 @@ index 61d2934..8b3c470 100644 do { r = kvmppc_run_vcpu(run, vcpu); @@ -1312,6 +1408,7 @@ int kvmppc_vcpu_run(struct kvm_run *run, struct kvm_vcpu *vcpu) - } while (r = RESUME_GUEST); + } while (r == RESUME_GUEST); out: + vcpu->arch.state = KVMPPC_VCPU_NOTREADY; diff --git a/a/content_digest b/N1/content_digest index 44ac360..acc1584 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020120921053853.GJ15685@drongo\0" "From\0Paul Mackerras <paulus@samba.org>\0" "Subject\0[PATCH v2 09/10] KVM: PPC: Book3S HV: Fix accounting of stolen time\0" - "Date\0Thu, 27 Sep 2012 06:05:59 +0000\0" + "Date\0Thu, 27 Sep 2012 16:05:59 +1000\0" "To\0Alexander Graf <agraf@suse.de>\0" "Cc\0kvm@vger.kernel.org" " kvm-ppc@vger.kernel.org\0" @@ -119,14 +119,14 @@ " {\n" " \tstruct kvmppc_vcore *vc = vcpu->arch.vcore;\n" " \n" - "-\tif (vc->runner = vcpu && vc->vcore_state != VCORE_INACTIVE)\n" + "-\tif (vc->runner == vcpu && vc->vcore_state != VCORE_INACTIVE)\n" "+\tspin_lock(&vcpu->arch.tbacct_lock);\n" - "+\tif (vc->runner = vcpu && vc->vcore_state != VCORE_INACTIVE &&\n" + "+\tif (vc->runner == vcpu && vc->vcore_state != VCORE_INACTIVE &&\n" "+\t vc->preempt_tb != TB_NIL) {\n" " \t\tvc->stolen_tb += mftb() - vc->preempt_tb;\n" "+\t\tvc->preempt_tb = TB_NIL;\n" "+\t}\n" - "+\tif (vcpu->arch.state = KVMPPC_VCPU_BUSY_IN_HOST &&\n" + "+\tif (vcpu->arch.state == KVMPPC_VCPU_BUSY_IN_HOST &&\n" "+\t vcpu->arch.busy_preempt != TB_NIL) {\n" "+\t\tvcpu->arch.busy_stolen += mftb() - vcpu->arch.busy_preempt;\n" "+\t\tvcpu->arch.busy_preempt = TB_NIL;\n" @@ -139,9 +139,9 @@ " \tstruct kvmppc_vcore *vc = vcpu->arch.vcore;\n" " \n" "+\tspin_lock(&vcpu->arch.tbacct_lock);\n" - " \tif (vc->runner = vcpu && vc->vcore_state != VCORE_INACTIVE)\n" + " \tif (vc->runner == vcpu && vc->vcore_state != VCORE_INACTIVE)\n" " \t\tvc->preempt_tb = mftb();\n" - "+\tif (vcpu->arch.state = KVMPPC_VCPU_BUSY_IN_HOST)\n" + "+\tif (vcpu->arch.state == KVMPPC_VCPU_BUSY_IN_HOST)\n" "+\t\tvcpu->arch.busy_preempt = mftb();\n" "+\tspin_unlock(&vcpu->arch.tbacct_lock);\n" " }\n" @@ -307,7 +307,7 @@ " \tdo {\n" " \t\tr = kvmppc_run_vcpu(run, vcpu);\n" "@@ -1312,6 +1408,7 @@ int kvmppc_vcpu_run(struct kvm_run *run, struct kvm_vcpu *vcpu)\n" - " \t} while (r = RESUME_GUEST);\n" + " \t} while (r == RESUME_GUEST);\n" " \n" " out:\n" "+\tvcpu->arch.state = KVMPPC_VCPU_NOTREADY;\n" @@ -317,4 +317,4 @@ "-- \n" 1.7.10.4 -5f2a1848097bac070a35a953b4240c33913f95d199e6f386d840f9d077975bbe +0b8c7dfb9c52ae91e1455c6fba334aaf4b4f7409f81f8ffacde5afb59e502ec7
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.