diff for duplicates of <20170130101305.GA10890@in.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 1aa664a..23640e3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -133,7 +133,7 @@ index 018c684..cf79a98 100644 int thread_cpu; bool timer_running; wait_queue_head_t cpu_run; -+ struct machine_check_event mce_evt; /* Valid if trap = 0x200 */ ++ struct machine_check_event mce_evt; /* Valid if trap == 0x200 */ struct kvm_vcpu_arch_shared *shared; #if defined(CONFIG_PPC_BOOK3S_64) && defined(CONFIG_KVM_BOOK3S_PR_POSSIBLE) @@ -209,7 +209,7 @@ index 3686471..94b9f8b 100644 + /* Exit to guest with KVM_EXIT_NMI as exit reason */ + run->exit_reason = KVM_EXIT_NMI; + run->hw.hardware_exit_reason = vcpu->arch.trap; -+ if (vcpu->arch.mce_evt.disposition = MCE_DISPOSITION_RECOVERED) ++ if (vcpu->arch.mce_evt.disposition == MCE_DISPOSITION_RECOVERED) + run->flags |= KVM_RUN_PPC_NMI_RECOVERED; + else + run->flags &= ~KVM_RUN_PPC_NMI_RECOVERED; diff --git a/a/content_digest b/N1/content_digest index ba3da87..5d4f831 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,15 +5,15 @@ "ref\020170127031449.kecknhpwjzmnpvbo@oak.ozlabs.ibm.com\0" "From\0Mahesh J Salgaonkar <mahesh@linux.vnet.ibm.com>\0" "Subject\0Re: [PATCH v5 2/2] KVM: PPC: Exit guest upon MCE when FWNMI capability is enabled\0" - "Date\0Mon, 30 Jan 2017 10:25:05 +0000\0" + "Date\0Mon, 30 Jan 2017 15:43:05 +0530\0" "To\0Paul Mackerras <paulus@ozlabs.org>\0" "Cc\0kvm@vger.kernel.org" gleb@kernel.org agraf@suse.de kvm-ppc@vger.kernel.org linuxppc-dev@ozlabs.org - Aravinda Prasad <aravinda@linux.vnet.ibm.com> pbonzini@redhat.com + Aravinda Prasad <aravinda@linux.vnet.ibm.com> " david@gibson.dropbear.id.au\0" "\00:1\0" "b\0" @@ -152,7 +152,7 @@ " \tint thread_cpu;\n" " \tbool timer_running;\n" " \twait_queue_head_t cpu_run;\n" - "+\tstruct machine_check_event mce_evt; /* Valid if trap = 0x200 */\n" + "+\tstruct machine_check_event mce_evt; /* Valid if trap == 0x200 */\n" " \n" " \tstruct kvm_vcpu_arch_shared *shared;\n" " #if defined(CONFIG_PPC_BOOK3S_64) && defined(CONFIG_KVM_BOOK3S_PR_POSSIBLE)\n" @@ -228,7 +228,7 @@ "+\t\t/* Exit to guest with KVM_EXIT_NMI as exit reason */\n" "+\t\trun->exit_reason = KVM_EXIT_NMI;\n" "+\t\trun->hw.hardware_exit_reason = vcpu->arch.trap;\n" - "+\t\tif (vcpu->arch.mce_evt.disposition = MCE_DISPOSITION_RECOVERED)\n" + "+\t\tif (vcpu->arch.mce_evt.disposition == MCE_DISPOSITION_RECOVERED)\n" "+\t\t\trun->flags |= KVM_RUN_PPC_NMI_RECOVERED;\n" "+\t\telse\n" "+\t\t\trun->flags &= ~KVM_RUN_PPC_NMI_RECOVERED;\n" @@ -426,4 +426,4 @@ " \n" static int __init pnv_probe(void) -4a97038f66862a9a8593deacf62aee1cba8e2c6aa0ec7611c2b9f35c2c2e7369 +fbc450cda19daa91687adb81eab754b361473affcc228a6e8cfa1ec6233d5ae1
diff --git a/a/1.txt b/N2/1.txt index 1aa664a..23640e3 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -133,7 +133,7 @@ index 018c684..cf79a98 100644 int thread_cpu; bool timer_running; wait_queue_head_t cpu_run; -+ struct machine_check_event mce_evt; /* Valid if trap = 0x200 */ ++ struct machine_check_event mce_evt; /* Valid if trap == 0x200 */ struct kvm_vcpu_arch_shared *shared; #if defined(CONFIG_PPC_BOOK3S_64) && defined(CONFIG_KVM_BOOK3S_PR_POSSIBLE) @@ -209,7 +209,7 @@ index 3686471..94b9f8b 100644 + /* Exit to guest with KVM_EXIT_NMI as exit reason */ + run->exit_reason = KVM_EXIT_NMI; + run->hw.hardware_exit_reason = vcpu->arch.trap; -+ if (vcpu->arch.mce_evt.disposition = MCE_DISPOSITION_RECOVERED) ++ if (vcpu->arch.mce_evt.disposition == MCE_DISPOSITION_RECOVERED) + run->flags |= KVM_RUN_PPC_NMI_RECOVERED; + else + run->flags &= ~KVM_RUN_PPC_NMI_RECOVERED; diff --git a/a/content_digest b/N2/content_digest index ba3da87..95979b1 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,7 +5,7 @@ "ref\020170127031449.kecknhpwjzmnpvbo@oak.ozlabs.ibm.com\0" "From\0Mahesh J Salgaonkar <mahesh@linux.vnet.ibm.com>\0" "Subject\0Re: [PATCH v5 2/2] KVM: PPC: Exit guest upon MCE when FWNMI capability is enabled\0" - "Date\0Mon, 30 Jan 2017 10:25:05 +0000\0" + "Date\0Mon, 30 Jan 2017 15:43:05 +0530\0" "To\0Paul Mackerras <paulus@ozlabs.org>\0" "Cc\0kvm@vger.kernel.org" gleb@kernel.org @@ -152,7 +152,7 @@ " \tint thread_cpu;\n" " \tbool timer_running;\n" " \twait_queue_head_t cpu_run;\n" - "+\tstruct machine_check_event mce_evt; /* Valid if trap = 0x200 */\n" + "+\tstruct machine_check_event mce_evt; /* Valid if trap == 0x200 */\n" " \n" " \tstruct kvm_vcpu_arch_shared *shared;\n" " #if defined(CONFIG_PPC_BOOK3S_64) && defined(CONFIG_KVM_BOOK3S_PR_POSSIBLE)\n" @@ -228,7 +228,7 @@ "+\t\t/* Exit to guest with KVM_EXIT_NMI as exit reason */\n" "+\t\trun->exit_reason = KVM_EXIT_NMI;\n" "+\t\trun->hw.hardware_exit_reason = vcpu->arch.trap;\n" - "+\t\tif (vcpu->arch.mce_evt.disposition = MCE_DISPOSITION_RECOVERED)\n" + "+\t\tif (vcpu->arch.mce_evt.disposition == MCE_DISPOSITION_RECOVERED)\n" "+\t\t\trun->flags |= KVM_RUN_PPC_NMI_RECOVERED;\n" "+\t\telse\n" "+\t\t\trun->flags &= ~KVM_RUN_PPC_NMI_RECOVERED;\n" @@ -426,4 +426,4 @@ " \n" static int __init pnv_probe(void) -4a97038f66862a9a8593deacf62aee1cba8e2c6aa0ec7611c2b9f35c2c2e7369 +39fb4912f620751440f77ab16b04ce740eb50e0976eea676a7642afef3ce95d9
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.