WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

[Xen-devel] [PATCH] qemu-xen: fix unmapping logic in hw/xen_console.c

To: "xen-devel@xxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxx>
Subject: [Xen-devel] [PATCH] qemu-xen: fix unmapping logic in hw/xen_console.c
From: Wei Liu <liuw@xxxxxxxxx>
Date: Wed, 08 Jun 2011 17:44:08 +0800
Cc: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
Delivery-date: Wed, 08 Jun 2011 02:45:22 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
This is a patch for qemu-xen. Don't know if it is the right place to
post.

It has been fixed in upstream QEMU.

------8<----------------
commit 28ec10ef3ff22873cd3f1b703d3aecbc93cbf680
Author: Wei Liu <liuw@xxxxxxxxx>
Date:   Wed Jun 8 17:40:02 2011 +0800

    qemu-xen: fix unmapping logic in hw/xen_console.c.
    
    Signed-off-by: Wei Liu <liuw@xxxxxxxxx>

diff --git a/hw/xen_console.c b/hw/xen_console.c
index 0a2374c..d7099c4 100644
--- a/hw/xen_console.c
+++ b/hw/xen_console.c
@@ -258,7 +258,7 @@ static void con_disconnect(struct XenDevice *xendev)
     xen_be_unbind_evtchn(&con->xendev);
 
     if (con->sring) {
-        if (!xendev->dev)
+        if (!xendev->gnttabdev)
            munmap(con->sring, XC_PAGE_SIZE);
         else
             xc_gnttab_munmap(xendev->gnttabdev, con->sring, 1);



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel