File IA64-compile-fix-suse.patch of Package kvm

Overview Repositories Revisions Requests Users Attributes Meta

File IA64-compile-fix-suse.patch of Package kvm

Only in qemu-kvm-0.10.5: config-host.h~
Index: qemu-kvm-0.10.5/hw/i8259.c
===================================================================
--- qemu-kvm-0.10.5.orig/hw/i8259.c
+++ qemu-kvm-0.10.5/hw/i8259.c
@@ -189,8 +189,10 @@ static void i8259_set_irq(void *opaque, 
     if (kvm_enabled()) {
         int pic_ret;
         if (kvm_set_irq(irq, level, &pic_ret)) {
+#if 0
             if (pic_ret != 0)
                 apic_set_irq_delivered();
+#endif
             return;
         }
     }
Index: qemu-kvm-0.10.5/hw/ipf.c
===================================================================
--- qemu-kvm-0.10.5.orig/hw/ipf.c
+++ qemu-kvm-0.10.5/hw/ipf.c
@@ -690,6 +690,7 @@ static int ioapic_map_irq(int devfn, int
 void ioapic_set_irq(void *opaque, int irq_num, int level)
 {
     int vector;
+    int pic_ret;
 
     PCIDevice *pci_dev = (PCIDevice *)opaque;
     vector = ioapic_map_irq(pci_dev->devfn, irq_num);
@@ -700,7 +701,7 @@ void ioapic_set_irq(void *opaque, int ir
         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))
 	    return;
     }
 }
Index: qemu-kvm-0.10.5/monitor.c
===================================================================
--- qemu-kvm-0.10.5.orig/monitor.c
+++ qemu-kvm-0.10.5/monitor.c
@@ -1598,10 +1598,12 @@ static const term_cmd_t term_cmds[] = {
     { "host_net_remove", "is", net_host_device_remove,
       "vlan_id name", "remove host VLAN client" },
 #endif
+#ifdef CONFIG_SLIRP
     { "host_net_redir", "ss?", net_slirp_redir,
       "[tcp|udp]:host-port:[guest-host]:guest-port", "redirect TCP or UDP connections from host to guest (requires -net user)\n"
       "host_net_redir remove [tcp:|udp:]host-port -- remove redirection\n"
       "host_net_redir list -- show all redirections" },
+#endif
     { "balloon", "i", do_balloon,
       "target", "request VM to change it's memory allocation (in MB)" },
     { "set_link", "ss", do_set_link,
Index: qemu-kvm-0.10.5/qemu-kvm.c
===================================================================
--- qemu-kvm-0.10.5.orig/qemu-kvm.c
+++ qemu-kvm-0.10.5/qemu-kvm.c
@@ -750,7 +750,7 @@ static struct kvm_callbacks qemu_kvm_ops
     .shutdown = kvm_shutdown,
     .io_window = kvm_io_window,
     .try_push_interrupts = try_push_interrupts,
-#ifdef KVM_CAP_USER_NMI
+#if 0
     .push_nmi = kvm_arch_push_nmi,
 #endif
     .post_kvm_run = post_kvm_run,
@@ -917,7 +917,6 @@ void kvm_cpu_register_physical_memory(ta
         }
         if (must_use_aliases_target(start_addr))
             return;
-#endif
         while (size > 0) {
             p = find_mapping(start_addr);
             if (p) {
@@ -931,6 +930,7 @@ void kvm_cpu_register_physical_memory(ta
                 size = 0;
             }
         }
+#endif
         return;
     }
 
Index: qemu-kvm-0.10.5/configure
===================================================================
--- qemu-kvm-0.10.5.orig/configure
+++ qemu-kvm-0.10.5/configure
@@ -502,7 +502,7 @@ if test "$werror" = "yes" ; then
 CFLAGS="$CFLAGS -Werror"
 fi
 
-CFLAGS="$CFLAGS -I$(readlink -f "$source_path/kvm/libkvm")"
+CFLAGS="$CFLAGS -I$(readlink -f "$source_path/kvm/libkvm") -I$(pwd)/kvm/kernel/arch/x86/include/"
 
 if test "$solaris" = "no" ; then
     if ld --version 2>/dev/null | grep "GNU ld" >/dev/null 2>/dev/null ; then
@@ -542,6 +542,9 @@ case "$cpu" in
            ARCH_CFLAGS="-m64"
            ARCH_LDFLAGS="-m64"
            ;;
+    ia64)
+           ARCH_CFLAGS="-I$(pwd)/kvm/kernel/arch/x86/include/"
+           ;;
 esac
 
 if test x"$show_help" = x"yes" ; then

Places

File IA64-compile-fix-suse.patch of Package kvm

Places