Mailing List Archive

# HG changeset patch
# User awilliam@xenbuild.aw
# Node ID 26ba157bef06db5d40af2a17b719c6b1df8759ed
# Parent 647d3208704a684d5b36af1e03ef636240dc550c
[IA64] fix warnings

Signed-off-by: Tristan Gingold <tristan.gingold@bull.net>
---
xen/arch/ia64/vmx/vmx_hypercall.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)

diff -r 647d3208704a -r 26ba157bef06 xen/arch/ia64/vmx/vmx_hypercall.c
--- a/xen/arch/ia64/vmx/vmx_hypercall.c Mon Aug 28 13:18:36 2006 -0600
+++ b/xen/arch/ia64/vmx/vmx_hypercall.c Mon Aug 28 13:30:04 2006 -0600
@@ -61,7 +61,8 @@ vmx_gnttab_setup_table(unsigned long fra
vmx_gnttab_setup_table(unsigned long frame_pa, unsigned long nr_frames)
{
struct domain *d = current->domain;
- unsigned long o_grant_shared, pgaddr;
+ struct grant_entry *pgaddr;
+ unsigned long o_grant_shared;

if ((nr_frames != NR_GRANT_FRAMES) || (frame_pa & (PAGE_SIZE - 1))) {
return -EINVAL;
@@ -73,7 +74,7 @@ vmx_gnttab_setup_table(unsigned long fra
}

o_grant_shared = (unsigned long)d->grant_table->shared;
- d->grant_table->shared = (struct grant_entry *)pgaddr;
+ d->grant_table->shared = pgaddr;

/* Copy existing grant table into new page */
if (o_grant_shared) {
@@ -92,10 +93,11 @@ vmx_setup_shared_info_page(unsigned long
{
VCPU *vcpu = current;
struct domain *d = vcpu->domain;
- unsigned long o_info, pgaddr;
+ unsigned long o_info;
+ shared_info_t *pgaddr;
struct vcpu *v;

- if (gpa & (PAGE_SIZE - 1)) {
+ if (gpa & ~PAGE_MASK) {
return -EINVAL;
}

@@ -105,7 +107,7 @@ vmx_setup_shared_info_page(unsigned long
}

o_info = (u64)d->shared_info;
- d->shared_info = (shared_info_t *)pgaddr;
+ d->shared_info = pgaddr;

/* Copy existing shared info into new page */
if (o_info) {

_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog