# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID a779d642c22af6bcd56f60649d6c5812fe728731
# Parent 922f95ab88e4d6c96cd052be48d3c16f8d959449
Recent GUEST_HANDLE related cset broke ia64 compilation.
Signed-off-by Kevin Tian <kevin.tian@xxxxxxxxx>
diff -r 922f95ab88e4 -r a779d642c22a
linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
--- a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h Fri Apr 28
14:33:40 2006 +0100
+++ b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h Fri Apr 28
14:35:34 2006 +0100
@@ -101,13 +101,14 @@ HYPERVISOR_poll(
evtchn_port_t *ports, unsigned int nr_ports, u64 timeout)
{
struct sched_poll sched_poll = {
- .ports = ports,
.nr_ports = nr_ports,
.timeout = jiffies_to_st(timeout)
};
- int rc = HYPERVISOR_sched_op(SCHEDOP_poll, &sched_poll);
+ int rc;
+ set_xen_guest_handle(sched_poll.ports, ports);
+ rc = HYPERVISOR_sched_op(SCHEDOP_poll, &sched_poll);
if (rc == -ENOSYS)
rc = HYPERVISOR_sched_op_compat(SCHEDOP_yield, 0);
diff -r 922f95ab88e4 -r a779d642c22a tools/libxc/xc_ia64_stubs.c
--- a/tools/libxc/xc_ia64_stubs.c Fri Apr 28 14:33:40 2006 +0100
+++ b/tools/libxc/xc_ia64_stubs.c Fri Apr 28 14:35:34 2006 +0100
@@ -75,7 +75,7 @@ int xc_ia64_get_pfn_list(int xc_handle,
op.cmd = DOM0_GETMEMLIST;
op.u.getmemlist.domain = (domid_t)domid;
op.u.getmemlist.max_pfns = max_pfns;
- op.u.getmemlist.buffer = __pfn_buf;
+ set_xen_guest_handle(op.u.getmemlist.buffer, __pfn_buf);
if ( (max_pfns != -1UL)
&& mlock(__pfn_buf, __nr_pages * sizeof(unsigned long)) != 0 )
@@ -729,7 +729,7 @@ int xc_hvm_build(int xc_handle,
launch_op.u.setvcpucontext.domain = (domid_t)domid;
launch_op.u.setvcpucontext.vcpu = 0;
- launch_op.u.setvcpucontext.ctxt = ctxt;
+ set_xen_guest_handle(launch_op.u.setvcpucontext.ctxt, ctxt);
launch_op.cmd = DOM0_SETVCPUCONTEXT;
rc = do_dom0_op(xc_handle, &launch_op);
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home