All of lore.kernel.org
 help / color / mirror / Atom feed
diff for duplicates of <53636B71.2020103@suse.de>

diff --git a/a/1.txt b/N1/1.txt
index 2250a7d..0612aa1 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -48,7 +48,7 @@ On 05/01/2014 02:45 AM, Mihai Caraman wrote:
 > -{
 > -	/* Load the instruction manually if it failed to do so in the
 > -	 * exit path */
-> -	if (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED)
+> -	if (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED)
 > -		kvmppc_ld(vcpu, &pc, sizeof(u32), &vcpu->arch.last_inst, false);
 > -
 > -	return kvmppc_need_byteswap(vcpu) ? swab32(vcpu->arch.last_inst) :
@@ -125,7 +125,7 @@ file inclusion order and kvmppc_need_byteswap().
 > +
 > +	/* Load the instruction manually if it failed to do so in the
 > +	 * exit path */
-> +	if (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED)
+> +	if (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED)
 > +		ret = kvmppc_ld(vcpu, &pc, sizeof(u32), &vcpu->arch.last_inst,
 > +			false);
 > +
@@ -183,9 +183,9 @@ file inclusion order and kvmppc_need_byteswap().
 > +	/*
 >   	 * If we fail, we just return to the guest and try executing it again.
 >   	 */
-> -	if (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED) {
+> -	if (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED) {
 > -		ret = kvmppc_ld(vcpu, &srr0, sizeof(u32), &last_inst, false);
-> -		if (ret != EMULATE_DONE || last_inst = KVM_INST_FETCH_FAILED)
+> -		if (ret != EMULATE_DONE || last_inst == KVM_INST_FETCH_FAILED)
 > -			return RESUME_GUEST;
 > -		vcpu->arch.last_inst = last_inst;
 > -	}
@@ -274,8 +274,8 @@ file inclusion order and kvmppc_need_byteswap().
 > +	u32 last_inst;
 >   
 > -	ret = kvmppc_ld(vcpu, &srr0, sizeof(u32), &last_inst, false);
-> -	if (ret = -ENOENT) {
-> +	if (kvmppc_get_last_inst(vcpu, &last_inst) = -ENOENT) {
+> -	if (ret == -ENOENT) {
+> +	if (kvmppc_get_last_inst(vcpu, &last_inst) == -ENOENT) {
 
 ENOENT?
 
@@ -301,7 +301,9 @@ No check for the return value?
 > +			pr_info("Userspace triggered 0x700 exception at\n"
 > +			    "0x%lx (0x%x)\n", kvmppc_get_pc(vcpu), last_inst);
 >   #endif
-> -			if ((kvmppc_get_last_inst(vcpu) & 0xff0007ff) !> +			if ((last_inst & 0xff0007ff) !>   			    (INS_DCBZ & 0xfffffff7)) {
+> -			if ((kvmppc_get_last_inst(vcpu) & 0xff0007ff) !=
+> +			if ((last_inst & 0xff0007ff) !=
+>   			    (INS_DCBZ & 0xfffffff7)) {
 >   				kvmppc_core_queue_program(vcpu, flags);
 >   				r = RESUME_GUEST;
 > @@ -894,7 +894,7 @@ program_interrupt:
@@ -325,8 +327,8 @@ No check for the return value?
 No check for the return value?
 
 >   		if (vcpu->arch.papr_enabled &&
-> -		    (kvmppc_get_last_sc(vcpu) = 0x44000022) &&
-> +		    (last_sc = 0x44000022) &&
+> -		    (kvmppc_get_last_sc(vcpu) == 0x44000022) &&
+> +		    (last_sc == 0x44000022) &&
 >   		    !(vcpu->arch.shared->msr & MSR_PR)) {
 >   			/* SC 1 papr hypercalls */
 >   			ulong cmd = kvmppc_get_gpr(vcpu, 3);
@@ -345,7 +347,7 @@ No check for the return value?
 > +	{
 > +		u32 last_inst;
 > +
->   		if (kvmppc_read_inst(vcpu) = EMULATE_DONE) {
+>   		if (kvmppc_read_inst(vcpu) == EMULATE_DONE) {
 > -			vcpu->arch.shared->dsisr = kvmppc_alignment_dsisr(vcpu,
 > -				kvmppc_get_last_inst(vcpu));
 > -			vcpu->arch.shared->dar = kvmppc_alignment_dar(vcpu,
@@ -356,8 +358,10 @@ I think with an error returning kvmppc_get_last_inst we can just use
 completely get rid of kvmppc_read_inst() and only use 
 kvmppc_get_last_inst() instead.
 
-> +			vcpu->arch.shared->dsisr > +				kvmppc_alignment_dsisr(vcpu, last_inst);
-> +			vcpu->arch.shared->dar > +				kvmppc_alignment_dar(vcpu, last_inst);
+> +			vcpu->arch.shared->dsisr =
+> +				kvmppc_alignment_dsisr(vcpu, last_inst);
+> +			vcpu->arch.shared->dar =
+> +				kvmppc_alignment_dar(vcpu, last_inst);
 >   			kvmppc_book3s_queue_irqprio(vcpu, exit_nr);
 >   		}
 >   		r = RESUME_GUEST;
@@ -388,7 +392,7 @@ kvmppc_get_last_inst() instead.
 > +{
 > +	int result = EMULATE_DONE;
 > +
-> +	if (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED)
+> +	if (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED)
 > +		result = kvmppc_ld_inst(vcpu, &vcpu->arch.last_inst);
 > +	*inst = vcpu->arch.last_inst;
 
diff --git a/a/content_digest b/N1/content_digest
index b9126d4..baec2e9 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,11 +2,11 @@
  "ref\01398905152-18091-4-git-send-email-mihai.caraman@freescale.com\0"
  "From\0Alexander Graf <agraf@suse.de>\0"
  "Subject\0Re: [PATCH v2 3/4] KVM: PPC: Alow kvmppc_get_last_inst() to fail\0"
- "Date\0Fri, 02 May 2014 09:54:57 +0000\0"
+ "Date\0Fri, 02 May 2014 11:54:57 +0200\0"
  "To\0Mihai Caraman <mihai.caraman@freescale.com>\0"
- "Cc\0kvm-ppc@vger.kernel.org"
+ "Cc\0linuxppc-dev@lists.ozlabs.org"
   kvm@vger.kernel.org
- " linuxppc-dev@lists.ozlabs.org\0"
+ " kvm-ppc@vger.kernel.org\0"
  "\00:1\0"
  "b\0"
  "On 05/01/2014 02:45 AM, Mihai Caraman wrote:\n"
@@ -59,7 +59,7 @@
  "> -{\n"
  "> -\t/* Load the instruction manually if it failed to do so in the\n"
  "> -\t * exit path */\n"
- "> -\tif (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED)\n"
+ "> -\tif (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED)\n"
  "> -\t\tkvmppc_ld(vcpu, &pc, sizeof(u32), &vcpu->arch.last_inst, false);\n"
  "> -\n"
  "> -\treturn kvmppc_need_byteswap(vcpu) ? swab32(vcpu->arch.last_inst) :\n"
@@ -136,7 +136,7 @@
  "> +\n"
  "> +\t/* Load the instruction manually if it failed to do so in the\n"
  "> +\t * exit path */\n"
- "> +\tif (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED)\n"
+ "> +\tif (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED)\n"
  "> +\t\tret = kvmppc_ld(vcpu, &pc, sizeof(u32), &vcpu->arch.last_inst,\n"
  "> +\t\t\tfalse);\n"
  "> +\n"
@@ -194,9 +194,9 @@
  "> +\t/*\n"
  ">   \t * If we fail, we just return to the guest and try executing it again.\n"
  ">   \t */\n"
- "> -\tif (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED) {\n"
+ "> -\tif (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED) {\n"
  "> -\t\tret = kvmppc_ld(vcpu, &srr0, sizeof(u32), &last_inst, false);\n"
- "> -\t\tif (ret != EMULATE_DONE || last_inst = KVM_INST_FETCH_FAILED)\n"
+ "> -\t\tif (ret != EMULATE_DONE || last_inst == KVM_INST_FETCH_FAILED)\n"
  "> -\t\t\treturn RESUME_GUEST;\n"
  "> -\t\tvcpu->arch.last_inst = last_inst;\n"
  "> -\t}\n"
@@ -285,8 +285,8 @@
  "> +\tu32 last_inst;\n"
  ">   \n"
  "> -\tret = kvmppc_ld(vcpu, &srr0, sizeof(u32), &last_inst, false);\n"
- "> -\tif (ret = -ENOENT) {\n"
- "> +\tif (kvmppc_get_last_inst(vcpu, &last_inst) = -ENOENT) {\n"
+ "> -\tif (ret == -ENOENT) {\n"
+ "> +\tif (kvmppc_get_last_inst(vcpu, &last_inst) == -ENOENT) {\n"
  "\n"
  "ENOENT?\n"
  "\n"
@@ -312,7 +312,9 @@
  "> +\t\t\tpr_info(\"Userspace triggered 0x700 exception at\\n\"\n"
  "> +\t\t\t    \"0x%lx (0x%x)\\n\", kvmppc_get_pc(vcpu), last_inst);\n"
  ">   #endif\n"
- "> -\t\t\tif ((kvmppc_get_last_inst(vcpu) & 0xff0007ff) !> +\t\t\tif ((last_inst & 0xff0007ff) !>   \t\t\t    (INS_DCBZ & 0xfffffff7)) {\n"
+ "> -\t\t\tif ((kvmppc_get_last_inst(vcpu) & 0xff0007ff) !=\n"
+ "> +\t\t\tif ((last_inst & 0xff0007ff) !=\n"
+ ">   \t\t\t    (INS_DCBZ & 0xfffffff7)) {\n"
  ">   \t\t\t\tkvmppc_core_queue_program(vcpu, flags);\n"
  ">   \t\t\t\tr = RESUME_GUEST;\n"
  "> @@ -894,7 +894,7 @@ program_interrupt:\n"
@@ -336,8 +338,8 @@
  "No check for the return value?\n"
  "\n"
  ">   \t\tif (vcpu->arch.papr_enabled &&\n"
- "> -\t\t    (kvmppc_get_last_sc(vcpu) = 0x44000022) &&\n"
- "> +\t\t    (last_sc = 0x44000022) &&\n"
+ "> -\t\t    (kvmppc_get_last_sc(vcpu) == 0x44000022) &&\n"
+ "> +\t\t    (last_sc == 0x44000022) &&\n"
  ">   \t\t    !(vcpu->arch.shared->msr & MSR_PR)) {\n"
  ">   \t\t\t/* SC 1 papr hypercalls */\n"
  ">   \t\t\tulong cmd = kvmppc_get_gpr(vcpu, 3);\n"
@@ -356,7 +358,7 @@
  "> +\t{\n"
  "> +\t\tu32 last_inst;\n"
  "> +\n"
- ">   \t\tif (kvmppc_read_inst(vcpu) = EMULATE_DONE) {\n"
+ ">   \t\tif (kvmppc_read_inst(vcpu) == EMULATE_DONE) {\n"
  "> -\t\t\tvcpu->arch.shared->dsisr = kvmppc_alignment_dsisr(vcpu,\n"
  "> -\t\t\t\tkvmppc_get_last_inst(vcpu));\n"
  "> -\t\t\tvcpu->arch.shared->dar = kvmppc_alignment_dar(vcpu,\n"
@@ -367,8 +369,10 @@
  "completely get rid of kvmppc_read_inst() and only use \n"
  "kvmppc_get_last_inst() instead.\n"
  "\n"
- "> +\t\t\tvcpu->arch.shared->dsisr > +\t\t\t\tkvmppc_alignment_dsisr(vcpu, last_inst);\n"
- "> +\t\t\tvcpu->arch.shared->dar > +\t\t\t\tkvmppc_alignment_dar(vcpu, last_inst);\n"
+ "> +\t\t\tvcpu->arch.shared->dsisr =\n"
+ "> +\t\t\t\tkvmppc_alignment_dsisr(vcpu, last_inst);\n"
+ "> +\t\t\tvcpu->arch.shared->dar =\n"
+ "> +\t\t\t\tkvmppc_alignment_dar(vcpu, last_inst);\n"
  ">   \t\t\tkvmppc_book3s_queue_irqprio(vcpu, exit_nr);\n"
  ">   \t\t}\n"
  ">   \t\tr = RESUME_GUEST;\n"
@@ -399,7 +403,7 @@
  "> +{\n"
  "> +\tint result = EMULATE_DONE;\n"
  "> +\n"
- "> +\tif (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED)\n"
+ "> +\tif (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED)\n"
  "> +\t\tresult = kvmppc_ld_inst(vcpu, &vcpu->arch.last_inst);\n"
  "> +\t*inst = vcpu->arch.last_inst;\n"
  "\n"
@@ -410,4 +414,4 @@
  "\n"
  Alex
 
-c10419d9e40acfb8ddfa36efcf5436a1cdd8c73715d39dc0674415eaf20339ce
+c5f58acf977f7a4b3c23dd4b2de5226f3392beb72f36b97d8877ef31c20e5474

diff --git a/a/1.txt b/N2/1.txt
index 2250a7d..0612aa1 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -48,7 +48,7 @@ On 05/01/2014 02:45 AM, Mihai Caraman wrote:
 > -{
 > -	/* Load the instruction manually if it failed to do so in the
 > -	 * exit path */
-> -	if (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED)
+> -	if (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED)
 > -		kvmppc_ld(vcpu, &pc, sizeof(u32), &vcpu->arch.last_inst, false);
 > -
 > -	return kvmppc_need_byteswap(vcpu) ? swab32(vcpu->arch.last_inst) :
@@ -125,7 +125,7 @@ file inclusion order and kvmppc_need_byteswap().
 > +
 > +	/* Load the instruction manually if it failed to do so in the
 > +	 * exit path */
-> +	if (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED)
+> +	if (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED)
 > +		ret = kvmppc_ld(vcpu, &pc, sizeof(u32), &vcpu->arch.last_inst,
 > +			false);
 > +
@@ -183,9 +183,9 @@ file inclusion order and kvmppc_need_byteswap().
 > +	/*
 >   	 * If we fail, we just return to the guest and try executing it again.
 >   	 */
-> -	if (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED) {
+> -	if (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED) {
 > -		ret = kvmppc_ld(vcpu, &srr0, sizeof(u32), &last_inst, false);
-> -		if (ret != EMULATE_DONE || last_inst = KVM_INST_FETCH_FAILED)
+> -		if (ret != EMULATE_DONE || last_inst == KVM_INST_FETCH_FAILED)
 > -			return RESUME_GUEST;
 > -		vcpu->arch.last_inst = last_inst;
 > -	}
@@ -274,8 +274,8 @@ file inclusion order and kvmppc_need_byteswap().
 > +	u32 last_inst;
 >   
 > -	ret = kvmppc_ld(vcpu, &srr0, sizeof(u32), &last_inst, false);
-> -	if (ret = -ENOENT) {
-> +	if (kvmppc_get_last_inst(vcpu, &last_inst) = -ENOENT) {
+> -	if (ret == -ENOENT) {
+> +	if (kvmppc_get_last_inst(vcpu, &last_inst) == -ENOENT) {
 
 ENOENT?
 
@@ -301,7 +301,9 @@ No check for the return value?
 > +			pr_info("Userspace triggered 0x700 exception at\n"
 > +			    "0x%lx (0x%x)\n", kvmppc_get_pc(vcpu), last_inst);
 >   #endif
-> -			if ((kvmppc_get_last_inst(vcpu) & 0xff0007ff) !> +			if ((last_inst & 0xff0007ff) !>   			    (INS_DCBZ & 0xfffffff7)) {
+> -			if ((kvmppc_get_last_inst(vcpu) & 0xff0007ff) !=
+> +			if ((last_inst & 0xff0007ff) !=
+>   			    (INS_DCBZ & 0xfffffff7)) {
 >   				kvmppc_core_queue_program(vcpu, flags);
 >   				r = RESUME_GUEST;
 > @@ -894,7 +894,7 @@ program_interrupt:
@@ -325,8 +327,8 @@ No check for the return value?
 No check for the return value?
 
 >   		if (vcpu->arch.papr_enabled &&
-> -		    (kvmppc_get_last_sc(vcpu) = 0x44000022) &&
-> +		    (last_sc = 0x44000022) &&
+> -		    (kvmppc_get_last_sc(vcpu) == 0x44000022) &&
+> +		    (last_sc == 0x44000022) &&
 >   		    !(vcpu->arch.shared->msr & MSR_PR)) {
 >   			/* SC 1 papr hypercalls */
 >   			ulong cmd = kvmppc_get_gpr(vcpu, 3);
@@ -345,7 +347,7 @@ No check for the return value?
 > +	{
 > +		u32 last_inst;
 > +
->   		if (kvmppc_read_inst(vcpu) = EMULATE_DONE) {
+>   		if (kvmppc_read_inst(vcpu) == EMULATE_DONE) {
 > -			vcpu->arch.shared->dsisr = kvmppc_alignment_dsisr(vcpu,
 > -				kvmppc_get_last_inst(vcpu));
 > -			vcpu->arch.shared->dar = kvmppc_alignment_dar(vcpu,
@@ -356,8 +358,10 @@ I think with an error returning kvmppc_get_last_inst we can just use
 completely get rid of kvmppc_read_inst() and only use 
 kvmppc_get_last_inst() instead.
 
-> +			vcpu->arch.shared->dsisr > +				kvmppc_alignment_dsisr(vcpu, last_inst);
-> +			vcpu->arch.shared->dar > +				kvmppc_alignment_dar(vcpu, last_inst);
+> +			vcpu->arch.shared->dsisr =
+> +				kvmppc_alignment_dsisr(vcpu, last_inst);
+> +			vcpu->arch.shared->dar =
+> +				kvmppc_alignment_dar(vcpu, last_inst);
 >   			kvmppc_book3s_queue_irqprio(vcpu, exit_nr);
 >   		}
 >   		r = RESUME_GUEST;
@@ -388,7 +392,7 @@ kvmppc_get_last_inst() instead.
 > +{
 > +	int result = EMULATE_DONE;
 > +
-> +	if (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED)
+> +	if (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED)
 > +		result = kvmppc_ld_inst(vcpu, &vcpu->arch.last_inst);
 > +	*inst = vcpu->arch.last_inst;
 
diff --git a/a/content_digest b/N2/content_digest
index b9126d4..819e0f6 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,7 +2,7 @@
  "ref\01398905152-18091-4-git-send-email-mihai.caraman@freescale.com\0"
  "From\0Alexander Graf <agraf@suse.de>\0"
  "Subject\0Re: [PATCH v2 3/4] KVM: PPC: Alow kvmppc_get_last_inst() to fail\0"
- "Date\0Fri, 02 May 2014 09:54:57 +0000\0"
+ "Date\0Fri, 02 May 2014 11:54:57 +0200\0"
  "To\0Mihai Caraman <mihai.caraman@freescale.com>\0"
  "Cc\0kvm-ppc@vger.kernel.org"
   kvm@vger.kernel.org
@@ -59,7 +59,7 @@
  "> -{\n"
  "> -\t/* Load the instruction manually if it failed to do so in the\n"
  "> -\t * exit path */\n"
- "> -\tif (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED)\n"
+ "> -\tif (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED)\n"
  "> -\t\tkvmppc_ld(vcpu, &pc, sizeof(u32), &vcpu->arch.last_inst, false);\n"
  "> -\n"
  "> -\treturn kvmppc_need_byteswap(vcpu) ? swab32(vcpu->arch.last_inst) :\n"
@@ -136,7 +136,7 @@
  "> +\n"
  "> +\t/* Load the instruction manually if it failed to do so in the\n"
  "> +\t * exit path */\n"
- "> +\tif (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED)\n"
+ "> +\tif (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED)\n"
  "> +\t\tret = kvmppc_ld(vcpu, &pc, sizeof(u32), &vcpu->arch.last_inst,\n"
  "> +\t\t\tfalse);\n"
  "> +\n"
@@ -194,9 +194,9 @@
  "> +\t/*\n"
  ">   \t * If we fail, we just return to the guest and try executing it again.\n"
  ">   \t */\n"
- "> -\tif (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED) {\n"
+ "> -\tif (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED) {\n"
  "> -\t\tret = kvmppc_ld(vcpu, &srr0, sizeof(u32), &last_inst, false);\n"
- "> -\t\tif (ret != EMULATE_DONE || last_inst = KVM_INST_FETCH_FAILED)\n"
+ "> -\t\tif (ret != EMULATE_DONE || last_inst == KVM_INST_FETCH_FAILED)\n"
  "> -\t\t\treturn RESUME_GUEST;\n"
  "> -\t\tvcpu->arch.last_inst = last_inst;\n"
  "> -\t}\n"
@@ -285,8 +285,8 @@
  "> +\tu32 last_inst;\n"
  ">   \n"
  "> -\tret = kvmppc_ld(vcpu, &srr0, sizeof(u32), &last_inst, false);\n"
- "> -\tif (ret = -ENOENT) {\n"
- "> +\tif (kvmppc_get_last_inst(vcpu, &last_inst) = -ENOENT) {\n"
+ "> -\tif (ret == -ENOENT) {\n"
+ "> +\tif (kvmppc_get_last_inst(vcpu, &last_inst) == -ENOENT) {\n"
  "\n"
  "ENOENT?\n"
  "\n"
@@ -312,7 +312,9 @@
  "> +\t\t\tpr_info(\"Userspace triggered 0x700 exception at\\n\"\n"
  "> +\t\t\t    \"0x%lx (0x%x)\\n\", kvmppc_get_pc(vcpu), last_inst);\n"
  ">   #endif\n"
- "> -\t\t\tif ((kvmppc_get_last_inst(vcpu) & 0xff0007ff) !> +\t\t\tif ((last_inst & 0xff0007ff) !>   \t\t\t    (INS_DCBZ & 0xfffffff7)) {\n"
+ "> -\t\t\tif ((kvmppc_get_last_inst(vcpu) & 0xff0007ff) !=\n"
+ "> +\t\t\tif ((last_inst & 0xff0007ff) !=\n"
+ ">   \t\t\t    (INS_DCBZ & 0xfffffff7)) {\n"
  ">   \t\t\t\tkvmppc_core_queue_program(vcpu, flags);\n"
  ">   \t\t\t\tr = RESUME_GUEST;\n"
  "> @@ -894,7 +894,7 @@ program_interrupt:\n"
@@ -336,8 +338,8 @@
  "No check for the return value?\n"
  "\n"
  ">   \t\tif (vcpu->arch.papr_enabled &&\n"
- "> -\t\t    (kvmppc_get_last_sc(vcpu) = 0x44000022) &&\n"
- "> +\t\t    (last_sc = 0x44000022) &&\n"
+ "> -\t\t    (kvmppc_get_last_sc(vcpu) == 0x44000022) &&\n"
+ "> +\t\t    (last_sc == 0x44000022) &&\n"
  ">   \t\t    !(vcpu->arch.shared->msr & MSR_PR)) {\n"
  ">   \t\t\t/* SC 1 papr hypercalls */\n"
  ">   \t\t\tulong cmd = kvmppc_get_gpr(vcpu, 3);\n"
@@ -356,7 +358,7 @@
  "> +\t{\n"
  "> +\t\tu32 last_inst;\n"
  "> +\n"
- ">   \t\tif (kvmppc_read_inst(vcpu) = EMULATE_DONE) {\n"
+ ">   \t\tif (kvmppc_read_inst(vcpu) == EMULATE_DONE) {\n"
  "> -\t\t\tvcpu->arch.shared->dsisr = kvmppc_alignment_dsisr(vcpu,\n"
  "> -\t\t\t\tkvmppc_get_last_inst(vcpu));\n"
  "> -\t\t\tvcpu->arch.shared->dar = kvmppc_alignment_dar(vcpu,\n"
@@ -367,8 +369,10 @@
  "completely get rid of kvmppc_read_inst() and only use \n"
  "kvmppc_get_last_inst() instead.\n"
  "\n"
- "> +\t\t\tvcpu->arch.shared->dsisr > +\t\t\t\tkvmppc_alignment_dsisr(vcpu, last_inst);\n"
- "> +\t\t\tvcpu->arch.shared->dar > +\t\t\t\tkvmppc_alignment_dar(vcpu, last_inst);\n"
+ "> +\t\t\tvcpu->arch.shared->dsisr =\n"
+ "> +\t\t\t\tkvmppc_alignment_dsisr(vcpu, last_inst);\n"
+ "> +\t\t\tvcpu->arch.shared->dar =\n"
+ "> +\t\t\t\tkvmppc_alignment_dar(vcpu, last_inst);\n"
  ">   \t\t\tkvmppc_book3s_queue_irqprio(vcpu, exit_nr);\n"
  ">   \t\t}\n"
  ">   \t\tr = RESUME_GUEST;\n"
@@ -399,7 +403,7 @@
  "> +{\n"
  "> +\tint result = EMULATE_DONE;\n"
  "> +\n"
- "> +\tif (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED)\n"
+ "> +\tif (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED)\n"
  "> +\t\tresult = kvmppc_ld_inst(vcpu, &vcpu->arch.last_inst);\n"
  "> +\t*inst = vcpu->arch.last_inst;\n"
  "\n"
@@ -410,4 +414,4 @@
  "\n"
  Alex
 
-c10419d9e40acfb8ddfa36efcf5436a1cdd8c73715d39dc0674415eaf20339ce
+775085c1d790cf98f3196ff1cfa527082ab10d2405fca1a95166d8ed38500d75

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.