diff for duplicates of <2f029721-0b20-2706-6627-0bac36afd03e@kaod.org>
diff --git a/a/1.txt b/N1/1.txt
index c3c0850..aa85d4c 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -42,7 +42,7 @@ On 2/25/19 1:35 AM, David Gibson wrote:
>>
>> +static inline int kvmppc_xive_enabled(struct kvm_vcpu *vcpu)
>> +{
->> + return vcpu->arch.irq_type == KVMPPC_IRQ_XIVE;
+>> + return vcpu->arch.irq_type = KVMPPC_IRQ_XIVE;
>> +}
>> +
>> +extern int kvmppc_xive_native_connect_vcpu(struct kvm_device *dev,
@@ -132,8 +132,7 @@ On 2/25/19 1:35 AM, David Gibson wrote:
>> + }
>> + if (xc->esc_virq[i]) {
>> + struct irq_data *d = irq_get_irq_data(xc->esc_virq[i]);
->> + struct xive_irq_data *xd =
->> + irq_data_get_irq_handler_data(d);
+>> + struct xive_irq_data *xd >> + irq_data_get_irq_handler_data(d);
>> + u64 pq = xive_vm_esb_load(xd, XIVE_ESB_GET);
>> +
>> + seq_printf(m, "E:%c%c I(%d:%llx:%llx)",
@@ -363,7 +362,7 @@ C.
>> if (!kvm)
>> return 0;
>>
->> + seq_puts(m, "=========\nVCPU state\n=========\n");
+>> + seq_puts(m, "=====\nVCPU state\n=====\n");
>> +
>> + kvm_for_each_vcpu(i, vcpu, kvm) {
>> + struct kvmppc_xive_vcpu *xc = vcpu->arch.xive_vcpu;
diff --git a/a/content_digest b/N1/content_digest
index 89bda5d..a076b8c 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -14,7 +14,7 @@
"Subject\0Re: [PATCH v2 03/16] KVM: PPC: Book3S HV: XIVE: introduce a new capability KVM_CAP_PPC_IRQ_XIVE\0"
]
[
- "Date\0Tue, 12 Mar 2019 15:03:25 +0100\0"
+ "Date\0Tue, 12 Mar 2019 14:03:25 +0000\0"
]
[
"To\0David Gibson <david\@gibson.dropbear.id.au>\0"
@@ -76,7 +76,7 @@
">> \n",
">> +static inline int kvmppc_xive_enabled(struct kvm_vcpu *vcpu)\n",
">> +{\n",
- ">> +\treturn vcpu->arch.irq_type == KVMPPC_IRQ_XIVE;\n",
+ ">> +\treturn vcpu->arch.irq_type = KVMPPC_IRQ_XIVE;\n",
">> +}\n",
">> +\n",
">> +extern int kvmppc_xive_native_connect_vcpu(struct kvm_device *dev,\n",
@@ -166,8 +166,7 @@
">> +\t\t}\n",
">> +\t\tif (xc->esc_virq[i]) {\n",
">> +\t\t\tstruct irq_data *d = irq_get_irq_data(xc->esc_virq[i]);\n",
- ">> +\t\t\tstruct xive_irq_data *xd =\n",
- ">> +\t\t\t\tirq_data_get_irq_handler_data(d);\n",
+ ">> +\t\t\tstruct xive_irq_data *xd >> +\t\t\t\tirq_data_get_irq_handler_data(d);\n",
">> +\t\t\tu64 pq = xive_vm_esb_load(xd, XIVE_ESB_GET);\n",
">> +\n",
">> +\t\t\tseq_printf(m, \"E:%c%c I(%d:%llx:%llx)\",\n",
@@ -397,7 +396,7 @@
">> \tif (!kvm)\n",
">> \t\treturn 0;\n",
">> \n",
- ">> +\tseq_puts(m, \"=========\\nVCPU state\\n=========\\n\");\n",
+ ">> +\tseq_puts(m, \"=====\\nVCPU state\\n=====\\n\");\n",
">> +\n",
">> +\tkvm_for_each_vcpu(i, vcpu, kvm) {\n",
">> +\t\tstruct kvmppc_xive_vcpu *xc = vcpu->arch.xive_vcpu;\n",
@@ -501,4 +500,4 @@
">"
]
-da07ac0e622360d4909c0e69879b73fae5212b5f3e4f1fee84333ff2f9794403
+0e2afb3cd66462c02dae2551989cb9519a846a4a039139c008493a68816ccda2
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.