diff for duplicates of <52F09EC0.60201@ozlabs.ru> diff --git a/a/1.txt b/N1/1.txt index 0c01172..48c2fe1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -29,8 +29,8 @@ On 01/13/2014 02:44 AM, Alexander Graf wrote: >> vcpu->arch.fault_dar, vcpu->arch.fault_dsisr); >> srcu_read_unlock(&vcpu->kvm->srcu, srcu_idx); >> } ->> - } while (r = RESUME_GUEST); ->> + } while ((r = RESUME_GUEST_NV) || (r = RESUME_GUEST)); +>> - } while (r == RESUME_GUEST); +>> + } while ((r == RESUME_GUEST_NV) || (r == RESUME_GUEST)); > > How about > diff --git a/a/content_digest b/N1/content_digest index 5bf589d..2302ad4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,12 +2,12 @@ "ref\0AF6669B4-EF1A-44BD-9034-8824EFD94B5B@suse.de\0" "From\0Alexey Kardashevskiy <aik@ozlabs.ru>\0" "Subject\0Re: [PATCH] PPC: KVM: fix VCPU run for HV KVM\0" - "Date\0Tue, 04 Feb 2014 08:03:12 +0000\0" + "Date\0Tue, 04 Feb 2014 19:03:12 +1100\0" "To\0Alexander Graf <agraf@suse.de>\0" - "Cc\0linuxppc-dev@lists.ozlabs.org" - Paul Mackerras <paulus@samba.org> - kvm-ppc@vger.kernel.org + "Cc\0Paul Mackerras <paulus@samba.org>" + linuxppc-dev@lists.ozlabs.org kvm@vger.kernel.org mailing list <kvm@vger.kernel.org> + kvm-ppc@vger.kernel.org " linux-kernel@vger.kernel.org list <linux-kernel@vger.kernel.org>\0" "\00:1\0" "b\0" @@ -42,8 +42,8 @@ ">> \t\t\t\tvcpu->arch.fault_dar, vcpu->arch.fault_dsisr);\n" ">> \t\t\tsrcu_read_unlock(&vcpu->kvm->srcu, srcu_idx);\n" ">> \t\t}\n" - ">> -\t} while (r = RESUME_GUEST);\n" - ">> +\t} while ((r = RESUME_GUEST_NV) || (r = RESUME_GUEST));\n" + ">> -\t} while (r == RESUME_GUEST);\n" + ">> +\t} while ((r == RESUME_GUEST_NV) || (r == RESUME_GUEST));\n" "> \n" "> How about\n" "> \n" @@ -71,4 +71,4 @@ "-- \n" Alexey -6a65e4191a663be79f561b2a6f2dcac060b185967b4677a5c0202ebe4934aa65 +d656ee9dd2eb25f7406eee65793fd74384c74778143abb41786234dbbade4e22
diff --git a/a/1.txt b/N2/1.txt index 0c01172..48c2fe1 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -29,8 +29,8 @@ On 01/13/2014 02:44 AM, Alexander Graf wrote: >> vcpu->arch.fault_dar, vcpu->arch.fault_dsisr); >> srcu_read_unlock(&vcpu->kvm->srcu, srcu_idx); >> } ->> - } while (r = RESUME_GUEST); ->> + } while ((r = RESUME_GUEST_NV) || (r = RESUME_GUEST)); +>> - } while (r == RESUME_GUEST); +>> + } while ((r == RESUME_GUEST_NV) || (r == RESUME_GUEST)); > > How about > diff --git a/a/content_digest b/N2/content_digest index 5bf589d..eb424bc 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\0AF6669B4-EF1A-44BD-9034-8824EFD94B5B@suse.de\0" "From\0Alexey Kardashevskiy <aik@ozlabs.ru>\0" "Subject\0Re: [PATCH] PPC: KVM: fix VCPU run for HV KVM\0" - "Date\0Tue, 04 Feb 2014 08:03:12 +0000\0" + "Date\0Tue, 04 Feb 2014 19:03:12 +1100\0" "To\0Alexander Graf <agraf@suse.de>\0" "Cc\0linuxppc-dev@lists.ozlabs.org" Paul Mackerras <paulus@samba.org> @@ -42,8 +42,8 @@ ">> \t\t\t\tvcpu->arch.fault_dar, vcpu->arch.fault_dsisr);\n" ">> \t\t\tsrcu_read_unlock(&vcpu->kvm->srcu, srcu_idx);\n" ">> \t\t}\n" - ">> -\t} while (r = RESUME_GUEST);\n" - ">> +\t} while ((r = RESUME_GUEST_NV) || (r = RESUME_GUEST));\n" + ">> -\t} while (r == RESUME_GUEST);\n" + ">> +\t} while ((r == RESUME_GUEST_NV) || (r == RESUME_GUEST));\n" "> \n" "> How about\n" "> \n" @@ -71,4 +71,4 @@ "-- \n" Alexey -6a65e4191a663be79f561b2a6f2dcac060b185967b4677a5c0202ebe4934aa65 +7f89f5c770cfd4550d457fbb089936db6ffec0822ee0c69cfa40b21631f389f2
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.