1 |
slyfox 12/01/30 06:32:59 |
2 |
|
3 |
Modified: qemu-kvm-9999-fix-nonkvm-arches.patch |
4 |
Log: |
5 |
Update patch against current upstream. |
6 |
|
7 |
(Portage version: 2.2.0_alpha84_p47/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 app-emulation/qemu-kvm/files/qemu-kvm-9999-fix-nonkvm-arches.patch |
11 |
|
12 |
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 |
13 |
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 |
14 |
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 |
15 |
|
16 |
Index: qemu-kvm-9999-fix-nonkvm-arches.patch |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/files/qemu-kvm-9999-fix-nonkvm-arches.patch,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- qemu-kvm-9999-fix-nonkvm-arches.patch 22 Jan 2012 20:40:49 -0000 1.1 |
23 |
+++ qemu-kvm-9999-fix-nonkvm-arches.patch 30 Jan 2012 06:32:59 -0000 1.2 |
24 |
@@ -3,7 +3,7 @@ |
25 |
i8259.o: In function `kvm_i8259_set_irq': |
26 |
/tmp/portage/app-emulation/qemu-kvm-9999/work/qemu-kvm-9999/hw/i8259.c:689: undefined reference to `apic_set_irq_delivered' |
27 |
diff --git a/hw/i8259.c b/hw/i8259.c |
28 |
-index 0632ea2..2f6789d 100644 |
29 |
+index 21a4efc..bb3bb18 100644 |
30 |
--- a/hw/i8259.c |
31 |
+++ b/hw/i8259.c |
32 |
@@ -21,6 +21,7 @@ |
33 |
@@ -14,15 +14,14 @@ |
34 |
#include "hw.h" |
35 |
#include "pc.h" |
36 |
#include "isa.h" |
37 |
-@@ -682,12 +683,14 @@ static int kvm_kernel_pic_load_from_user(PicState *s) |
38 |
+@@ -591,11 +592,13 @@ static int kvm_kernel_pic_load_from_user(PICCommonState *s) |
39 |
|
40 |
static void kvm_i8259_set_irq(void *opaque, int irq, int level) |
41 |
{ |
42 |
+#ifdef CONFIG_KVM |
43 |
int pic_ret; |
44 |
if (kvm_set_irq(irq, level, &pic_ret)) { |
45 |
- if (pic_ret != 0) |
46 |
- apic_set_irq_delivered(); |
47 |
+ apic_report_irq_delivered(pic_ret); |
48 |
return; |
49 |
} |
50 |
+#endif |