diff options
| author | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-04-27 15:06:55 +0100 |
|---|---|---|
| committer | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-04-27 15:06:55 +0100 |
| commit | cee87f9f44074302242968b88abe0a229b434986 (patch) | |
| tree | eeddac4e6a2b577141c8d5c83d6b010d71f9fb9a /xen/include/xen/shared.h | |
| parent | b8057a726d7f47b47f6c4ef97032aba93409c026 (diff) | |
| download | xen-cee87f9f44074302242968b88abe0a229b434986.tar.gz xen-cee87f9f44074302242968b88abe0a229b434986.tar.bz2 xen-cee87f9f44074302242968b88abe0a229b434986.zip | |
xen: More 'IS_COMPAT' cleanups.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'xen/include/xen/shared.h')
| -rw-r--r-- | xen/include/xen/shared.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/xen/include/xen/shared.h b/xen/include/xen/shared.h index ee0510cf67..216d72116d 100644 --- a/xen/include/xen/shared.h +++ b/xen/include/xen/shared.h @@ -12,25 +12,27 @@ typedef union { struct compat_shared_info compat; } shared_info_t; -#define __shared_info(d, s, field) (*(!IS_COMPAT(d) ? \ - &(s)->native.field : \ +#define __shared_info(d, s, field) (*(!has_32bit_shinfo(d) ? \ + &(s)->native.field : \ &(s)->compat.field)) -#define __shared_info_addr(d, s, field) (!IS_COMPAT(d) ? \ - (void *)&(s)->native.field : \ +#define __shared_info_addr(d, s, field) (!has_32bit_shinfo(d) ? \ + (void *)&(s)->native.field : \ (void *)&(s)->compat.field) -#define shared_info(d, field) __shared_info(d, (d)->shared_info, field) -#define shared_info_addr(d, field) __shared_info_addr(d, (d)->shared_info, field) +#define shared_info(d, field) \ + __shared_info(d, (d)->shared_info, field) +#define shared_info_addr(d, field) \ + __shared_info_addr(d, (d)->shared_info, field) typedef union { struct vcpu_info native; struct compat_vcpu_info compat; } vcpu_info_t; -#define vcpu_info(v, field) (*(!IS_COMPAT((v)->domain) ? \ - &(v)->vcpu_info->native.field : \ +#define vcpu_info(v, field) (*(!has_32bit_shinfo((v)->domain) ? \ + &(v)->vcpu_info->native.field : \ &(v)->vcpu_info->compat.field)) -#define vcpu_info_addr(v, field) (!IS_COMPAT((v)->domain) ? \ +#define vcpu_info_addr(v, field) (!has_32bit_shinfo((v)->domain) ? \ (void *)&(v)->vcpu_info->native.field : \ (void *)&(v)->vcpu_info->compat.field) |