Commit 9bb73502 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



virtio: features, tests

libqos update with support for virtio 1.
Packed ring support for virtio.

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

# gpg: Signature made Fri 25 Oct 2019 12:47:59 BST
# gpg:                using RSA key 281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full]
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>" [full]
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* remotes/mst/tags/for_upstream: (25 commits)
  virtio: drop unused virtio_device_stop_ioeventfd() function
  libqos: add VIRTIO PCI 1.0 support
  libqos: extract Legacy virtio-pci.c code
  libqos: make the virtio-pci BAR index configurable
  libqos: expose common virtqueue setup/cleanup functions
  libqos: add MSI-X callbacks to QVirtioPCIDevice
  libqos: pass full QVirtQueue to set_queue_address()
  libqos: add iteration support to qpci_find_capability()
  libqos: access VIRTIO 1.0 vring in little-endian
  libqos: implement VIRTIO 1.0 FEATURES_OK step
  libqos: enforce Device Initialization order
  libqos: add missing virtio-9p feature negotiation
  tests/virtio-blk-test: set up virtqueue after feature negotiation
  virtio-scsi-test: add missing feature negotiation
  libqos: extend feature bits to 64-bit
  libqos: read QVIRTIO_MMIO_VERSION register
  tests/virtio-blk-test: read config space after feature negotiation
  virtio: add property to enable packed virtqueue
  vhost_net: enable packed ring support
  virtio: event suppression support for packed ring
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 88c1fd4c 909c548c

hw/block/virtio-blk.c

+6 −1
Original line number Diff line number Diff line
@@ -1052,7 +1052,7 @@ static void virtio_blk_save_device(VirtIODevice *vdev, QEMUFile *f) 
            qemu_put_be32(f, virtio_get_queue_index(req->vq));

        }



        qemu_put_virtqueue_element(f, &req->elem);

        qemu_put_virtqueue_element(vdev, f, &req->elem);

        req = req->next;

    }

    qemu_put_sbyte(f, 0);
@@ -1206,10 +1206,15 @@ static void virtio_blk_device_unrealize(DeviceState *dev, Error **errp) 
{

    VirtIODevice *vdev = VIRTIO_DEVICE(dev);

    VirtIOBlock *s = VIRTIO_BLK(dev);

    VirtIOBlkConf *conf = &s->conf;

    unsigned i;



    blk_drain(s->blk);

    virtio_blk_data_plane_destroy(s->dataplane);

    s->dataplane = NULL;

    for (i = 0; i < conf->num_queues; i++) {

        virtio_del_queue(vdev, i);

    }

    qemu_del_vm_change_state_handler(s->change);

    blockdev_mark_auto_del(s->blk);

    virtio_cleanup(vdev);

hw/char/virtio-serial-bus.c

+1 −1
Original line number Diff line number Diff line
@@ -708,7 +708,7 @@ static void virtio_serial_save_device(VirtIODevice *vdev, QEMUFile *f) 
        if (elem_popped) {

            qemu_put_be32s(f, &port->iov_idx);

            qemu_put_be64s(f, &port->iov_offset);

            qemu_put_virtqueue_element(f, port->elem);

            qemu_put_virtqueue_element(vdev, f, port->elem);

        }

    }

}

hw/net/vhost_net.c

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ static const int kernel_feature_bits[] = { 
    VIRTIO_F_VERSION_1,

    VIRTIO_NET_F_MTU,

    VIRTIO_F_IOMMU_PLATFORM,

    VIRTIO_F_RING_PACKED,

    VHOST_INVALID_FEATURE_BIT

};
@@ -74,6 +75,7 @@ static const int user_feature_bits[] = { 
    VIRTIO_NET_F_MRG_RXBUF,

    VIRTIO_NET_F_MTU,

    VIRTIO_F_IOMMU_PLATFORM,

    VIRTIO_F_RING_PACKED,



    /* This bit implies RARP isn't sent by QEMU out of band */

    VIRTIO_NET_F_GUEST_ANNOUNCE,

hw/scsi/virtio-scsi.c

+2 −1
Original line number Diff line number Diff line
@@ -190,11 +190,12 @@ static void virtio_scsi_save_request(QEMUFile *f, SCSIRequest *sreq) 
{

    VirtIOSCSIReq *req = sreq->hba_private;

    VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(req->dev);

    VirtIODevice *vdev = VIRTIO_DEVICE(req->dev);

    uint32_t n = virtio_get_queue_index(req->vq) - 2;



    assert(n < vs->conf.num_queues);

    qemu_put_be32s(f, &n);

    qemu_put_virtqueue_element(f, &req->elem);

    qemu_put_virtqueue_element(vdev, f, &req->elem);

}



static void *virtio_scsi_load_request(QEMUFile *f, SCSIRequest *sreq)

hw/virtio/virtio-rng.c

+1 −0
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ static void virtio_rng_device_unrealize(DeviceState *dev, Error **errp) 
    qemu_del_vm_change_state_handler(vrng->vmstate);

    timer_del(vrng->rate_limit_timer);

    timer_free(vrng->rate_limit_timer);

    virtio_del_queue(vdev, 0);

    virtio_cleanup(vdev);

}