diff mbox

fix ia64 compilation

Message ID 20090311103222.GB19724@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Gleb Natapov March 11, 2009, 10:32 a.m. UTC 
Signed-off-by: Gleb Natapov <gleb@redhat.com>
--
			Gleb.
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Zhang, Xiantao March 23, 2009, 9:05 a.m. UTC | #1 
Hi, Avi 
 
  Please help to pick this patch which fixing ia64 build and queue it for kvm-85.  Thanks!

Acked-by: Xiantao Zhang <xiantao.zhang@intel.com>
Xiantao 

Gleb Natapov wrote:
> Signed-off-by: Gleb Natapov <gleb@redhat.com>
> diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
> index c25347f..906d597 100644
> --- a/arch/ia64/kvm/kvm-ia64.c
> +++ b/arch/ia64/kvm/kvm-ia64.c
> @@ -327,7 +327,7 @@ static void vcpu_deliver_ipi(struct kvm_vcpu
>  	*vcpu, uint64_t dm, case SAPIC_PMI:
>  	default:
>  		printk(KERN_ERR"kvm: Unimplemented Deliver reserved IPI!\n");
> -		return
> +		return;
>  	}
>  	__apic_accept_irq(vcpu, vector);
>  }
> @@ -1919,6 +1919,7 @@ int kvm_apic_compare_prio(struct kvm_vcpu
>  *vcpu1, struct kvm_vcpu *vcpu2) int kvm_apic_match_dest(struct
>  		kvm_vcpu *vcpu, struct kvm_lapic *source, int short_hand, int
>  dest, int dest_mode) {
> +	struct kvm_lapic *target = vcpu->arch.apic;
>  	return (dest_mode == 0) ?
>  		kvm_apic_match_physical_addr(target, dest) :
>  		kvm_apic_match_logical_addr(target, dest);
> diff --git a/arch/ia64/kvm/lapic.h b/arch/ia64/kvm/lapic.h
> index 2323233..ee541ce 100644
> --- a/arch/ia64/kvm/lapic.h
> +++ b/arch/ia64/kvm/lapic.h
> @@ -23,7 +23,7 @@ int kvm_apic_match_logical_addr(struct kvm_lapic
>  *apic, u8 mda); int kvm_apic_match_dest(struct kvm_vcpu *vcpu,
>  		struct kvm_lapic *source, int short_hand, int dest, int dest_mode);
>  int kvm_apic_compare_prio(struct kvm_vcpu *vcpu1, struct kvm_vcpu
> *vcpu2); -bool kvm_apic_present(struct kvm_vcpu *vcpu);
>  int kvm_apic_set_irq(struct kvm_vcpu *vcpu, struct kvm_lapic_irq
> *irq); +#define kvm_apic_present(x) (true)
> 
>  #endif
> diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h
> index 36b8b15..a587f83 100644
> --- a/arch/x86/kvm/lapic.h
> +++ b/arch/x86/kvm/lapic.h
> @@ -38,7 +38,6 @@ void kvm_set_apic_base(struct kvm_vcpu *vcpu, u64
>  data); void kvm_apic_post_state_restore(struct kvm_vcpu *vcpu);
>  int kvm_lapic_enabled(struct kvm_vcpu *vcpu);
>  bool kvm_apic_present(struct kvm_vcpu *vcpu);
> -bool kvm_lapic_present(struct kvm_vcpu *vcpu);
>  int kvm_lapic_find_highest_irr(struct kvm_vcpu *vcpu);
> 
>  void kvm_lapic_set_vapic_addr(struct kvm_vcpu *vcpu, gpa_t
> vapic_addr); 
> diff --git a/virt/kvm/irq_comm.c b/virt/kvm/irq_comm.c
> index c3f3b9f..4fa1f60 100644
> --- a/virt/kvm/irq_comm.c
> +++ b/virt/kvm/irq_comm.c
> @@ -22,6 +22,9 @@
>  #include <linux/kvm_host.h>
> 
>  #include <asm/msidef.h>
> +#ifdef CONFIG_IA64
> +#include <asm/iosapic.h>
> +#endif
> 
>  #include "irq.h"
> 
> @@ -43,6 +46,16 @@ static int kvm_set_ioapic_irq(struct
>  	kvm_kernel_irq_routing_entry *e, return
>  kvm_ioapic_set_irq(kvm->arch.vioapic, e->irqchip.pin, level); }
> 
> +inline static bool kvm_is_dm_lowest_prio(struct kvm_lapic_irq *irq)
> +{
> +#ifdef CONFIG_IA64
> +	return irq->delivery_mode ==
> +		(IOSAPIC_LOWEST_PRIORITY << IOSAPIC_DELIVERY_SHIFT);
> +#else
> +	return irq->delivery_mode == APIC_DM_LOWEST;
> +#endif
> +}
> +
>  int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src,
>  		struct kvm_lapic_irq *irq)
>  {
> @@ -50,7 +63,7 @@ int kvm_irq_delivery_to_apic(struct kvm *kvm,
>  	struct kvm_lapic *src, struct kvm_vcpu *vcpu, *lowest = NULL;
> 
>  	if (irq->dest_mode == 0 && irq->dest_id == 0xff &&
> -			irq->delivery_mode == APIC_DM_LOWEST)
> +			kvm_is_dm_lowest_prio(irq))
>  		printk(KERN_INFO "kvm: apic: phys broadcast and lowest prio\n");
> 
>  	for (i = 0; i < KVM_MAX_VCPUS; i++) {
> @@ -63,7 +76,7 @@ int kvm_irq_delivery_to_apic(struct kvm *kvm,
>  					struct kvm_lapic *src, irq->dest_id, irq->dest_mode))
>  			continue;
> 
> -		if (irq->delivery_mode != APIC_DM_LOWEST) {
> +		if (!kvm_is_dm_lowest_prio(irq)) {
>  			if (r < 0)
>  				r = 0;
>  			r += kvm_apic_set_irq(vcpu, irq);
> --
> 			Gleb.

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Avi Kivity March 23, 2009, 9:12 a.m. UTC | #2 
Gleb Natapov wrote:
> Signed-off-by: Gleb Natapov <gleb@redhat.com>
>   

Applied, thanks.
diff mbox

Patch

diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index c25347f..906d597 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -327,7 +327,7 @@  static void vcpu_deliver_ipi(struct kvm_vcpu *vcpu, uint64_t dm,
 	case SAPIC_PMI:
 	default:
 		printk(KERN_ERR"kvm: Unimplemented Deliver reserved IPI!\n");
-		return
+		return;
 	}
 	__apic_accept_irq(vcpu, vector);
 }
@@ -1919,6 +1919,7 @@  int kvm_apic_compare_prio(struct kvm_vcpu *vcpu1, struct kvm_vcpu *vcpu2)
 int kvm_apic_match_dest(struct kvm_vcpu *vcpu, struct kvm_lapic *source,
 		int short_hand, int dest, int dest_mode)
 {
+	struct kvm_lapic *target = vcpu->arch.apic;
 	return (dest_mode == 0) ?
 		kvm_apic_match_physical_addr(target, dest) :
 		kvm_apic_match_logical_addr(target, dest);
diff --git a/arch/ia64/kvm/lapic.h b/arch/ia64/kvm/lapic.h
index 2323233..ee541ce 100644
--- a/arch/ia64/kvm/lapic.h
+++ b/arch/ia64/kvm/lapic.h
@@ -23,7 +23,7 @@  int kvm_apic_match_logical_addr(struct kvm_lapic *apic, u8 mda);
 int kvm_apic_match_dest(struct kvm_vcpu *vcpu, struct kvm_lapic *source,
 		int short_hand, int dest, int dest_mode);
 int kvm_apic_compare_prio(struct kvm_vcpu *vcpu1, struct kvm_vcpu *vcpu2);
-bool kvm_apic_present(struct kvm_vcpu *vcpu);
 int kvm_apic_set_irq(struct kvm_vcpu *vcpu, struct kvm_lapic_irq *irq);
+#define kvm_apic_present(x) (true)
 
 #endif
diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h
index 36b8b15..a587f83 100644
--- a/arch/x86/kvm/lapic.h
+++ b/arch/x86/kvm/lapic.h
@@ -38,7 +38,6 @@  void kvm_set_apic_base(struct kvm_vcpu *vcpu, u64 data);
 void kvm_apic_post_state_restore(struct kvm_vcpu *vcpu);
 int kvm_lapic_enabled(struct kvm_vcpu *vcpu);
 bool kvm_apic_present(struct kvm_vcpu *vcpu);
-bool kvm_lapic_present(struct kvm_vcpu *vcpu);
 int kvm_lapic_find_highest_irr(struct kvm_vcpu *vcpu);
 
 void kvm_lapic_set_vapic_addr(struct kvm_vcpu *vcpu, gpa_t vapic_addr);
diff --git a/virt/kvm/irq_comm.c b/virt/kvm/irq_comm.c
index c3f3b9f..4fa1f60 100644
--- a/virt/kvm/irq_comm.c
+++ b/virt/kvm/irq_comm.c
@@ -22,6 +22,9 @@ 
 #include <linux/kvm_host.h>
 
 #include <asm/msidef.h>
+#ifdef CONFIG_IA64
+#include <asm/iosapic.h>
+#endif
 
 #include "irq.h"
 
@@ -43,6 +46,16 @@  static int kvm_set_ioapic_irq(struct kvm_kernel_irq_routing_entry *e,
 	return kvm_ioapic_set_irq(kvm->arch.vioapic, e->irqchip.pin, level);
 }
 
+inline static bool kvm_is_dm_lowest_prio(struct kvm_lapic_irq *irq)
+{
+#ifdef CONFIG_IA64
+	return irq->delivery_mode ==
+		(IOSAPIC_LOWEST_PRIORITY << IOSAPIC_DELIVERY_SHIFT);
+#else
+	return irq->delivery_mode == APIC_DM_LOWEST;
+#endif
+}
+
 int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src,
 		struct kvm_lapic_irq *irq)
 {
@@ -50,7 +63,7 @@  int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src,
 	struct kvm_vcpu *vcpu, *lowest = NULL;
 
 	if (irq->dest_mode == 0 && irq->dest_id == 0xff &&
-			irq->delivery_mode == APIC_DM_LOWEST)
+			kvm_is_dm_lowest_prio(irq))
 		printk(KERN_INFO "kvm: apic: phys broadcast and lowest prio\n");
 
 	for (i = 0; i < KVM_MAX_VCPUS; i++) {
@@ -63,7 +76,7 @@  int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src,
 					irq->dest_id, irq->dest_mode))
 			continue;
 
-		if (irq->delivery_mode != APIC_DM_LOWEST) {
+		if (!kvm_is_dm_lowest_prio(irq)) {
 			if (r < 0)
 				r = 0;
 			r += kvm_apic_set_irq(vcpu, irq);