/[gentoo-x86]/app-emulation/qemu-kvm/files/qemu-kvm-9999-fix-nonkvm-arches.patch
Gentoo

Diff of /app-emulation/qemu-kvm/files/qemu-kvm-9999-fix-nonkvm-arches.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.1 Revision 1.2
1Fix build failure caused by KVM-specific code in arches not supporting KVM: 1Fix build failure caused by KVM-specific code in arches not supporting KVM:
2 LINK alpha-softmmu/qemu-system-alpha 2 LINK alpha-softmmu/qemu-system-alpha
3i8259.o: In function `kvm_i8259_set_irq': 3i8259.o: In function `kvm_i8259_set_irq':
4/tmp/portage/app-emulation/qemu-kvm-9999/work/qemu-kvm-9999/hw/i8259.c:689: undefined reference to `apic_set_irq_delivered' 4/tmp/portage/app-emulation/qemu-kvm-9999/work/qemu-kvm-9999/hw/i8259.c:689: undefined reference to `apic_set_irq_delivered'
5diff --git a/hw/i8259.c b/hw/i8259.c 5diff --git a/hw/i8259.c b/hw/i8259.c
6index 0632ea2..2f6789d 100644 6index 21a4efc..bb3bb18 100644
7--- a/hw/i8259.c 7--- a/hw/i8259.c
8+++ b/hw/i8259.c 8+++ b/hw/i8259.c
9@@ -21,6 +21,7 @@ 9@@ -21,6 +21,7 @@
10 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 10 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
11 * THE SOFTWARE. 11 * THE SOFTWARE.
12 */ 12 */
13+#include "apic.h" 13+#include "apic.h"
14 #include "hw.h" 14 #include "hw.h"
15 #include "pc.h" 15 #include "pc.h"
16 #include "isa.h" 16 #include "isa.h"
17@@ -682,12 +683,14 @@ static int kvm_kernel_pic_load_from_user(PicState *s) 17@@ -591,11 +592,13 @@ static int kvm_kernel_pic_load_from_user(PICCommonState *s)
18 18
19 static void kvm_i8259_set_irq(void *opaque, int irq, int level) 19 static void kvm_i8259_set_irq(void *opaque, int irq, int level)
20 { 20 {
21+#ifdef CONFIG_KVM 21+#ifdef CONFIG_KVM
22 int pic_ret; 22 int pic_ret;
23 if (kvm_set_irq(irq, level, &pic_ret)) { 23 if (kvm_set_irq(irq, level, &pic_ret)) {
24 if (pic_ret != 0)
25 apic_set_irq_delivered(); 24 apic_report_irq_delivered(pic_ret);
26 return; 25 return;
27 } 26 }
28+#endif 27+#endif
29 } 28 }
30 29

Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2

  ViewVC Help
Powered by ViewVC 1.1.20