From patchwork Mon May 18 09:39:48 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Yang" X-Patchwork-Id: 24500 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n4I9gY16028215 for ; Mon, 18 May 2009 09:42:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757358AbZERJlh (ORCPT ); Mon, 18 May 2009 05:41:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758647AbZERJlf (ORCPT ); Mon, 18 May 2009 05:41:35 -0400 Received: from mga11.intel.com ([192.55.52.93]:41164 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758638AbZERJld (ORCPT ); Mon, 18 May 2009 05:41:33 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 18 May 2009 02:35:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.41,208,1241420400"; d="scan'208,223";a="691328843" Received: from pgsmsx603.gar.corp.intel.com ([10.221.43.87]) by fmsmga001.fm.intel.com with ESMTP; 18 May 2009 02:45:05 -0700 Received: from pdsmsx601.ccr.corp.intel.com (172.16.12.94) by pgsmsx603.gar.corp.intel.com (10.221.43.87) with Microsoft SMTP Server (TLS) id 8.1.358.0; Mon, 18 May 2009 17:40:29 +0800 Received: from pdsmsx502.ccr.corp.intel.com ([172.16.12.96]) by pdsmsx601.ccr.corp.intel.com ([172.16.12.94]) with mapi; Mon, 18 May 2009 17:40:00 +0800 From: "Zhang, Yang" To: "kvm-ia64@vger.kernel.org" CC: Avi Kivity , "kvm@vger.kernel.org" , "Zhang, Xiantao" Date: Mon, 18 May 2009 17:39:48 +0800 Subject: [PATCH] kvm: ia64: fix up compilation error Thread-Topic: [PATCH] kvm: ia64: fix up compilation error Thread-Index: AcnXnJWqtrErx0sBRHaZTk0Y67wZOw== Message-ID: <10C63FAD690C13458F0B32BCED571F14026D63AA73@pdsmsx502.ccr.corp.intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org add iommu_flags for struct kvm_arch in ia64 Signed-off-by: Yang Zhang Signed-off-by: Xiantao Zhang 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;