From patchwork Wed Jan 19 13:53:19 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 79471 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EA346B70B3 for ; Thu, 20 Jan 2011 00:53:27 +1100 (EST) Received: from localhost ([127.0.0.1]:38943 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PfYTU-0003cm-Ua for incoming@patchwork.ozlabs.org; Wed, 19 Jan 2011 08:53:24 -0500 Received: from [140.186.70.92] (port=45965 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PfYSr-0003cY-Jc for qemu-devel@nongnu.org; Wed, 19 Jan 2011 08:52:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PfYSq-0004Cl-Cp for qemu-devel@nongnu.org; Wed, 19 Jan 2011 08:52:45 -0500 Received: from smtp.ctxuk.citrix.com ([62.200.22.115]:25768 helo=SMTP.EU.CITRIX.COM) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PfYSp-0004Bl-V8 for qemu-devel@nongnu.org; Wed, 19 Jan 2011 08:52:44 -0500 X-IronPort-AV: E=Sophos;i="4.60,344,1291593600"; d="scan'208";a="3830578" Received: from lonpmailmx01.citrite.net ([10.30.224.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 19 Jan 2011 13:52:40 +0000 Received: from kaball.uk.xensource.com (10.80.2.59) by smtprelay.citrix.com (10.30.224.162) with Microsoft SMTP Server id 8.2.255.0; Wed, 19 Jan 2011 13:52:40 +0000 Date: Wed, 19 Jan 2011 13:53:19 +0000 From: Stefano Stabellini X-X-Sender: sstabellini@kaball-desktop To: xen-devel@lists.xensource.com Message-ID: User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 2/5] qemu and qemu-xen: fix segfault on con_disconnect X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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 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);