public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
From: Marcelo Tosatti <mtosatti@redhat.com>
To: "Zhang, Yang" <yang.zhang@intel.com>
Cc: "kvm-ia64@vger.kernel.org" <kvm-ia64@vger.kernel.org>,
	"kvm@vger.kernel.org" <kvm@vger.kernel.org>,
	Avi Kivity <avi@redhat.com>,
	"Zhang, Xiantao" <xiantao.zhang@intel.com>
Subject: Re: [PATCH] kvm : qemu : fix compilation error in kvm-userspace for ia64
Date: Tue, 3 Mar 2009 10:32:31 -0300	[thread overview]
Message-ID: <20090303133231.GE15492@amt.cnet> (raw)
In-Reply-To: <10C63FAD690C13458F0B32BCED571F1406D6778C@pdsmsx502.ccr.corp.intel.com>

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



  parent reply	other threads:[~2009-03-03 13:33 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-03  3:38 [PATCH] kvm : qemu : fix compilation error in kvm-userspace for ia64 Zhang, Yang
2009-03-03  4:02 ` Zhang, Yang
2009-03-03 13:32 ` Marcelo Tosatti [this message]
2009-03-05  1:36   ` Zhang, Yang
2009-03-05  1:51     ` Marcelo Tosatti
2009-03-05  1:55       ` Zhang, Yang
  -- strict thread matches above, loose matches on Subject: below --
2009-03-03  3:50 Zhang, Xiantao
2009-03-03  3:50 ` Zhang, Yang
2009-04-02  1:56 Zhang, Yang
2009-04-02  9:58 ` Avi Kivity

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090303133231.GE15492@amt.cnet \
    --to=mtosatti@redhat.com \
    --cc=avi@redhat.com \
    --cc=kvm-ia64@vger.kernel.org \
    --cc=kvm@vger.kernel.org \
    --cc=xiantao.zhang@intel.com \
    --cc=yang.zhang@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox