diff for duplicates of <20120921053853.GJ15685@drongo> diff --git a/a/1.txt b/N1/1.txt index 1c6db98..05d4cdb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -107,14 +107,14 @@ index dc34a69..f953f73 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; @@ -127,9 +127,9 @@ index dc34a69..f953f73 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); } @@ -295,7 +295,7 @@ index dc34a69..f953f73 100644 do { r = kvmppc_run_vcpu(run, vcpu); @@ -1205,6 +1301,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 fc07f1a..ff3ecf6 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 09/10] KVM: PPC: Book3S HV: Fix accounting of stolen time\0" - "Date\0Fri, 21 Sep 2012 05:38:53 +0000\0" + "Date\0Fri, 21 Sep 2012 15:38:53 +1000\0" "To\0Alexander Graf <agraf@suse.de>\0" "Cc\0kvm@vger.kernel.org" " kvm-ppc@vger.kernel.org\0" @@ -116,14 +116,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" @@ -136,9 +136,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" @@ -304,7 +304,7 @@ " \tdo {\n" " \t\tr = kvmppc_run_vcpu(run, vcpu);\n" "@@ -1205,6 +1301,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" @@ -314,4 +314,4 @@ "-- \n" 1.7.10 -dc1650c4a205e2b3db235bf05b46ad7dbf34aa3d96842c82597bddd2e67ed3a1 +84b51ea73584bd1507ae6d658a5d812f6844f637fe83643006d7c6f70e0862a0
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.