kvm-ia64.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Zhang, Yang" <yang.zhang@intel.com>
To: kvm-ia64@vger.kernel.org
Subject: [PATCH] kvm: ia64: fix up compilation error
Date: Mon, 18 May 2009 09:39:48 +0000	[thread overview]
Message-ID: <10C63FAD690C13458F0B32BCED571F14026D63AA73@pdsmsx502.ccr.corp.intel.com> (raw)

[-- 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;
 

             reply	other threads:[~2009-05-18  9:39 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-05-18  9:39 Zhang, Yang [this message]
2009-05-18  9:47 ` [PATCH] kvm: ia64: fix up compilation error 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=10C63FAD690C13458F0B32BCED571F14026D63AA73@pdsmsx502.ccr.corp.intel.com \
    --to=yang.zhang@intel.com \
    --cc=kvm-ia64@vger.kernel.org \
    /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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).