diff for duplicates of <573C49C7.1060804@redhat.com> diff --git a/a/1.txt b/N1/1.txt index 5357b3e..e2410e2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -48,7 +48,7 @@ On 18.05.2016 12:18, Thomas Huth wrote: >>>>>>>>>>> case 0: >>>>>>>>>>> - emulated = EMULATE_FAIL; >>>>>>>>>>> if ((kvmppc_get_msr(vcpu) & MSR_LE) && ->>>>>>>>>>> (inst = swab32(inst_sc))) { +>>>>>>>>>>> (inst == swab32(inst_sc))) { >>>>>>>>>>> /* >>>>>>>>>>> @@ -112,6 +111,9 @@ int kvmppc_core_emulate_op_pr(struct kvm_run >>>>>>>>>>> *run, @@ -165,12 +165,12 @@ In kvmppc_handle_exit_pr(), the code flow looks like this: But when you look at the end of kvmppc_emulate_instruction(), you can see that the interrupt has also already been injected there: - if (emulated = EMULATE_FAIL) { + if (emulated == EMULATE_FAIL) { emulated = vcpu->kvm->arch.kvm_ops->emulate_op(run, vcpu, inst, &advance); - if (emulated = EMULATE_AGAIN) { + if (emulated == EMULATE_AGAIN) { advance = 0; - } else if (emulated = EMULATE_FAIL) { + } else if (emulated == EMULATE_FAIL) { advance = 0; printk(KERN_ERR "Couldn't emulate instruction 0x%08x " "(op %d xop %d)\n", inst, get_op(inst), get_xop(inst)); diff --git a/a/content_digest b/N1/content_digest index a30723d..7032c02 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -11,7 +11,7 @@ "ref\0573C4165.4080909@redhat.com\0" "From\0Thomas Huth <thuth@redhat.com>\0" "Subject\0Re: [PATCH] kvm-pr: manage illegal instructions\0" - "Date\0Wed, 18 May 2016 10:53:59 +0000\0" + "Date\0Wed, 18 May 2016 12:53:59 +0200\0" "To\0Laurent Vivier <lvivier@redhat.com>" " Alexander Graf <agraf@suse.de>\0" "Cc\0kvm@vger.kernel.org" @@ -75,7 +75,7 @@ ">>>>>>>>>>> case 0:\n" ">>>>>>>>>>> - emulated = EMULATE_FAIL;\n" ">>>>>>>>>>> if ((kvmppc_get_msr(vcpu) & MSR_LE) &&\n" - ">>>>>>>>>>> (inst = swab32(inst_sc))) {\n" + ">>>>>>>>>>> (inst == swab32(inst_sc))) {\n" ">>>>>>>>>>> /*\n" ">>>>>>>>>>> @@ -112,6 +111,9 @@ int kvmppc_core_emulate_op_pr(struct kvm_run\n" ">>>>>>>>>>> *run,\n" @@ -192,12 +192,12 @@ "But when you look at the end of kvmppc_emulate_instruction(), you\n" "can see that the interrupt has also already been injected there:\n" "\n" - "\tif (emulated = EMULATE_FAIL) {\n" + "\tif (emulated == EMULATE_FAIL) {\n" "\t\temulated = vcpu->kvm->arch.kvm_ops->emulate_op(run, vcpu, inst,\n" "\t\t\t\t\t\t\t &advance);\n" - "\t\tif (emulated = EMULATE_AGAIN) {\n" + "\t\tif (emulated == EMULATE_AGAIN) {\n" "\t\t\tadvance = 0;\n" - "\t\t} else if (emulated = EMULATE_FAIL) {\n" + "\t\t} else if (emulated == EMULATE_FAIL) {\n" "\t\t\tadvance = 0;\n" "\t\t\tprintk(KERN_ERR \"Couldn't emulate instruction 0x%08x \"\n" "\t\t\t \"(op %d xop %d)\\n\", inst, get_op(inst), get_xop(inst));\n" @@ -212,4 +212,4 @@ "\n" Thomas -4eda8661011a6d88237ceaa099f3c8c36062cbac534af46836b7cdc6ede58ef4 +3fc7ce4b0be5994819a68d54b502ca6bcf7b749cb99083f8d65b5183e491c03b
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.