diff for duplicates of <20190222112840.25000-4-clg@kaod.org>
diff --git a/a/1.txt b/N1/1.txt
index b14ed80..08d617c 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -6,7 +6,7 @@ advertised on a PowerNV Hypervisor as support for nested guests
Internally, the interface to the new KVM device is protected with a
new interrupt mode: KVMPPC_IRQ_XIVE.
-Signed-off-by: Cédric Le Goater <clg@kaod.org>
+Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
arch/powerpc/include/asm/kvm_host.h | 1 +
arch/powerpc/include/asm/kvm_ppc.h | 13 +++
@@ -40,7 +40,7 @@ index 4b72ddde7dc1..1e61877fe147 100644
+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,
@@ -130,8 +130,7 @@ index f78d002f0fe0..d1cc18a5b1c4 100644
+ }
+ 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)",
@@ -332,7 +331,7 @@ index e475ce83ad14..1f3da47a4a6a 100644
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 ca827d3..c9341ad 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH v2 03/16] KVM: PPC: Book3S HV: XIVE: introduce a new capability KVM_CAP_PPC_IRQ_XIVE\0"
]
[
- "Date\0Fri, 22 Feb 2019 12:28:27 +0100\0"
+ "Date\0Fri, 22 Feb 2019 11:28:27 +0000\0"
]
[
"To\0kvm-ppc\@vger.kernel.org\0"
@@ -35,7 +35,7 @@
"Internally, the interface to the new KVM device is protected with a\n",
"new interrupt mode: KVMPPC_IRQ_XIVE.\n",
"\n",
- "Signed-off-by: C\303\251dric Le Goater <clg\@kaod.org>\n",
+ "Signed-off-by: C\303\203\302\251dric Le Goater <clg\@kaod.org>\n",
"---\n",
" arch/powerpc/include/asm/kvm_host.h | 1 +\n",
" arch/powerpc/include/asm/kvm_ppc.h | 13 +++\n",
@@ -69,7 +69,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",
@@ -159,8 +159,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",
@@ -361,7 +360,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",
@@ -466,4 +465,4 @@
"2.20.1"
]
-b46be78c406a769df0a00e1f43d0deeb2a76617d7c910ae81f1d941c6e14dd61
+840ee1a49af77588965e76870b44d15d18e93db209bbb0d17a27eb100e59651b
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.