# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1168611748 0
# Node ID 9c6531217c7c79158fe8f9a5d23b421869badabd
# Parent 204c2724f80082713554c2ba71e0728f63d28e79
[XEN] Fix guest-access macros.
From: Christoph Egger <Christoph.Egger@xxxxxxx>
---
xen/include/asm-x86/guest_access.h | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff -r 204c2724f800 -r 9c6531217c7c xen/include/asm-x86/guest_access.h
--- a/xen/include/asm-x86/guest_access.h Fri Jan 12 10:48:46 2007 +0000
+++ b/xen/include/asm-x86/guest_access.h Fri Jan 12 14:22:28 2007 +0000
@@ -32,7 +32,7 @@
* specifying an offset into the guest array.
*/
#define copy_to_guest_offset(hnd, off, ptr, nr) ({ \
- const typeof(ptr) _x = (hnd).p; \
+ typeof(ptr) _x = (hnd).p; \
const typeof(ptr) _y = (ptr); \
is_hvm_vcpu(current) ? \
copy_to_user_hvm(_x+(off), _y, sizeof(*_x)*(nr)) : \
@@ -45,7 +45,7 @@
*/
#define copy_from_guest_offset(ptr, hnd, off, nr) ({ \
const typeof(ptr) _x = (hnd).p; \
- const typeof(ptr) _y = (ptr); \
+ typeof(ptr) _y = (ptr); \
is_hvm_vcpu(current) ? \
copy_from_user_hvm(_y, _x+(off), sizeof(*_x)*(nr)) :\
copy_from_user(_y, _x+(off), sizeof(*_x)*(nr)); \
@@ -53,7 +53,7 @@
/* Copy sub-field of a structure to guest context via a guest handle. */
#define copy_field_to_guest(hnd, ptr, field) ({ \
- const typeof(&(ptr)->field) _x = &(hnd).p->field; \
+ typeof(&(ptr)->field) _x = &(hnd).p->field; \
const typeof(&(ptr)->field) _y = &(ptr)->field; \
is_hvm_vcpu(current) ? \
copy_to_user_hvm(_x, _y, sizeof(*_x)) : \
@@ -63,7 +63,7 @@
/* Copy sub-field of a structure from guest context via a guest handle. */
#define copy_field_from_guest(ptr, hnd, field) ({ \
const typeof(&(ptr)->field) _x = &(hnd).p->field; \
- const typeof(&(ptr)->field) _y = &(ptr)->field; \
+ typeof(&(ptr)->field) _y = &(ptr)->field; \
is_hvm_vcpu(current) ? \
copy_from_user_hvm(_y, _x, sizeof(*_x)) : \
copy_from_user(_y, _x, sizeof(*_x)); \
@@ -78,7 +78,7 @@
array_access_ok((hnd).p, (nr), sizeof(*(hnd).p)))
#define __copy_to_guest_offset(hnd, off, ptr, nr) ({ \
- const typeof(ptr) _x = (hnd).p; \
+ typeof(ptr) _x = (hnd).p; \
const typeof(ptr) _y = (ptr); \
is_hvm_vcpu(current) ? \
copy_to_user_hvm(_x+(off), _y, sizeof(*_x)*(nr)) : \
@@ -87,14 +87,14 @@
#define __copy_from_guest_offset(ptr, hnd, off, nr) ({ \
const typeof(ptr) _x = (hnd).p; \
- const typeof(ptr) _y = (ptr); \
+ typeof(ptr) _y = (ptr); \
is_hvm_vcpu(current) ? \
copy_from_user_hvm(_y, _x+(off),sizeof(*_x)*(nr)) : \
__copy_from_user(_y, _x+(off), sizeof(*_x)*(nr)); \
})
#define __copy_field_to_guest(hnd, ptr, field) ({ \
- const typeof(&(ptr)->field) _x = &(hnd).p->field; \
+ typeof(&(ptr)->field) _x = &(hnd).p->field; \
const typeof(&(ptr)->field) _y = &(ptr)->field; \
is_hvm_vcpu(current) ? \
copy_to_user_hvm(_x, _y, sizeof(*_x)) : \
@@ -103,9 +103,9 @@
#define __copy_field_from_guest(ptr, hnd, field) ({ \
const typeof(&(ptr)->field) _x = &(hnd).p->field; \
- const typeof(&(ptr)->field) _y = &(ptr)->field; \
+ typeof(&(ptr)->field) _y = &(ptr)->field; \
is_hvm_vcpu(current) ? \
- copy_from_user_hvm(_x, _y, sizeof(*_x)) : \
+ copy_from_user_hvm(_y, _x, sizeof(*_x)) : \
__copy_from_user(_y, _x, sizeof(*_x)); \
})
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home