On 10/07/2009 01:19 PM, Michael S. Tsirkin wrote:
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.
Applied first two, but these headers are completely unnecessary for
userspace, so I removed them instead.
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__ */
--
error compiling committee.c: too many arguments to function
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
