From patchwork Wed Jan 19 13:53:19 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [2/5] qemu and qemu-xen: fix segfault on con_disconnect
Date: Wed, 19 Jan 2011 03:53:19 -0000
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
X-Patchwork-Id: 79471
Message-Id: <alpine.DEB.2.00.1101191253200.7277@kaball-desktop>
To: xen-devel@lists.xensource.com
Cc: qemu-devel@nongnu.org

The test on xendev->gnttabdev in con_disconnect is wrong: what


differentiates the consoles is the dev number.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

diff --git a/hw/xen_console.c b/hw/xen_console.c
index d7099c4..0a2374c 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->gnttabdev)
+        if (!xendev->dev)
 	    munmap(con->sring, XC_PAGE_SIZE);
         else
             xc_gnttab_munmap(xendev->gnttabdev, con->sring, 1);