From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Date: Thu, 20 Jan 2011 16:34:47 +0000 (+0000)
Subject: fix segfault on con_disconnect
X-Git-Tag: xen-4.1.0-rc2~2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=72d42d2ff65106fe61b8a4004a289a1be8ec8dc4;p=qemu-xen-4.5-testing.git

fix segfault on con_disconnect

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 d7099c4e3..0a2374c8d 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);