direct-io.hg

changeset 11345:26ba157bef06

[IA64] fix warnings

Signed-off-by: Tristan Gingold <tristan.gingold@bull.net>
author awilliam@xenbuild.aw
date Mon Aug 28 13:30:04 2006 -0600 (2006-08-28)
parents 647d3208704a
children 8c4c5e1bf58a
files xen/arch/ia64/vmx/vmx_hypercall.c
line diff
     1.1 --- a/xen/arch/ia64/vmx/vmx_hypercall.c	Mon Aug 28 13:18:36 2006 -0600
     1.2 +++ b/xen/arch/ia64/vmx/vmx_hypercall.c	Mon Aug 28 13:30:04 2006 -0600
     1.3 @@ -61,7 +61,8 @@ static int
     1.4  vmx_gnttab_setup_table(unsigned long frame_pa, unsigned long nr_frames)
     1.5  {
     1.6      struct domain *d = current->domain;
     1.7 -    unsigned long o_grant_shared, pgaddr;
     1.8 +    struct grant_entry *pgaddr;
     1.9 +    unsigned long o_grant_shared;
    1.10  
    1.11      if ((nr_frames != NR_GRANT_FRAMES) || (frame_pa & (PAGE_SIZE - 1))) {
    1.12          return -EINVAL;
    1.13 @@ -73,7 +74,7 @@ vmx_gnttab_setup_table(unsigned long fra
    1.14      }
    1.15  
    1.16      o_grant_shared = (unsigned long)d->grant_table->shared;
    1.17 -    d->grant_table->shared = (struct grant_entry *)pgaddr;
    1.18 +    d->grant_table->shared = pgaddr;
    1.19  
    1.20      /* Copy existing grant table into new page */
    1.21      if (o_grant_shared) {
    1.22 @@ -92,10 +93,11 @@ vmx_setup_shared_info_page(unsigned long
    1.23  {
    1.24      VCPU *vcpu = current;
    1.25      struct domain *d = vcpu->domain;
    1.26 -    unsigned long o_info, pgaddr;
    1.27 +    unsigned long o_info;
    1.28 +    shared_info_t *pgaddr;
    1.29      struct vcpu *v;
    1.30  
    1.31 -    if (gpa & (PAGE_SIZE - 1)) {
    1.32 +    if (gpa & ~PAGE_MASK) {
    1.33          return -EINVAL;
    1.34      }
    1.35  
    1.36 @@ -105,7 +107,7 @@ vmx_setup_shared_info_page(unsigned long
    1.37      }
    1.38  
    1.39      o_info = (u64)d->shared_info;
    1.40 -    d->shared_info = (shared_info_t *)pgaddr;
    1.41 +    d->shared_info = pgaddr;
    1.42  
    1.43      /* Copy existing shared info into new page */
    1.44      if (o_info) {