From patchwork Tue Mar 3 03:38:17 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Yang" X-Patchwork-Id: 9635 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n233eMEG029337 for ; Tue, 3 Mar 2009 03:40:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751915AbZCCDkU (ORCPT ); Mon, 2 Mar 2009 22:40:20 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752492AbZCCDkU (ORCPT ); Mon, 2 Mar 2009 22:40:20 -0500 Received: from mga01.intel.com ([192.55.52.88]:41022 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752212AbZCCDkS (ORCPT ); Mon, 2 Mar 2009 22:40:18 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 02 Mar 2009 19:33:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.38,293,1233561600"; d="scan'208,223";a="435600286" Received: from pgsmsx603.gar.corp.intel.com ([10.221.43.87]) by fmsmga002.fm.intel.com with ESMTP; 02 Mar 2009 19:36:02 -0800 Received: from pdsmsx602.ccr.corp.intel.com (172.16.12.184) by pgsmsx603.gar.corp.intel.com (10.221.43.87) with Microsoft SMTP Server (TLS) id 8.1.311.2; Tue, 3 Mar 2009 11:39:37 +0800 Received: from pdsmsx502.ccr.corp.intel.com ([172.16.12.96]) by pdsmsx602.ccr.corp.intel.com ([172.16.12.184]) with mapi; Tue, 3 Mar 2009 11:39:32 +0800 From: "Zhang, Yang" To: "kvm-ia64@vger.kernel.org" CC: "kvm@vger.kernel.org" , Avi Kivity , "Zhang, Xiantao" Date: Tue, 3 Mar 2009 11:38:17 +0800 Subject: [PATCH] kvm : qemu : fix compilation error in kvm-userspace for ia64 Thread-Topic: [PATCH] kvm : qemu : fix compilation error in kvm-userspace for ia64 Thread-Index: AcmbsX1Y/2MSKqICRhSbY+r2u7gMtQ== Message-ID: <10C63FAD690C13458F0B32BCED571F1406D6778C@pdsmsx502.ccr.corp.intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Hi please to review it. thanks Best Regards --yang From 0cce141eae71bbb2012efd54ba38916c437cd030 Mon Sep 17 00:00:00 2001 From: Yang Zhang Date: Mon, 2 Mar 2009 22:29:08 -0500 Subject: [PATCH] kvm : qemu : fix compilation error in kvm-userspace for ia64 when using make sync, the msidef.h is missing. This patch fix this. And IA64 does not need apic_set_irq_delivered(). Signed-off-by: Yang Zhang --- kernel/Makefile | 3 ++- qemu/hw/i8259.c | 2 ++ qemu/hw/ipf.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kernel/Makefile b/kernel/Makefile index f8b341f..808f15e 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -61,7 +61,8 @@ headers-old = $(LINUX)/./include/asm-$(ARCH_DIR)/kvm*.h headers-new = $(LINUX)/arch/$(ARCH_DIR)/include/asm/./kvm*.h \ $(LINUX)/arch/$(ARCH_DIR)/include/asm/./vmx*.h \ $(LINUX)/arch/$(ARCH_DIR)/include/asm/./svm*.h \ - $(LINUX)/arch/$(ARCH_DIR)/include/asm/./virtext*.h + $(LINUX)/arch/$(ARCH_DIR)/include/asm/./virtext*.h \ + $(LINUX)/arch/$(ARCH_DIR)/include/asm/./msidef*.h header-sync: rm -rf $T diff --git a/qemu/hw/i8259.c b/qemu/hw/i8259.c index 9cb3941..025f993 100644 --- a/qemu/hw/i8259.c +++ b/qemu/hw/i8259.c @@ -189,8 +189,10 @@ static void i8259_set_irq(void *opaque, int irq, int level) if (kvm_enabled()) { int pic_ret; if (kvm_set_irq(irq, level, &pic_ret)) { +#ifndef TARGET_IA64 if (pic_ret != 0) apic_set_irq_delivered(); +#endif return; } } diff --git a/qemu/hw/ipf.c b/qemu/hw/ipf.c index eb9aaec..73dac18 100644 --- a/qemu/hw/ipf.c +++ b/qemu/hw/ipf.c @@ -701,7 +701,7 @@ void ioapic_set_irq(void *opaque, int irq_num, int level) 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, NULL)) return; } }