Received: from eggs.gnu.org ([2001:4830:134:3::10]:52646) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zgeca-00052H-8f for qemu-devel@nongnu.org; Mon, 28 Sep 2015 16:02:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZgecH-00012G-Ba for qemu-devel@nongnu.org; Mon, 28 Sep 2015 16:01:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43172) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZgecH-000129-7Z for qemu-devel@nongnu.org; Mon, 28 Sep 2015 16:01:41 -0400 From: Eduardo Habkost Date: Mon, 28 Sep 2015 17:01:24 -0300 Message-Id: <1443470484-5389-3-git-send-email-ehabkost@redhat.com> In-Reply-To: <1443470484-5389-1-git-send-email-ehabkost@redhat.com> References: <1443470484-5389-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] xen-platform: Ensure xen is enabled when initializing List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: qemu-devel@nongnu.org, Stefano Stabellini The xen-platform code crashes on reset if the xen backend is not initialized, because it calls xc_hvm_set_mem_type(). Ensure xen-platform won't be created without initializing the xen backend. The assert can't be triggered by the user because the device is not hotpluggable, and the only code creating it (at pc_xen_hvm_init()) already checks xen_enabled(). Signed-off-by: Eduardo Habkost --- hw/i386/xen/xen_platform.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c index ee45f03..8682c42 100644 --- a/hw/i386/xen/xen_platform.c +++ b/hw/i386/xen/xen_platform.c @@ -387,6 +387,9 @@ static int xen_platform_initfn(PCIDevice *dev) PCIXenPlatformState *d = XEN_PLATFORM(dev); uint8_t *pci_conf; + /* Device will crash on reset if xen is not initialized */ + assert(xen_enabled()); + pci_conf = dev->config; pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_IO | PCI_COMMAND_MEMORY); -- 2.1.0