diff options
| -rw-r--r-- | hw/char/xen_console.c | 8 | ||||
| -rw-r--r-- | hw/display/xenfb.c | 15 | ||||
| -rw-r--r-- | xen-hvm.c | 14 |
3 files changed, 19 insertions, 18 deletions
diff --git a/hw/char/xen_console.c b/hw/char/xen_console.c index ac1b324432..3e8a57b4f7 100644 --- a/hw/char/xen_console.c +++ b/hw/char/xen_console.c @@ -228,10 +228,10 @@ static int con_initialise(struct XenDevice *xendev) con->buffer.max_capacity = limit; if (!xendev->dev) { - con->sring = xc_map_foreign_range(xen_xc, con->xendev.dom, - XC_PAGE_SIZE, - PROT_READ|PROT_WRITE, - con->ring_ref); + xen_pfn_t mfn = con->ring_ref; + con->sring = xc_map_foreign_pages(xen_xc, con->xendev.dom, + PROT_READ|PROT_WRITE, + &mfn, 1); } else { con->sring = xengnttab_map_grant_ref(xendev->gnttabdev, con->xendev.dom, con->ring_ref, diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c index 8eb3046244..aa38803aa9 100644 --- a/hw/display/xenfb.c +++ b/hw/display/xenfb.c @@ -95,23 +95,24 @@ struct XenFB { static int common_bind(struct common *c) { - uint64_t mfn; + uint64_t val; + xen_pfn_t mfn; - if (xenstore_read_fe_uint64(&c->xendev, "page-ref", &mfn) == -1) + if (xenstore_read_fe_uint64(&c->xendev, "page-ref", &val) == -1) return -1; - assert(mfn == (xen_pfn_t)mfn); + mfn = (xen_pfn_t)val; + assert(val == mfn); if (xenstore_read_fe_int(&c->xendev, "event-channel", &c->xendev.remote_port) == -1) return -1; - c->page = xc_map_foreign_range(xen_xc, c->xendev.dom, - XC_PAGE_SIZE, - PROT_READ | PROT_WRITE, mfn); + c->page = xc_map_foreign_pages(xen_xc, c->xendev.dom, + PROT_READ | PROT_WRITE, &mfn, 1); if (c->page == NULL) return -1; xen_be_bind_evtchn(&c->xendev); - xen_be_printf(&c->xendev, 1, "ring mfn %"PRIx64", remote-port %d, local-port %d\n", + xen_be_printf(&c->xendev, 1, "ring mfn %"PRI_xen_pfn", remote-port %d, local-port %d\n", mfn, c->xendev.remote_port, c->xendev.local_port); return 0; diff --git a/xen-hvm.c b/xen-hvm.c index 1b6fa9e56e..878ae0a03d 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -1242,8 +1242,9 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory) DPRINTF("buffered io page at pfn %lx\n", bufioreq_pfn); DPRINTF("buffered io evtchn is %x\n", bufioreq_evtchn); - state->shared_page = xc_map_foreign_range(xen_xc, xen_domid, XC_PAGE_SIZE, - PROT_READ|PROT_WRITE, ioreq_pfn); + state->shared_page = xc_map_foreign_pages(xen_xc, xen_domid, + PROT_READ|PROT_WRITE, + &ioreq_pfn, 1); if (state->shared_page == NULL) { error_report("map shared IO page returned error %d handle=" XC_INTERFACE_FMT, errno, xen_xc); @@ -1254,8 +1255,8 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory) if (!rc) { DPRINTF("shared vmport page at pfn %lx\n", ioreq_pfn); state->shared_vmport_page = - xc_map_foreign_range(xen_xc, xen_domid, XC_PAGE_SIZE, - PROT_READ|PROT_WRITE, ioreq_pfn); + xc_map_foreign_pages(xen_xc, xen_domid, PROT_READ|PROT_WRITE, + &ioreq_pfn, 1); if (state->shared_vmport_page == NULL) { error_report("map shared vmport IO page returned error %d handle=" XC_INTERFACE_FMT, errno, xen_xc); @@ -1267,10 +1268,9 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory) goto err; } - state->buffered_io_page = xc_map_foreign_range(xen_xc, xen_domid, - XC_PAGE_SIZE, + state->buffered_io_page = xc_map_foreign_pages(xen_xc, xen_domid, PROT_READ|PROT_WRITE, - bufioreq_pfn); + &bufioreq_pfn, 1); if (state->buffered_io_page == NULL) { error_report("map buffered IO page returned error %d", errno); goto err; |