Gentoo Archives: gentoo-commits

From: "Sergei Trofimovich (slyfox)" <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm/files: qemu-kvm-9999-fix-nonkvm-arches.patch
Date: Mon, 30 Jan 2012 06:33:09
Message-Id: 20120130063259.3E1752004B@flycatcher.gentoo.org
slyfox      12/01/30 06:32:59

  Modified:             qemu-kvm-9999-fix-nonkvm-arches.patch
  Log:
  Update patch against current upstream.
  
  (Portage version: 2.2.0_alpha84_p47/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  app-emulation/qemu-kvm/files/qemu-kvm-9999-fix-nonkvm-arches.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/files/qemu-kvm-9999-fix-nonkvm-arches.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/files/qemu-kvm-9999-fix-nonkvm-arches.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/files/qemu-kvm-9999-fix-nonkvm-arches.patch?r1=1.1&r2=1.2

Index: qemu-kvm-9999-fix-nonkvm-arches.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/files/qemu-kvm-9999-fix-nonkvm-arches.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qemu-kvm-9999-fix-nonkvm-arches.patch	22 Jan 2012 20:40:49 -0000	1.1
+++ qemu-kvm-9999-fix-nonkvm-arches.patch	30 Jan 2012 06:32:59 -0000	1.2
@@ -3,7 +3,7 @@
 i8259.o: In function `kvm_i8259_set_irq':
 /tmp/portage/app-emulation/qemu-kvm-9999/work/qemu-kvm-9999/hw/i8259.c:689: undefined reference to `apic_set_irq_delivered'
 diff --git a/hw/i8259.c b/hw/i8259.c
-index 0632ea2..2f6789d 100644
+index 21a4efc..bb3bb18 100644
 --- a/hw/i8259.c
 +++ b/hw/i8259.c
 @@ -21,6 +21,7 @@
@@ -14,15 +14,14 @@
  #include "hw.h"
  #include "pc.h"
  #include "isa.h"
-@@ -682,12 +683,14 @@ static int kvm_kernel_pic_load_from_user(PicState *s)
+@@ -591,11 +592,13 @@ static int kvm_kernel_pic_load_from_user(PICCommonState *s)
  
  static void kvm_i8259_set_irq(void *opaque, int irq, int level)
  {
 +#ifdef CONFIG_KVM
      int pic_ret;
      if (kvm_set_irq(irq, level, &pic_ret)) {
-         if (pic_ret != 0)
-             apic_set_irq_delivered();
+         apic_report_irq_delivered(pic_ret);
          return;
      }
 +#endif