From 06d2e688405932841e9a1c27e2eaaef315298a66 Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Thu, 1 Mar 2012 18:58:27 +0000 Subject: [PATCH] qemu-xen: ignore console disconnect events for 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. This patch should be applied to 4.1 too. Signed-off-by: Stefano Stabellini (cherry picked from commit 2503d4d5a29e7af8dffd1e11229e11c1917d2ccf) --- hw/xen_console.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/xen_console.c b/hw/xen_console.c index 0a2374c8d..f036b8dc4 100644 --- a/hw/xen_console.c +++ b/hw/xen_console.c @@ -253,6 +253,8 @@ 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); -- 2.39.5