From patchwork Thu Jul 1 14:00:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 109133 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o61E21Ws030391 for ; Thu, 1 Jul 2010 14:02:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756228Ab0GAOA2 (ORCPT ); Thu, 1 Jul 2010 10:00:28 -0400 Received: from va3ehsobe001.messaging.microsoft.com ([216.32.180.11]:47987 "EHLO VA3EHSOBE001.bigfish.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756060Ab0GAOAY (ORCPT ); Thu, 1 Jul 2010 10:00:24 -0400 Received: from mail135-va3-R.bigfish.com (10.7.14.235) by VA3EHSOBE001.bigfish.com (10.7.40.21) with Microsoft SMTP Server id 8.1.340.0; Thu, 1 Jul 2010 14:00:24 +0000 Received: from mail135-va3 (localhost.localdomain [127.0.0.1]) by mail135-va3-R.bigfish.com (Postfix) with ESMTP id 9C57E18702B2; Thu, 1 Jul 2010 14:00:23 +0000 (UTC) X-SpamScore: 3 X-BigFish: VPS3(zza332jzz1202hzzz32i2a8h87h43h61h) X-Spam-TCS-SCL: 0:0 X-FB-DOMAIN-IP-MATCH: fail Received: from mail135-va3 (localhost.localdomain [127.0.0.1]) by mail135-va3 (MessageSwitch) id 127799282310380_13772; Thu, 1 Jul 2010 14:00:23 +0000 (UTC) Received: from VA3EHSMHS023.bigfish.com (unknown [10.7.14.246]) by mail135-va3.bigfish.com (Postfix) with ESMTP id F09415D0046; Thu, 1 Jul 2010 14:00:22 +0000 (UTC) Received: from ausb3extmailp01.amd.com (163.181.251.8) by VA3EHSMHS023.bigfish.com (10.7.99.33) with Microsoft SMTP Server (TLS) id 14.0.482.44; Thu, 1 Jul 2010 14:00:20 +0000 Received: from ausb3twp02.amd.com ([163.181.250.38]) by ausb3extmailp01.amd.com (Switch-3.2.7/Switch-3.2.7) with SMTP id o61E4HkO001041; Thu, 1 Jul 2010 09:04:20 -0500 X-WSS-ID: 0L4VTKB-02-6BY-02 X-M-MSG: Received: from sausexhtp02.amd.com (sausexhtp02.amd.com [163.181.3.152]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (No client certificate requested) by ausb3twp02.amd.com (Tumbleweed MailGate 3.7.2) with ESMTP id 2389CC84D3; Thu, 1 Jul 2010 09:00:10 -0500 (CDT) Received: from storexhtp01.amd.com (172.24.4.3) by sausexhtp02.amd.com (163.181.3.152) with Microsoft SMTP Server (TLS) id 8.2.254.0; Thu, 1 Jul 2010 09:00:15 -0500 Received: from gwo.osrc.amd.com (165.204.16.204) by storexhtp01.amd.com (172.24.4.3) with Microsoft SMTP Server id 8.2.254.0; Thu, 1 Jul 2010 10:00:14 -0400 Received: from lemmy.osrc.amd.com (lemmy.osrc.amd.com [165.204.15.93]) by gwo.osrc.amd.com (Postfix) with ESMTP id 09CBA49C1F1; Thu, 1 Jul 2010 15:00:14 +0100 (BST) Received: by lemmy.osrc.amd.com (Postfix, from userid 1000) id F21ADA61CE; Thu, 1 Jul 2010 16:00:14 +0200 (CEST) From: Joerg Roedel To: Avi Kivity , Marcelo Tosatti CC: , , Joerg Roedel Subject: [PATCH 2/2] KVM: Use u64 for frame data types Date: Thu, 1 Jul 2010 16:00:12 +0200 Message-ID: <1277992812-31945-3-git-send-email-joerg.roedel@amd.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1277992812-31945-1-git-send-email-joerg.roedel@amd.com> References: <1277992812-31945-1-git-send-email-joerg.roedel@amd.com> MIME-Version: 1.0 X-Reverse-DNS: unknown Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 01 Jul 2010 14:02:02 +0000 (UTC) diff --git a/include/linux/kvm_types.h b/include/linux/kvm_types.h index fb46efb..7ac0d4e 100644 --- a/include/linux/kvm_types.h +++ b/include/linux/kvm_types.h @@ -32,11 +32,11 @@ typedef unsigned long gva_t; typedef u64 gpa_t; -typedef unsigned long gfn_t; +typedef u64 gfn_t; typedef unsigned long hva_t; typedef u64 hpa_t; -typedef unsigned long hfn_t; +typedef u64 hfn_t; typedef hfn_t pfn_t; diff --git a/virt/kvm/iommu.c b/virt/kvm/iommu.c index 673c88a..22fc28b 100644 --- a/virt/kvm/iommu.c +++ b/virt/kvm/iommu.c @@ -108,7 +108,7 @@ int kvm_iommu_map_pages(struct kvm *kvm, struct kvm_memory_slot *slot) get_order(page_size), flags); if (r) { printk(KERN_ERR "kvm_iommu_map_address:" - "iommu failed to map pfn=%lx\n", pfn); + "iommu failed to map pfn=%llx\n", pfn); goto unmap_pages; }