All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2 2/2] libvchan: replace munmap with correct xc_gntshr_munmap
@ 2013-05-04 22:10 Marek Marczykowski
  2013-05-08 10:48 ` George Dunlap
                   ` (2 more replies)
  0 siblings, 3 replies; 15+ messages in thread
From: Marek Marczykowski @ 2013-05-04 22:10 UTC (permalink / raw)
  To: xen-devel; +Cc: Daniel De Graaf, Marek Marczykowski, Ian Campbell

On linux it will end up in munmap anyway, but do not assume any
particular xc_gntshr_munmap implementation details.

Signed-off-by: Marek Marczykowski <marmarek@invisiblethingslab.com>
---
 tools/libvchan/io.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/libvchan/io.c b/tools/libvchan/io.c
index 5ec5fb9..3040099 100644
--- a/tools/libvchan/io.c
+++ b/tools/libvchan/io.c
@@ -324,9 +324,11 @@ void libxenvchan_close(struct libxenvchan *ctrl)
 	if (!ctrl)
 		return;
 	if (ctrl->read.order >= PAGE_SHIFT)
-		munmap(ctrl->read.buffer, 1 << ctrl->read.order);
+		xc_gntshr_munmap(ctrl->gntshr, ctrl->read.buffer,
+				1 << (ctrl->read.order - PAGE_SHIFT));
 	if (ctrl->write.order >= PAGE_SHIFT)
-		munmap(ctrl->write.buffer, 1 << ctrl->write.order);
+		xc_gntshr_munmap(ctrl->gntshr, ctrl->write.buffer,
+				1 << (ctrl->write.order - PAGE_SHIFT));
 	if (ctrl->ring) {
 		if (ctrl->is_server) {
 			ctrl->ring->srv_live = 0;
-- 
1.8.1.4

^ permalink raw reply related	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2013-07-04  9:43 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-04 22:10 [PATCH v2 2/2] libvchan: replace munmap with correct xc_gntshr_munmap Marek Marczykowski
2013-05-08 10:48 ` George Dunlap
2013-05-08 10:55   ` Ian Campbell
2013-05-08 10:57 ` Ian Campbell
2013-05-08 11:42   ` Ian Campbell
2013-05-08 14:06     ` Marek Marczykowski
2013-05-08 13:49 ` Daniel De Graaf
2013-05-08 14:08   ` Marek Marczykowski
2013-05-10 13:46     ` Ian Campbell
2013-05-10 13:55       ` Marek Marczykowski
2013-05-10 13:57         ` George Dunlap
2013-05-10 14:08         ` Ian Campbell
2013-05-10 14:15           ` George Dunlap
2013-05-10 14:18             ` Ian Campbell
2013-07-04  9:43   ` Ian Campbell

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.