[PATCH] Fix KVM/IA-64 build issue in latest kvm.git.

[PATCH] Fix KVM/IA-64 build issue in latest kvm.git.

[Zhang, Xiantao]

[-- Attachment #1: Type: text/plain, Size: 1351 bytes --]

>From d53dfacedea40213382694229700d02bfa72d923 Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Tue, 19 Aug 2008 17:33:21 +0800
Subject: [PATCH] KVM: KVM/IA-64: Fix kvm/ia64's build issue.

Disable irq ack notification for ia64.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
 virt/kvm/ioapic.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c
index 515cd7c..992199b 100644
--- a/virt/kvm/ioapic.c
+++ b/virt/kvm/ioapic.c
@@ -39,7 +39,10 @@
 
 #include "ioapic.h"
 #include "lapic.h"
+
+#ifdef CONFIG_X86
 #include "irq.h"
+#endif
 
 #if 0
 #define ioapic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg)
@@ -293,7 +296,9 @@ static void __kvm_ioapic_update_eoi(struct
kvm_ioapic *ioapic, int gsi,
 
 	ent = &ioapic->redirtbl[gsi];
 
+#ifdef CONFIG_X86
 	kvm_notify_acked_irq(ioapic->kvm, gsi);
+#endif
 
 	if (trigger_mode == IOAPIC_LEVEL_TRIG) {
 		ASSERT(ent->fields.trig_mode == IOAPIC_LEVEL_TRIG);
@@ -386,7 +391,7 @@ static void ioapic_mmio_write(struct kvm_io_device
*this, gpa_t addr, int len,
 		break;
 #ifdef	CONFIG_IA64
 	case IOAPIC_REG_EOI:
-		kvm_ioapic_update_eoi(ioapic->kvm, data);
+		kvm_ioapic_update_eoi(ioapic->kvm, data,
IOAPIC_LEVEL_TRIG);
 		break;
 #endif
 
-- 
1.5.1

[-- Attachment #2: 0001-KVM-KVM-IA-64-Fix-kvm-ia64-s-build-issue.patch --]
[-- Type: application/octet-stream, Size: 1301 bytes --]

From d53dfacedea40213382694229700d02bfa72d923 Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Tue, 19 Aug 2008 17:33:21 +0800
Subject: [PATCH] KVM: KVM/IA-64: Fix kvm/ia64's build issue.

Disable irq ack notification for ia64.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
 virt/kvm/ioapic.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c
index 515cd7c..992199b 100644
--- a/virt/kvm/ioapic.c
+++ b/virt/kvm/ioapic.c
@@ -39,7 +39,10 @@
 
 #include "ioapic.h"
 #include "lapic.h"
+
+#ifdef CONFIG_X86
 #include "irq.h"
+#endif
 
 #if 0
 #define ioapic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg)
@@ -293,7 +296,9 @@ static void __kvm_ioapic_update_eoi(struct kvm_ioapic *ioapic, int gsi,
 
 	ent = &ioapic->redirtbl[gsi];
 
+#ifdef CONFIG_X86
 	kvm_notify_acked_irq(ioapic->kvm, gsi);
+#endif
 
 	if (trigger_mode == IOAPIC_LEVEL_TRIG) {
 		ASSERT(ent->fields.trig_mode == IOAPIC_LEVEL_TRIG);
@@ -386,7 +391,7 @@ static void ioapic_mmio_write(struct kvm_io_device *this, gpa_t addr, int len,
 		break;
 #ifdef	CONFIG_IA64
 	case IOAPIC_REG_EOI:
-		kvm_ioapic_update_eoi(ioapic->kvm, data);
+		kvm_ioapic_update_eoi(ioapic->kvm, data, IOAPIC_LEVEL_TRIG);
 		break;
 #endif
 
-- 
1.5.1

Re: [PATCH] Fix KVM/IA-64 build issue in latest kvm.git.

[Avi Kivity]

Zhang, Xiantao wrote:
> From d53dfacedea40213382694229700d02bfa72d923 Mon Sep 17 00:00:00 2001
> From: Xiantao Zhang <xiantao.zhang@intel.com>
> Date: Tue, 19 Aug 2008 17:33:21 +0800
> Subject: [PATCH] KVM: KVM/IA-64: Fix kvm/ia64's build issue.
>
> Disable irq ack notification for ia64.
> Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
> ---
>  virt/kvm/ioapic.c |    7 ++++++-
>  1 files changed, 6 insertions(+), 1 deletions(-)
>
> diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c
> index 515cd7c..992199b 100644
> --- a/virt/kvm/ioapic.c
> +++ b/virt/kvm/ioapic.c
> @@ -39,7 +39,10 @@
>  
>  #include "ioapic.h"
>  #include "lapic.h"
> +
> +#ifdef CONFIG_X86
>  #include "irq.h"
> +#endif
>   

Please keep the include; add an ia64 specific irq.h instead.

>  
>  #if 0
>  #define ioapic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg)
> @@ -293,7 +296,9 @@ static void __kvm_ioapic_update_eoi(struct
> kvm_ioapic *ioapic, int gsi,
>  
>  	ent = &ioapic->redirtbl[gsi];
>  
> +#ifdef CONFIG_X86
>  	kvm_notify_acked_irq(ioapic->kvm, gsi);
> +#endif
>  
>   

Keep this as well.  You can have a nop-op irq notification API, and 
later merge with x86.  I think you will need irq ack notification if you 
implement device assignment, or for improved timekeeping.


-- 
error compiling committee.c: too many arguments to function

RE: [PATCH] Fix KVM/IA-64 build issue in latest kvm.git.

[Zhang, Xiantao]

[-- Attachment #1: Type: text/plain, Size: 1451 bytes --]

OK, also fine to me! Attached the updated patch. 
Thanks
Xiantao
Avi Kivity wrote:
> Zhang, Xiantao wrote:
>> From d53dfacedea40213382694229700d02bfa72d923 Mon Sep 17 00:00:00
>> 2001 From: Xiantao Zhang <xiantao.zhang@intel.com>
>> Date: Tue, 19 Aug 2008 17:33:21 +0800
>> Subject: [PATCH] KVM: KVM/IA-64: Fix kvm/ia64's build issue.
>> 
>> Disable irq ack notification for ia64.
>> Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com> ---
>>  virt/kvm/ioapic.c |    7 ++++++-
>>  1 files changed, 6 insertions(+), 1 deletions(-)
>> 
>> diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c
>> index 515cd7c..992199b 100644
>> --- a/virt/kvm/ioapic.c
>> +++ b/virt/kvm/ioapic.c
>> @@ -39,7 +39,10 @@
>> 
>>  #include "ioapic.h"
>>  #include "lapic.h"
>> +
>> +#ifdef CONFIG_X86
>>  #include "irq.h"
>> +#endif
>> 
> 
> Please keep the include; add an ia64 specific irq.h instead.
> 
>> 
>>  #if 0
>>  #define ioapic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg)
>> @@ -293,7 +296,9 @@ static void __kvm_ioapic_update_eoi(struct
>> kvm_ioapic *ioapic, int gsi, 
>> 
>>  	ent = &ioapic->redirtbl[gsi];
>> 
>> +#ifdef CONFIG_X86
>>  	kvm_notify_acked_irq(ioapic->kvm, gsi);
>> +#endif
>> 
>> 
> 
> Keep this as well.  You can have a nop-op irq notification API, and
> later merge with x86.  I think you will need irq ack notification if
> you implement device assignment, or for improved timekeeping.


[-- Attachment #2: 0001-KVM-kvm-ia64-Leave-notify_acked_irq-as-blank-funt.patch --]
[-- Type: application/octet-stream, Size: 2145 bytes --]

From e618bb53e2b24fc0151f6f9b9ce92f449f57a000 Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Tue, 19 Aug 2008 20:48:03 +0800
Subject: [PATCH] KVM: kvm/ia64 : Leave notify_acked_irq as blank funtion for fixing build issue.

Before enabling notify_acked_irq for ia64, leave the related APIs as nop-op first.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
 arch/ia64/kvm/irq.h |   32 ++++++++++++++++++++++++++++++++
 virt/kvm/ioapic.c   |    2 +-
 2 files changed, 33 insertions(+), 1 deletions(-)
 create mode 100644 arch/ia64/kvm/irq.h

diff --git a/arch/ia64/kvm/irq.h b/arch/ia64/kvm/irq.h
new file mode 100644
index 0000000..f63f31f
--- /dev/null
+++ b/arch/ia64/kvm/irq.h
@@ -0,0 +1,32 @@
+/*
+ * irq.h: In-kernel interrupt controller related definitions
+ * Copyright (c) 2008, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place - Suite 330, Boston, MA 02111-1307 USA.
+ * Authors:
+ *   Xiantao Zhang <xiantao.zhang@intel.com>
+ *
+ */
+
+#ifndef __IRQ_H
+#define __IRQ_H
+
+struct kvm;
+
+static void kvm_notify_acked_irq(struct kvm *kvm, unsigned gsi)
+{
+
+}
+
+#endif
diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c
index 515cd7c..53772bb 100644
--- a/virt/kvm/ioapic.c
+++ b/virt/kvm/ioapic.c
@@ -386,7 +386,7 @@ static void ioapic_mmio_write(struct kvm_io_device *this, gpa_t addr, int len,
 		break;
 #ifdef	CONFIG_IA64
 	case IOAPIC_REG_EOI:
-		kvm_ioapic_update_eoi(ioapic->kvm, data);
+		kvm_ioapic_update_eoi(ioapic->kvm, data, IOAPIC_LEVEL_TRIG);
 		break;
 #endif
 
-- 
1.5.1

Re: [PATCH] Fix KVM/IA-64 build issue in latest kvm.git.

[Avi Kivity]

Zhang, Xiantao wrote:
> OK, also fine to me! Attached the updated patch. 
>   

Applied, thanks (modified to static inline to avoid warnings).


-- 
error compiling committee.c: too many arguments to function