[PATCH] kvm: ia64: fix up compilation error

[PATCH] kvm: ia64: fix up compilation error

[Zhang, Yang]

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

add iommu_flags for struct kvm_arch in ia64

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

diff --git a/arch/ia64/include/asm/kvm_host.h b/arch/ia64/include/asm/kvm_host.h
index 589536f..012aca0 100644
--- a/arch/ia64/include/asm/kvm_host.h
+++ b/arch/ia64/include/asm/kvm_host.h
@@ -468,6 +468,7 @@ struct kvm_arch {
 	int		online_vcpus;
 	int		is_sn2;
 
+	int iommu_flags;
 	struct kvm_ioapic *vioapic;
 	struct kvm_vm_stat stat;
 	struct kvm_sal_data rdv_sal_data;
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 716a4ec..4eba715 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -395,7 +395,7 @@ struct kvm_arch{
 	struct list_head active_mmu_pages;
 	struct list_head assigned_dev_head;
 	struct iommu_domain *iommu_domain;
-#define KVM_IOMMU_CACHE_COHERENCY	0x1
+
 	int iommu_flags;
 	struct kvm_pic *vpic;
 	struct kvm_ioapic *vioapic;
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 2b8df0c..ec0f004 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -42,6 +42,8 @@
 
 #define KVM_USERSPACE_IRQ_SOURCE_ID	0
 
+#define KVM_IOMMU_CACHE_COHERENCY	0x1
+
 struct kvm_vcpu;
 extern struct kmem_cache *kvm_vcpu_cache;
 

[-- Attachment #2: 0001-kvm-ia64-fix-up-compilation-error.patch --]
[-- Type: application/octet-stream, Size: 1537 bytes --]

From 6d3304fe784314be4e6eb6d705d7546c75ef2009 Mon Sep 17 00:00:00 2001
From: Yang Zhang <Yang Zhang>
Date: Wed, 6 May 2009 20:52:39 -0400
Subject: [PATCH] kvm: ia64: fix up compilation error

add iommu_flags for struct kvm_arch in ia64

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

diff --git a/arch/ia64/include/asm/kvm_host.h b/arch/ia64/include/asm/kvm_host.h
index 589536f..012aca0 100644
--- a/arch/ia64/include/asm/kvm_host.h
+++ b/arch/ia64/include/asm/kvm_host.h
@@ -468,6 +468,7 @@ struct kvm_arch {
 	int		online_vcpus;
 	int		is_sn2;
 
+	int iommu_flags;
 	struct kvm_ioapic *vioapic;
 	struct kvm_vm_stat stat;
 	struct kvm_sal_data rdv_sal_data;
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 716a4ec..4eba715 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -395,7 +395,7 @@ struct kvm_arch{
 	struct list_head active_mmu_pages;
 	struct list_head assigned_dev_head;
 	struct iommu_domain *iommu_domain;
-#define KVM_IOMMU_CACHE_COHERENCY	0x1
+
 	int iommu_flags;
 	struct kvm_pic *vpic;
 	struct kvm_ioapic *vioapic;
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 2b8df0c..ec0f004 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -42,6 +42,8 @@
 
 #define KVM_USERSPACE_IRQ_SOURCE_ID	0
 
+#define KVM_IOMMU_CACHE_COHERENCY	0x1
+
 struct kvm_vcpu;
 extern struct kmem_cache *kvm_vcpu_cache;
 

Re: [PATCH] kvm: ia64: fix up compilation error

[Avi Kivity]

Zhang, Yang wrote:
> add iommu_flags for struct kvm_arch in ia64
>   

Thanks, I already fixed it (in the same way).

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