Commit ec1b9aa8 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging 



virtio,vhost,mmap fixes for 2.5

vhost test patches to fix the travis build
virtio ccw patch to fix virtio 1
virtio pci patch to fix pci express
vhost user bridge patch to fix fd leaks
mmap-alloc patch to fix hugetlbfs on ppc64
remove dead code for vhost (trivial)

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Wed 02 Dec 2015 20:38:41 GMT using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"

* remotes/mst/tags/for_upstream:
  util/mmap-alloc: fix hugetlb support on ppc64
  virtio-pci: Set the QEMU_PCI_CAP_EXPRESS capability early in its DeviceClass realize method
  virtio: handle non-virtio-1-capable backend for ccw
  tests/vhost-user-bridge.c: fix fd leakage
  vhost: drop dead code
  vhost-user: verify that number of queues is non-zero
  vhost-user-test: fix crash with glib < 2.36
  vhost-user-test: use unix port for migration
  vhost-user-test: fix chardriver race

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents cf221323 7197fb40

hw/s390x/virtio-ccw.c

+12 −0
Original line number Diff line number Diff line
@@ -1555,6 +1555,17 @@ static void virtio_ccw_device_plugged(DeviceState *d, Error **errp) 
                          d->hotplugged, 1);

}



static void virtio_ccw_post_plugged(DeviceState *d, Error **errp)

{

   VirtioCcwDevice *dev = VIRTIO_CCW_DEVICE(d);

   VirtIODevice *vdev = virtio_bus_get_device(&dev->bus);



   if (!virtio_host_has_feature(vdev, VIRTIO_F_VERSION_1)) {

        /* A backend didn't support modern virtio. */

       dev->max_rev = 0;

   }

}



static void virtio_ccw_device_unplugged(DeviceState *d)

{

    VirtioCcwDevice *dev = VIRTIO_CCW_DEVICE(d);
@@ -1891,6 +1902,7 @@ static void virtio_ccw_bus_class_init(ObjectClass *klass, void *data) 
    k->save_config = virtio_ccw_save_config;

    k->load_config = virtio_ccw_load_config;

    k->device_plugged = virtio_ccw_device_plugged;

    k->post_plugged = virtio_ccw_post_plugged;

    k->device_unplugged = virtio_ccw_device_unplugged;

}

hw/virtio/virtio-bus.c

+3 −0
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ void virtio_bus_device_plugged(VirtIODevice *vdev, Error **errp) 
    assert(vdc->get_features != NULL);

    vdev->host_features = vdc->get_features(vdev, vdev->host_features,

                                            errp);

    if (klass->post_plugged != NULL) {

        klass->post_plugged(qbus->parent, errp);

    }

}



/* Reset the virtio_bus */

hw/virtio/virtio-pci.c

+25 −5
Original line number Diff line number Diff line
@@ -1814,13 +1814,10 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp) 


    address_space_init(&proxy->modern_as, &proxy->modern_cfg, "virtio-pci-cfg-as");



    if (!(proxy->flags & VIRTIO_PCI_FLAG_DISABLE_PCIE)

        && !(proxy->flags & VIRTIO_PCI_FLAG_DISABLE_MODERN)

        && pci_bus_is_express(pci_dev->bus)

        && !pci_bus_is_root(pci_dev->bus)) {

    if (pci_is_express(pci_dev) && pci_bus_is_express(pci_dev->bus) &&

        !pci_bus_is_root(pci_dev->bus)) {

        int pos;



        pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS;

        pos = pcie_endpoint_cap_init(pci_dev, 0);

        assert(pos > 0);
@@ -1832,6 +1829,12 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp) 
         * PCI Power Management Interface Specification.

         */

        pci_set_word(pci_dev->config + pos + PCI_PM_PMC, 0x3);

    } else {

        /*

         * make future invocations of pci_is_express() return false

         * and pci_config_size() return PCI_CONFIG_SPACE_SIZE.

         */

        pci_dev->cap_present &= ~QEMU_PCI_CAP_EXPRESS;

    }



    virtio_pci_bus_new(&proxy->bus, sizeof(proxy->bus), proxy);
@@ -1879,10 +1882,25 @@ static Property virtio_pci_properties[] = { 
    DEFINE_PROP_END_OF_LIST(),

};



static void virtio_pci_dc_realize(DeviceState *qdev, Error **errp)

{

    VirtioPCIClass *vpciklass = VIRTIO_PCI_GET_CLASS(qdev);

    VirtIOPCIProxy *proxy = VIRTIO_PCI(qdev);

    PCIDevice *pci_dev = &proxy->pci_dev;



    if (!(proxy->flags & VIRTIO_PCI_FLAG_DISABLE_PCIE) &&

        !(proxy->flags & VIRTIO_PCI_FLAG_DISABLE_MODERN)) {

        pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS;

    }



    vpciklass->parent_dc_realize(qdev, errp);

}



static void virtio_pci_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);

    VirtioPCIClass *vpciklass = VIRTIO_PCI_CLASS(klass);



    dc->props = virtio_pci_properties;

    k->realize = virtio_pci_realize;
@@ -1890,6 +1908,8 @@ static void virtio_pci_class_init(ObjectClass *klass, void *data) 
    k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET;

    k->revision = VIRTIO_PCI_ABI_VERSION;

    k->class_id = PCI_CLASS_OTHERS;

    vpciklass->parent_dc_realize = dc->realize;

    dc->realize = virtio_pci_dc_realize;

    dc->reset = virtio_pci_reset;

}

hw/virtio/virtio-pci.h

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ typedef struct { 


typedef struct VirtioPCIClass {

    PCIDeviceClass parent_class;

    DeviceRealize parent_dc_realize;

    void (*realize)(VirtIOPCIProxy *vpci_dev, Error **errp);

} VirtioPCIClass;

include/hw/virtio/vhost.h

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ struct vhost_dev { 
int vhost_dev_init(struct vhost_dev *hdev, void *opaque,

                   VhostBackendType backend_type);

void vhost_dev_cleanup(struct vhost_dev *hdev);

bool vhost_dev_query(struct vhost_dev *hdev, VirtIODevice *vdev);

int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice *vdev);

void vhost_dev_stop(struct vhost_dev *hdev, VirtIODevice *vdev);

int vhost_dev_enable_notifiers(struct vhost_dev *hdev, VirtIODevice *vdev);