Commit 9666248a authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/sstabellini/tags/xen-2015-10-26' into staging 



Xen 2015-10-26

# gpg: Signature made Mon 26 Oct 2015 11:32:50 GMT using RSA key ID 70E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"

* remotes/sstabellini/tags/xen-2015-10-26:
  xen-platform: Replace assert() with appropriate error reporting
  xen_platform: switch to realize
  Qemu/Xen: Fix early freeing MSIX MMIO memory region

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 251d7e60 b1ecd51b

hw/i386/xen/xen_platform.c

+7 −5
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include "trace.h"

#include "exec/address-spaces.h"

#include "sysemu/block-backend.h"

#include "qemu/error-report.h"



#include <xenguest.h>
@@ -382,13 +383,16 @@ static const VMStateDescription vmstate_xen_platform = { 
    }

};



static int xen_platform_initfn(PCIDevice *dev)

static void xen_platform_realize(PCIDevice *dev, Error **errp)

{

    PCIXenPlatformState *d = XEN_PLATFORM(dev);

    uint8_t *pci_conf;



    /* Device will crash on reset if xen is not initialized */

    assert(xen_enabled());

    if (!xen_enabled()) {

        error_setg(errp, "xen-platform device requires the Xen accelerator");

        return;

    }



    pci_conf = dev->config;
@@ -407,8 +411,6 @@ static int xen_platform_initfn(PCIDevice *dev) 
                     &d->mmio_bar);



    platform_fixed_ioport_init(d);



    return 0;

}



static void platform_reset(DeviceState *dev)
@@ -423,7 +425,7 @@ static void xen_platform_class_init(ObjectClass *klass, void *data) 
    DeviceClass *dc = DEVICE_CLASS(klass);

    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);



    k->init = xen_platform_initfn;

    k->realize = xen_platform_realize;

    k->vendor_id = PCI_VENDOR_ID_XEN;

    k->device_id = PCI_DEVICE_ID_XEN_PLATFORM;

    k->class_id = PCI_CLASS_OTHERS << 8 | 0x80;

hw/xen/xen_pt.c

+8 −0
Original line number Diff line number Diff line
@@ -938,10 +938,18 @@ static void xen_pci_passthrough_class_init(ObjectClass *klass, void *data) 
    dc->props = xen_pci_passthrough_properties;

};



static void xen_pci_passthrough_finalize(Object *obj)

{

    XenPCIPassthroughState *s = XEN_PT_DEVICE(obj);



    xen_pt_msix_delete(s);

}



static const TypeInfo xen_pci_passthrough_info = {

    .name = TYPE_XEN_PT_DEVICE,

    .parent = TYPE_PCI_DEVICE,

    .instance_size = sizeof(XenPCIPassthroughState),

    .instance_finalize = xen_pci_passthrough_finalize,

    .class_init = xen_pci_passthrough_class_init,

};

hw/xen/xen_pt.h

+1 −0
Original line number Diff line number Diff line
@@ -305,6 +305,7 @@ void xen_pt_msi_disable(XenPCIPassthroughState *s); 


int xen_pt_msix_init(XenPCIPassthroughState *s, uint32_t base);

void xen_pt_msix_delete(XenPCIPassthroughState *s);

void xen_pt_msix_unmap(XenPCIPassthroughState *s);

int xen_pt_msix_update(XenPCIPassthroughState *s);

int xen_pt_msix_update_remap(XenPCIPassthroughState *s, int bar_index);

void xen_pt_msix_disable(XenPCIPassthroughState *s);

hw/xen/xen_pt_config_init.c

+1 −1
Original line number Diff line number Diff line
@@ -2079,7 +2079,7 @@ void xen_pt_config_delete(XenPCIPassthroughState *s) 


    /* free MSI/MSI-X info table */

    if (s->msix) {

        xen_pt_msix_delete(s);

        xen_pt_msix_unmap(s);

    }

    g_free(s->msi);

hw/xen/xen_pt_msi.c

+12 −1
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ error_out: 
    return rc;

}



void xen_pt_msix_delete(XenPCIPassthroughState *s)

void xen_pt_msix_unmap(XenPCIPassthroughState *s)

{

    XenPTMSIX *msix = s->msix;
@@ -627,6 +627,17 @@ void xen_pt_msix_delete(XenPCIPassthroughState *s) 
    }



    memory_region_del_subregion(&s->bar[msix->bar_index], &msix->mmio);

}



void xen_pt_msix_delete(XenPCIPassthroughState *s)

{

    XenPTMSIX *msix = s->msix;



    if (!msix) {

        return;

    }



    object_unparent(OBJECT(&msix->mmio));



    g_free(s->msix);

    s->msix = NULL;