summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@tycho.nsa.gov>2011-05-31 18:52:24 -0400
committerEamon Walsh <ewalsh@tycho.nsa.gov>2011-05-31 18:52:24 -0400
commit085f23b2bdd4221a76028141d076a8c1dfd901bc (patch)
tree8610dd9ef07b0ef2347da43aca7d18bf62b8caf0
parentae0f8dc801f186d04d9d33e7a0e4419003aeba5a (diff)
Remove QEMU munmap hack from fb_disconnect().
-rw-r--r--src/xenfb_server.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/xenfb_server.c b/src/xenfb_server.c
index 2c67244..69c3d9e 100644
--- a/src/xenfb_server.c
+++ b/src/xenfb_server.c
@@ -691,18 +691,9 @@ static void fb_disconnect(struct XenDevice *xendev)
if (fb->pixels && fb->c.uses_gref) {
xc_gnttab_munmap(fb->c.xendev.gnttabdev, fb->pixels, fb->fbpages);
} else if (fb->pixels) {
- // Note: not needed if we are doing the mmap() below
- // munmap(fb->pixels, fb->fbpages * XC_PAGE_SIZE);
+ munmap(fb->pixels, fb->fbpages * XC_PAGE_SIZE);
}
- /*
- * FIXME: qemu can't un-init gfx display (yet?).
- * Replacing the framebuffer with anonymous shared memory
- * instead. This releases the guest pages and keeps qemu happy.
- */
- fb->pixels = mmap(fb->pixels, fb->fbpages * XC_PAGE_SIZE,
- PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON,
- -1, 0);
common_unbind(&fb->c);
fb->feature_update = 0;
fb->bug_trigger = 0;