[patch] hw/ipf.c build fix for kvm-userspace

Jes Sorensen <[email protected]>
Newsgroups org.kernel.vger.kvm-ia64
Message-ID <[email protected]>
Hi,

Another build fix to get current kvm-userspace to build on ia64.

Cheers,
Jes
0002-qemu-ia64-ipf-build-fix.patch (text/x-patch, 1.1 KB)
Provide dummy apic_set_irq_delivered() function and update call to
kvm_set_irq() to add extra argument.

Signed-off-by: Jes Sorensen <[email protected]>

---
 qemu/hw/ipf.c |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

Index: kvm-userspace2.git/qemu/hw/ipf.c
===================================================================
--- kvm-userspace2.git.orig/qemu/hw/ipf.c
+++ kvm-userspace2.git/qemu/hw/ipf.c
@@ -687,9 +687,15 @@
     return irq;
 }
 
+/*
+ * Dummy function to provide match for call from hw/apic.c
+ */
+void apic_set_irq_delivered(void) {
+}
+
 void ioapic_set_irq(void *opaque, int irq_num, int level)
 {
-    int vector;
+    int vector, pic_ret;
 
     PCIDevice *pci_dev = (PCIDevice *)opaque;
     vector = ioapic_map_irq(pci_dev->devfn, irq_num);
@@ -700,7 +706,9 @@
         ioapic_irq_count[vector] -= 1;
 
     if (kvm_enabled()) {
-	if (kvm_set_irq(vector, ioapic_irq_count[vector] == 0))
+	if (kvm_set_irq(vector, ioapic_irq_count[vector] == 0, &pic_ret))
+            if (pic_ret != 0)
+                apic_set_irq_delivered();
 	    return;
     }
 }
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.