From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael S. Tsirkin" Subject: [PATCH 3/3] qemu-kvm: convert kvm_types to ISO Date: Wed, 7 Oct 2009 13:19:28 +0200 Message-ID: <20091007111928.GD20835@redhat.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii To: avi@redhat.com, kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:22449 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758997AbZJGLV4 (ORCPT ); Wed, 7 Oct 2009 07:21:56 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n97BLU8O023419 for ; Wed, 7 Oct 2009 07:21:30 -0400 Content-Disposition: inline In-Reply-To: Sender: kvm-owner@vger.kernel.org List-ID: Convert kvm-types to use ISO C types so that it can be included independently of other headers. This is on top of header patch set I sent previously. Signed-off-by: Michael S. Tsirkin --- kvm/include/linux/kvm_types.h | 50 ++++++++++++++++++++-------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/kvm/include/linux/kvm_types.h b/kvm/include/linux/kvm_types.h index c65f89e..5c0b739 100644 --- a/kvm/include/linux/kvm_types.h +++ b/kvm/include/linux/kvm_types.h @@ -70,41 +70,41 @@ * hfn - host frame number */ -typedef unsigned long gva_t; -typedef u64 gpa_t; -typedef unsigned long gfn_t; +typedef unsigned long gva_t; +typedef unsigned long long gpa_t; +typedef unsigned long gfn_t; -typedef unsigned long hva_t; -typedef u64 hpa_t; -typedef unsigned long hfn_t; +typedef unsigned long hva_t; +typedef unsigned long long hpa_t; +typedef unsigned long hfn_t; typedef hfn_t pfn_t; union kvm_ioapic_redirect_entry { - u64 bits; + unsigned long long bits; struct { - u8 vector; - u8 delivery_mode:3; - u8 dest_mode:1; - u8 delivery_status:1; - u8 polarity:1; - u8 remote_irr:1; - u8 trig_mode:1; - u8 mask:1; - u8 reserve:7; - u8 reserved[4]; - u8 dest_id; + unsigned char vector; + unsigned char delivery_mode:3; + unsigned char dest_mode:1; + unsigned char delivery_status:1; + unsigned char polarity:1; + unsigned char remote_irr:1; + unsigned char trig_mode:1; + unsigned char mask:1; + unsigned char reserve:7; + unsigned char reserved[4]; + unsigned char dest_id; } fields; }; struct kvm_lapic_irq { - u32 vector; - u32 delivery_mode; - u32 dest_mode; - u32 level; - u32 trig_mode; - u32 shorthand; - u32 dest_id; + unsigned vector; + unsigned delivery_mode; + unsigned dest_mode; + unsigned level; + unsigned trig_mode; + unsigned shorthand; + unsigned dest_id; }; #endif /* __KVM_TYPES_H__ */ -- 1.6.5.rc2