Patchwork [2/5] qemu and qemu-xen: fix segfault on con_disconnect

login
register
mail settings
Submitter Stefano Stabellini
Date Jan. 19, 2011, 1:53 p.m.
Message ID <alpine.DEB.2.00.1101191253200.7277@kaball-desktop>
Download mbox | patch
Permalink /patch/79471/
State New
Headers show

Comments

Stefano Stabellini - Jan. 19, 2011, 1:53 p.m.
The test on xendev->gnttabdev in con_disconnect is wrong: what

Patch

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);