[PATCH] kvm : qemu : fix compilation error in kvm-userspace for ia64

[PATCH] kvm : qemu : fix compilation error in kvm-userspace for ia64

[Zhang, Yang]

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

Hi
   	please to review it.
thanks

Best Regards
--yang

From 0cce141eae71bbb2012efd54ba38916c437cd030 Mon Sep 17 00:00:00 2001
From: Yang Zhang <yang.zhang@intel.com>
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 <yang.zhang@intel.com>
---
 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;
     }
 }
-- 
1.6.0.rc1

[-- Attachment #2: 0001-kvm-qemu-fix-compilation-error-in-kvm-userspace.patch --]
[-- Type: application/octet-stream, Size: 1942 bytes --]

From 0cce141eae71bbb2012efd54ba38916c437cd030 Mon Sep 17 00:00:00 2001
From: Yang Zhang <yang.zhang@intel.com>
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 <yang.zhang@intel.com>
---
 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;
     }
 }
-- 
1.6.0.rc1

RE: [PATCH] kvm : qemu : fix compilation error in kvm-userspace for

[Zhang, Yang]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="windows-1254", Size: 1144 bytes --]

ok, i see 


Best Regards
--yang

-----Original Message-----
From: Zhang, Xiantao 
Sent: 2009Äê3ÔÂ3ÈÕ 11:51
To: Zhang, Yang; kvm-ia64@vger.kernel.org
Cc: kvm@vger.kernel.org; Avi Kivity
Subject: RE: [PATCH] kvm : qemu : fix compilation error in kvm-userspace for ia64


> 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 

Yang, 
     Don't need sync msidef.h from kernel when do 'make sync', and just make a copy and place it in 'include-compat/asm-ia64' because it is only used for backward-compat with old kernels.  
Xiantao


ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¤¾oâk®ÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á

RE: [PATCH] kvm : qemu : fix compilation error in kvm-userspace for

[Zhang, Xiantao]

> 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 

Yang, 
     Don't need sync msidef.h from kernel when do 'make sync', and just make a copy and place it in 'include-compat/asm-ia64' because it is only used for backward-compat with old kernels.  
Xiantao

RE: [PATCH] kvm : qemu : fix compilation error in kvm-userspace for

[Zhang, Yang]

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

Hi
	please drop the previous patch. This is the modifide patch.
thanks

From 4cdda47ee9d1fb19697eed36b82c1d8d614a2d4e Mon Sep 17 00:00:00 2001
From: Yang Zhang <yang.zhang@intel.com>
Date: Mon, 2 Mar 2009 22:56:08 -0500
Subject: [PATCH] kvm : qemu : fix compilation error in kvm-userspace for ia64

when using make in kernel, it can not find msidef.h. This patch
fix this. And IA64 does not need apic_set_irq_delivered().

Signed-off-by: Yang Zhang <yang.zhang@intel.com>
---
 kernel/include-compat/asm-ia64/msidef.h |   42 +++++++++++++++++++++++++++++++
 qemu/hw/i8259.c                         |    2 +
 qemu/hw/ipf.c                           |    2 +-
 3 files changed, 45 insertions(+), 1 deletions(-)
 create mode 100644 kernel/include-compat/asm-ia64/msidef.h

diff --git a/kernel/include-compat/asm-ia64/msidef.h b/kernel/include-compat/asm-ia64/msidef.h
new file mode 100644
index 0000000..592c104
--- /dev/null
+++ b/kernel/include-compat/asm-ia64/msidef.h
@@ -0,0 +1,42 @@
+#ifndef _IA64_MSI_DEF_H
+#define _IA64_MSI_DEF_H
+
+/*
+ * Shifts for APIC-based data
+ */
+
+#define     MSI_DATA_VECTOR_SHIFT	0
+#define	    MSI_DATA_VECTOR(v)		(((u8)v) << MSI_DATA_VECTOR_SHIFT)
+#define     MSI_DATA_VECTOR_MASK	0xffffff00
+
+#define     MSI_DATA_DELIVERY_MODE_SHIFT	8
+#define     MSI_DATA_DELIVERY_FIXED	(0 << MSI_DATA_DELIVERY_MODE_SHIFT)
+#define     MSI_DATA_DELIVERY_LOWPRI	(1 << MSI_DATA_DELIVERY_MODE_SHIFT)
+
+#define     MSI_DATA_LEVEL_SHIFT	14
+#define     MSI_DATA_LEVEL_DEASSERT	(0 << MSI_DATA_LEVEL_SHIFT)
+#define     MSI_DATA_LEVEL_ASSERT	(1 << MSI_DATA_LEVEL_SHIFT)
+
+#define     MSI_DATA_TRIGGER_SHIFT	15
+#define     MSI_DATA_TRIGGER_EDGE	(0 << MSI_DATA_TRIGGER_SHIFT)
+#define     MSI_DATA_TRIGGER_LEVEL	(1 << MSI_DATA_TRIGGER_SHIFT)
+
+/*
+ * Shift/mask fields for APIC-based bus address
+ */
+
+#define     MSI_ADDR_DEST_ID_SHIFT	4
+#define     MSI_ADDR_HEADER		0xfee00000
+
+#define     MSI_ADDR_DEST_ID_MASK	0xfff0000f
+#define     MSI_ADDR_DEST_ID_CPU(cpu)	((cpu) << MSI_ADDR_DEST_ID_SHIFT)
+
+#define     MSI_ADDR_DEST_MODE_SHIFT	2
+#define     MSI_ADDR_DEST_MODE_PHYS	(0 << MSI_ADDR_DEST_MODE_SHIFT)
+#define	    MSI_ADDR_DEST_MODE_LOGIC	(1 << MSI_ADDR_DEST_MODE_SHIFT)
+
+#define     MSI_ADDR_REDIRECTION_SHIFT	3
+#define     MSI_ADDR_REDIRECTION_CPU	(0 << MSI_ADDR_REDIRECTION_SHIFT)
+#define     MSI_ADDR_REDIRECTION_LOWPRI	(1 << MSI_ADDR_REDIRECTION_SHIFT)
+
+#endif/* _IA64_MSI_DEF_H */
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;
     }
 }
-- 
1.6.0.rc1

[-- Attachment #2: 0001-kvm-qemu-fix-compilation-error-in-kvm-userspace.patch --]
[-- Type: application/octet-stream, Size: 3216 bytes --]

From 4cdda47ee9d1fb19697eed36b82c1d8d614a2d4e Mon Sep 17 00:00:00 2001
From: Yang Zhang <yang.zhang@intel.com>
Date: Mon, 2 Mar 2009 22:56:08 -0500
Subject: [PATCH] kvm : qemu : fix compilation error in kvm-userspace for ia64

when using make in kernel, it can not find msidef.h. This patch
fix this. And IA64 does not need apic_set_irq_delivered().

Signed-off-by: Yang Zhang <yang.zhang@intel.com>
---
 kernel/include-compat/asm-ia64/msidef.h |   42 +++++++++++++++++++++++++++++++
 qemu/hw/i8259.c                         |    2 +
 qemu/hw/ipf.c                           |    2 +-
 3 files changed, 45 insertions(+), 1 deletions(-)
 create mode 100644 kernel/include-compat/asm-ia64/msidef.h

diff --git a/kernel/include-compat/asm-ia64/msidef.h b/kernel/include-compat/asm-ia64/msidef.h
new file mode 100644
index 0000000..592c104
--- /dev/null
+++ b/kernel/include-compat/asm-ia64/msidef.h
@@ -0,0 +1,42 @@
+#ifndef _IA64_MSI_DEF_H
+#define _IA64_MSI_DEF_H
+
+/*
+ * Shifts for APIC-based data
+ */
+
+#define     MSI_DATA_VECTOR_SHIFT	0
+#define	    MSI_DATA_VECTOR(v)		(((u8)v) << MSI_DATA_VECTOR_SHIFT)
+#define     MSI_DATA_VECTOR_MASK	0xffffff00
+
+#define     MSI_DATA_DELIVERY_MODE_SHIFT	8
+#define     MSI_DATA_DELIVERY_FIXED	(0 << MSI_DATA_DELIVERY_MODE_SHIFT)
+#define     MSI_DATA_DELIVERY_LOWPRI	(1 << MSI_DATA_DELIVERY_MODE_SHIFT)
+
+#define     MSI_DATA_LEVEL_SHIFT	14
+#define     MSI_DATA_LEVEL_DEASSERT	(0 << MSI_DATA_LEVEL_SHIFT)
+#define     MSI_DATA_LEVEL_ASSERT	(1 << MSI_DATA_LEVEL_SHIFT)
+
+#define     MSI_DATA_TRIGGER_SHIFT	15
+#define     MSI_DATA_TRIGGER_EDGE	(0 << MSI_DATA_TRIGGER_SHIFT)
+#define     MSI_DATA_TRIGGER_LEVEL	(1 << MSI_DATA_TRIGGER_SHIFT)
+
+/*
+ * Shift/mask fields for APIC-based bus address
+ */
+
+#define     MSI_ADDR_DEST_ID_SHIFT	4
+#define     MSI_ADDR_HEADER		0xfee00000
+
+#define     MSI_ADDR_DEST_ID_MASK	0xfff0000f
+#define     MSI_ADDR_DEST_ID_CPU(cpu)	((cpu) << MSI_ADDR_DEST_ID_SHIFT)
+
+#define     MSI_ADDR_DEST_MODE_SHIFT	2
+#define     MSI_ADDR_DEST_MODE_PHYS	(0 << MSI_ADDR_DEST_MODE_SHIFT)
+#define	    MSI_ADDR_DEST_MODE_LOGIC	(1 << MSI_ADDR_DEST_MODE_SHIFT)
+
+#define     MSI_ADDR_REDIRECTION_SHIFT	3
+#define     MSI_ADDR_REDIRECTION_CPU	(0 << MSI_ADDR_REDIRECTION_SHIFT)
+#define     MSI_ADDR_REDIRECTION_LOWPRI	(1 << MSI_ADDR_REDIRECTION_SHIFT)
+
+#endif/* _IA64_MSI_DEF_H */
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;
     }
 }
-- 
1.6.0.rc1

Re: [PATCH] kvm : qemu : fix compilation error in kvm-userspace

[Marcelo Tosatti]

On Tue, Mar 03, 2009 at 11:38:17AM +0800, Zhang, Yang wrote:
> Hi
>    	please to review it.
> thanks
> 
> Best Regards
> --yang
> 
> >From 0cce141eae71bbb2012efd54ba38916c437cd030 Mon Sep 17 00:00:00 2001
> From: Yang Zhang <yang.zhang@intel.com>
> 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 <yang.zhang@intel.com>
> ---
>  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

Why don't you define apic_set_irq_delivered for IA64?

>              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;
>      }
>  }
> -- 
> 1.6.0.rc1

RE: [PATCH] kvm : qemu : fix compilation error in kvm-userspace for

[Zhang, Yang]

Marcelo Tosatti wrote:
> On Tue, Mar 03, 2009 at 11:38:17AM +0800, Zhang, Yang wrote:
>> 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
> 
> Why don't you define apic_set_irq_delivered for IA64?

seems right, But i cannot find the proper place to define it. 
And i think we can do this at the time of we need to use it.

Re: [PATCH] kvm : qemu : fix compilation error in kvm-userspace for

[Marcelo Tosatti]

On Thu, Mar 05, 2009 at 09:36:13AM +0800, Zhang, Yang wrote:
> Marcelo Tosatti wrote:
> > On Tue, Mar 03, 2009 at 11:38:17AM +0800, Zhang, Yang wrote:
> >> 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
> > 
> > Why don't you define apic_set_irq_delivered for IA64?
> 
> seems right, But i cannot find the proper place to define it. 
> And i think we can do this at the time of we need to use it.

The thinking is avoid code from piling in kvm-userspace when it belongs
in upstream QEMU. #ifdef's like that are ugly, but OK. Will apply.

Can you please submit this one to be included in QEMU upstream?

commit f759e44e04f03798d83de53d2c295965c68126a2
Author: Yang <yang.zhang@intel.com>
Date:   Thu Jan 15 13:03:53 2009 +0800

    kvm: qemu: Save ia64 nvram

Thanks

RE: [PATCH] kvm : qemu : fix compilation error in kvm-userspace for

[Zhang, Yang]

Marcelo Tosatti wrote:
> On Thu, Mar 05, 2009 at 09:36:13AM +0800, Zhang, Yang wrote:
>> seems right, But i cannot find the proper place to define it.
>> And i think we can do this at the time of we need to use it.
> 
> The thinking is avoid code from piling in kvm-userspace when it
> belongs in upstream QEMU. #ifdef's like that are ugly, but OK. Will
> apply. 

Thank you.

> Can you please submit this one to be included in QEMU upstream?
> 
> commit f759e44e04f03798d83de53d2c295965c68126a2
> Author: Yang <yang.zhang@intel.com>
> Date:   Thu Jan 15 13:03:53 2009 +0800
> 
>     kvm: qemu: Save ia64 nvram
> 

Ok.

[PATCH] kvm : qemu : fix compilation error in kvm-userspace for ia64

[Zhang, Yang]

when using make in kernel, it can not find msidef.h. This patch
fix this. 

Signed-off-by: Yang Zhang <yang.zhang@intel.com>

diff --git a/kernel/include-compat/asm-ia64/msidef.h b/kernel/include-compat/asm-ia64/msidef.h
new file mode 100644
index 0000000..592c104
--- /dev/null
+++ b/kernel/include-compat/asm-ia64/msidef.h
@@ -0,0 +1,42 @@
+#ifndef _IA64_MSI_DEF_H
+#define _IA64_MSI_DEF_H
+
+/*
+ * Shifts for APIC-based data
+ */
+
+#define     MSI_DATA_VECTOR_SHIFT	0
+#define	    MSI_DATA_VECTOR(v)		(((u8)v) << MSI_DATA_VECTOR_SHIFT)
+#define     MSI_DATA_VECTOR_MASK	0xffffff00
+
+#define     MSI_DATA_DELIVERY_MODE_SHIFT	8
+#define     MSI_DATA_DELIVERY_FIXED	(0 << MSI_DATA_DELIVERY_MODE_SHIFT)
+#define     MSI_DATA_DELIVERY_LOWPRI	(1 << MSI_DATA_DELIVERY_MODE_SHIFT)
+
+#define     MSI_DATA_LEVEL_SHIFT	14
+#define     MSI_DATA_LEVEL_DEASSERT	(0 << MSI_DATA_LEVEL_SHIFT)
+#define     MSI_DATA_LEVEL_ASSERT	(1 << MSI_DATA_LEVEL_SHIFT)
+
+#define     MSI_DATA_TRIGGER_SHIFT	15
+#define     MSI_DATA_TRIGGER_EDGE	(0 << MSI_DATA_TRIGGER_SHIFT)
+#define     MSI_DATA_TRIGGER_LEVEL	(1 << MSI_DATA_TRIGGER_SHIFT)
+
+/*
+ * Shift/mask fields for APIC-based bus address
+ */
+
+#define     MSI_ADDR_DEST_ID_SHIFT	4
+#define     MSI_ADDR_HEADER		0xfee00000
+
+#define     MSI_ADDR_DEST_ID_MASK	0xfff0000f
+#define     MSI_ADDR_DEST_ID_CPU(cpu)	((cpu) << MSI_ADDR_DEST_ID_SHIFT)
+
+#define     MSI_ADDR_DEST_MODE_SHIFT	2
+#define     MSI_ADDR_DEST_MODE_PHYS	(0 << MSI_ADDR_DEST_MODE_SHIFT)
+#define	    MSI_ADDR_DEST_MODE_LOGIC	(1 << MSI_ADDR_DEST_MODE_SHIFT)
+
+#define     MSI_ADDR_REDIRECTION_SHIFT	3
+#define     MSI_ADDR_REDIRECTION_CPU	(0 << MSI_ADDR_REDIRECTION_SHIFT)
+#define     MSI_ADDR_REDIRECTION_LOWPRI	(1 << MSI_ADDR_REDIRECTION_SHIFT)
+
+#endif/* _IA64_MSI_DEF_H */
-- 
1.6.0.rc1

Re: [PATCH] kvm : qemu : fix compilation error in kvm-userspace for

[Avi Kivity]

Zhang, Yang wrote:
> when using make in kernel, it can not find msidef.h. This patch
> fix this. 
>   

Applied, thanks.

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