ia64/xen-unstable

changeset 9890:a779d642c22a

Recent GUEST_HANDLE related cset broke ia64 compilation.

Signed-off-by Kevin Tian <kevin.tian@intel.com>
author kaf24@firebug.cl.cam.ac.uk
date Fri Apr 28 14:35:34 2006 +0100 (2006-04-28)
parents 922f95ab88e4
children 84780e2ea775
files linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h tools/libxc/xc_ia64_stubs.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h	Fri Apr 28 14:33:40 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h	Fri Apr 28 14:35:34 2006 +0100
     1.3 @@ -101,13 +101,14 @@ HYPERVISOR_poll(
     1.4  	evtchn_port_t *ports, unsigned int nr_ports, u64 timeout)
     1.5  {
     1.6  	struct sched_poll sched_poll = {
     1.7 -		.ports = ports,
     1.8  		.nr_ports = nr_ports,
     1.9  		.timeout = jiffies_to_st(timeout)
    1.10  	};
    1.11  
    1.12 -	int rc = HYPERVISOR_sched_op(SCHEDOP_poll, &sched_poll);
    1.13 +	int rc;
    1.14  
    1.15 +	set_xen_guest_handle(sched_poll.ports, ports);
    1.16 +	rc = HYPERVISOR_sched_op(SCHEDOP_poll, &sched_poll);
    1.17  	if (rc == -ENOSYS)
    1.18  		rc = HYPERVISOR_sched_op_compat(SCHEDOP_yield, 0);
    1.19  
     2.1 --- a/tools/libxc/xc_ia64_stubs.c	Fri Apr 28 14:33:40 2006 +0100
     2.2 +++ b/tools/libxc/xc_ia64_stubs.c	Fri Apr 28 14:35:34 2006 +0100
     2.3 @@ -75,7 +75,7 @@ int xc_ia64_get_pfn_list(int xc_handle,
     2.4          op.cmd = DOM0_GETMEMLIST;
     2.5          op.u.getmemlist.domain   = (domid_t)domid;
     2.6          op.u.getmemlist.max_pfns = max_pfns;
     2.7 -        op.u.getmemlist.buffer   = __pfn_buf;
     2.8 +        set_xen_guest_handle(op.u.getmemlist.buffer, __pfn_buf);
     2.9  
    2.10          if ( (max_pfns != -1UL)
    2.11              && mlock(__pfn_buf, __nr_pages * sizeof(unsigned long)) != 0 )
    2.12 @@ -729,7 +729,7 @@ int xc_hvm_build(int xc_handle,
    2.13  
    2.14      launch_op.u.setvcpucontext.domain = (domid_t)domid;
    2.15      launch_op.u.setvcpucontext.vcpu   = 0;
    2.16 -    launch_op.u.setvcpucontext.ctxt   = ctxt;
    2.17 +    set_xen_guest_handle(launch_op.u.setvcpucontext.ctxt, ctxt);
    2.18  
    2.19      launch_op.cmd = DOM0_SETVCPUCONTEXT;
    2.20      rc = do_dom0_op(xc_handle, &launch_op);