From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Date: Tue, 27 Mar 2012 16:02:21 +0000 (+0000)
Subject: xen_console: ignore console disconnect events from console/0
X-Git-Tag: qemu-xen-4.2.0~30
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=66b7aa32a8f3b07cef3adb8470c37f48b4c07413;p=qemu-upstream-4.2-testing.git

xen_console: ignore console disconnect events from console/0

The first console has a different location compared to other PV devices
(console, rather than device/console/0) and doesn't obey the xenstore
state protocol. We already special case the first console in con_init
and con_initialise, we should also do it in con_disconnect.

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

diff --git a/hw/xen_console.c b/hw/xen_console.c
index edcb31ce6..3794b1972 100644
--- a/hw/xen_console.c
+++ b/hw/xen_console.c
@@ -248,6 +248,9 @@ static void con_disconnect(struct XenDevice *xendev)
 {
     struct XenConsole *con = container_of(xendev, struct XenConsole, xendev);
 
+    if (!xendev->dev) {
+        return;
+    }
     if (con->chr)
         qemu_chr_add_handlers(con->chr, NULL, NULL, NULL, NULL);
     xen_be_unbind_evtchn(&con->xendev);