diff options
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/char/xen_console.c | 8 | ||||
| -rw-r--r-- | hw/display/xenfb.c | 17 | ||||
| -rw-r--r-- | hw/xen/xen_backend.c | 3 |
3 files changed, 15 insertions, 13 deletions
diff --git a/hw/char/xen_console.c b/hw/char/xen_console.c index 3e8a57b4f7..b92d0c6dd2 100644 --- a/hw/char/xen_console.c +++ b/hw/char/xen_console.c @@ -229,9 +229,9 @@ static int con_initialise(struct XenDevice *xendev) if (!xendev->dev) { xen_pfn_t mfn = con->ring_ref; - con->sring = xc_map_foreign_pages(xen_xc, con->xendev.dom, - PROT_READ|PROT_WRITE, - &mfn, 1); + con->sring = xenforeignmemory_map(xen_fmem, con->xendev.dom, + PROT_READ|PROT_WRITE, + 1, &mfn, NULL); } else { con->sring = xengnttab_map_grant_ref(xendev->gnttabdev, con->xendev.dom, con->ring_ref, @@ -273,7 +273,7 @@ static void con_disconnect(struct XenDevice *xendev) if (con->sring) { if (!xendev->dev) { - munmap(con->sring, XC_PAGE_SIZE); + xenforeignmemory_unmap(xen_fmem, con->sring, 1); } else { xengnttab_unmap(xendev->gnttabdev, con->sring, 1); } diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c index aa38803aa9..1676660e4e 100644 --- a/hw/display/xenfb.c +++ b/hw/display/xenfb.c @@ -106,8 +106,8 @@ static int common_bind(struct common *c) if (xenstore_read_fe_int(&c->xendev, "event-channel", &c->xendev.remote_port) == -1) return -1; - c->page = xc_map_foreign_pages(xen_xc, c->xendev.dom, - PROT_READ | PROT_WRITE, &mfn, 1); + c->page = xenforeignmemory_map(xen_fmem, c->xendev.dom, + PROT_READ | PROT_WRITE, 1, &mfn, NULL); if (c->page == NULL) return -1; @@ -122,7 +122,7 @@ static void common_unbind(struct common *c) { xen_be_unbind_evtchn(&c->xendev); if (c->page) { - munmap(c->page, XC_PAGE_SIZE); + xenforeignmemory_unmap(xen_fmem, c->page, 1); c->page = NULL; } } @@ -495,15 +495,15 @@ static int xenfb_map_fb(struct XenFB *xenfb) fbmfns = g_malloc0(sizeof(xen_pfn_t) * xenfb->fbpages); xenfb_copy_mfns(mode, n_fbdirs, pgmfns, pd); - map = xc_map_foreign_pages(xen_xc, xenfb->c.xendev.dom, - PROT_READ, pgmfns, n_fbdirs); + map = xenforeignmemory_map(xen_fmem, xenfb->c.xendev.dom, + PROT_READ, n_fbdirs, pgmfns, NULL); if (map == NULL) goto out; xenfb_copy_mfns(mode, xenfb->fbpages, fbmfns, map); - munmap(map, n_fbdirs * XC_PAGE_SIZE); + xenforeignmemory_unmap(xen_fmem, map, n_fbdirs); - xenfb->pixels = xc_map_foreign_pages(xen_xc, xenfb->c.xendev.dom, - PROT_READ, fbmfns, xenfb->fbpages); + xenfb->pixels = xenforeignmemory_map(xen_fmem, xenfb->c.xendev.dom, + PROT_READ, xenfb->fbpages, fbmfns, NULL); if (xenfb->pixels == NULL) goto out; @@ -913,6 +913,7 @@ static void fb_disconnect(struct XenDevice *xendev) * Replacing the framebuffer with anonymous shared memory * instead. This releases the guest pages and keeps qemu happy. */ + xenforeignmemory_unmap(xen_fmem, fb->pixels, fb->fbpages); fb->pixels = mmap(fb->pixels, fb->fbpages * XC_PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0); diff --git a/hw/xen/xen_backend.c b/hw/xen/xen_backend.c index 966e34f3cb..caa459ca3e 100644 --- a/hw/xen/xen_backend.c +++ b/hw/xen/xen_backend.c @@ -45,6 +45,7 @@ /* public */ XenXC xen_xc = XC_HANDLER_INITIAL_VALUE; +xenforeignmemory_handle *xen_fmem = NULL; struct xs_handle *xenstore = NULL; const char *xen_protocol; @@ -717,7 +718,7 @@ int xen_be_init(void) qemu_set_fd_handler(xs_fileno(xenstore), xenstore_update, NULL, NULL); - if (xen_xc == XC_HANDLER_INITIAL_VALUE) { + if (xen_xc == XC_HANDLER_INITIAL_VALUE || xen_fmem == NULL) { /* Check if xen_init() have been called */ goto err; } |