Commit dbb7405d authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Stefano Stabellini
Browse files

xen-platform: Ensure xen is enabled when initializing 



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: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
parent a88ae0d4

hw/i386/xen/xen_platform.c

+3 −0
Original line number Diff line number Diff line
@@ -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);