Commit f24a6840 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

virtio-ccw: remove vdev field 



The vdev field is complicated to synchronize.  Just access the
BusState's list of children.

Cc: qemu-stable@nongnu.org
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: default avatarAndreas Faerber <afaerber@suse.de>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 06d3dff0

hw/s390x/virtio-ccw.c

+44 −36
Original line number Diff line number Diff line
@@ -57,9 +57,10 @@ static const TypeInfo virtual_css_bus_info = { 
VirtIODevice *virtio_ccw_get_vdev(SubchDev *sch)

{

    VirtIODevice *vdev = NULL;

    VirtioCcwDevice *dev = sch->driver_data;



    if (sch->driver_data) {

        vdev = ((VirtioCcwDevice *)sch->driver_data)->vdev;

    if (dev) {

        vdev = virtio_bus_get_device(&dev->bus);

    }

    return vdev;

}
@@ -67,7 +68,8 @@ VirtIODevice *virtio_ccw_get_vdev(SubchDev *sch) 
static int virtio_ccw_set_guest2host_notifier(VirtioCcwDevice *dev, int n,

                                              bool assign, bool set_handler)

{

    VirtQueue *vq = virtio_get_queue(dev->vdev, n);

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

    VirtQueue *vq = virtio_get_queue(vdev, n);

    EventNotifier *notifier = virtio_queue_get_host_notifier(vq);

    int r = 0;

    SubchDev *sch = dev->sch;
@@ -97,6 +99,7 @@ static int virtio_ccw_set_guest2host_notifier(VirtioCcwDevice *dev, int n, 


static void virtio_ccw_start_ioeventfd(VirtioCcwDevice *dev)

{

    VirtIODevice *vdev;

    int n, r;



    if (!(dev->flags & VIRTIO_CCW_FLAG_USE_IOEVENTFD) ||
@@ -104,8 +107,9 @@ static void virtio_ccw_start_ioeventfd(VirtioCcwDevice *dev) 
        dev->ioeventfd_started) {

        return;

    }

    vdev = virtio_bus_get_device(&dev->bus);

    for (n = 0; n < VIRTIO_PCI_QUEUE_MAX; n++) {

        if (!virtio_queue_get_num(dev->vdev, n)) {

        if (!virtio_queue_get_num(vdev, n)) {

            continue;

        }

        r = virtio_ccw_set_guest2host_notifier(dev, n, true, true);
@@ -118,7 +122,7 @@ static void virtio_ccw_start_ioeventfd(VirtioCcwDevice *dev) 


  assign_error:

    while (--n >= 0) {

        if (!virtio_queue_get_num(dev->vdev, n)) {

        if (!virtio_queue_get_num(vdev, n)) {

            continue;

        }

        r = virtio_ccw_set_guest2host_notifier(dev, n, false, false);
@@ -132,13 +136,15 @@ static void virtio_ccw_start_ioeventfd(VirtioCcwDevice *dev) 


static void virtio_ccw_stop_ioeventfd(VirtioCcwDevice *dev)

{

    VirtIODevice *vdev;

    int n, r;



    if (!dev->ioeventfd_started) {

        return;

    }

    vdev = virtio_bus_get_device(&dev->bus);

    for (n = 0; n < VIRTIO_PCI_QUEUE_MAX; n++) {

        if (!virtio_queue_get_num(dev->vdev, n)) {

        if (!virtio_queue_get_num(vdev, n)) {

            continue;

        }

        r = virtio_ccw_set_guest2host_notifier(dev, n, false, false);
@@ -189,7 +195,7 @@ typedef struct VirtioFeatDesc { 
static int virtio_ccw_set_vqs(SubchDev *sch, uint64_t addr, uint32_t align,

                              uint16_t index, uint16_t num)

{

    VirtioCcwDevice *dev = sch->driver_data;

    VirtIODevice *vdev = virtio_ccw_get_vdev(sch);



    if (index > VIRTIO_PCI_QUEUE_MAX) {

        return -EINVAL;
@@ -200,23 +206,23 @@ static int virtio_ccw_set_vqs(SubchDev *sch, uint64_t addr, uint32_t align, 
        return -EINVAL;

    }



    if (!dev) {

    if (!vdev) {

        return -EINVAL;

    }



    virtio_queue_set_addr(dev->vdev, index, addr);

    virtio_queue_set_addr(vdev, index, addr);

    if (!addr) {

        virtio_queue_set_vector(dev->vdev, index, 0);

        virtio_queue_set_vector(vdev, index, 0);

    } else {

        /* Fail if we don't have a big enough queue. */

        /* TODO: Add interface to handle vring.num changing */

        if (virtio_queue_get_num(dev->vdev, index) > num) {

        if (virtio_queue_get_num(vdev, index) > num) {

            return -EINVAL;

        }

        virtio_queue_set_vector(dev->vdev, index, index);

        virtio_queue_set_vector(vdev, index, index);

    }

    /* tell notify handler in case of config change */

    dev->vdev->config_vector = VIRTIO_PCI_QUEUE_MAX;

    vdev->config_vector = VIRTIO_PCI_QUEUE_MAX;

    return 0;

}
@@ -230,6 +236,7 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) 
    hwaddr indicators;

    VqConfigBlock vq_config;

    VirtioCcwDevice *dev = sch->driver_data;

    VirtIODevice *vdev = virtio_ccw_get_vdev(sch);

    bool check_len;

    int len;

    hwaddr hw_len;
@@ -272,7 +279,7 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) 
        break;

    case CCW_CMD_VDEV_RESET:

        virtio_ccw_stop_ioeventfd(dev);

        virtio_reset(dev->vdev);

        virtio_reset(vdev);

        ret = 0;

        break;

    case CCW_CMD_READ_FEAT:
@@ -319,7 +326,7 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) 
            features.features = ldl_le_phys(ccw.cda);

            if (features.index < ARRAY_SIZE(dev->host_features)) {

                virtio_bus_set_vdev_features(&dev->bus, features.features);

                dev->vdev->guest_features = features.features;

                vdev->guest_features = features.features;

            } else {

                /*

                 * If the guest supports more feature bits, assert that it
@@ -337,30 +344,30 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) 
        break;

    case CCW_CMD_READ_CONF:

        if (check_len) {

            if (ccw.count > dev->vdev->config_len) {

            if (ccw.count > vdev->config_len) {

                ret = -EINVAL;

                break;

            }

        }

        len = MIN(ccw.count, dev->vdev->config_len);

        len = MIN(ccw.count, vdev->config_len);

        if (!ccw.cda) {

            ret = -EFAULT;

        } else {

            virtio_bus_get_vdev_config(&dev->bus, dev->vdev->config);

            virtio_bus_get_vdev_config(&dev->bus, vdev->config);

            /* XXX config space endianness */

            cpu_physical_memory_write(ccw.cda, dev->vdev->config, len);

            cpu_physical_memory_write(ccw.cda, vdev->config, len);

            sch->curr_status.scsw.count = ccw.count - len;

            ret = 0;

        }

        break;

    case CCW_CMD_WRITE_CONF:

        if (check_len) {

            if (ccw.count > dev->vdev->config_len) {

            if (ccw.count > vdev->config_len) {

                ret = -EINVAL;

                break;

            }

        }

        len = MIN(ccw.count, dev->vdev->config_len);

        len = MIN(ccw.count, vdev->config_len);

        hw_len = len;

        if (!ccw.cda) {

            ret = -EFAULT;
@@ -371,9 +378,9 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) 
            } else {

                len = hw_len;

                /* XXX config space endianness */

                memcpy(dev->vdev->config, config, len);

                memcpy(vdev->config, config, len);

                cpu_physical_memory_unmap(config, hw_len, 0, hw_len);

                virtio_bus_set_vdev_config(&dev->bus, dev->vdev->config);

                virtio_bus_set_vdev_config(&dev->bus, vdev->config);

                sch->curr_status.scsw.count = ccw.count - len;

                ret = 0;

            }
@@ -397,9 +404,9 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) 
            if (!(status & VIRTIO_CONFIG_S_DRIVER_OK)) {

                virtio_ccw_stop_ioeventfd(dev);

            }

            virtio_set_status(dev->vdev, status);

            if (dev->vdev->status == 0) {

                virtio_reset(dev->vdev);

            virtio_set_status(vdev, status);

            if (vdev->status == 0) {

                virtio_reset(vdev);

            }

            if (status & VIRTIO_CONFIG_S_DRIVER_OK) {

                virtio_ccw_start_ioeventfd(dev);
@@ -463,7 +470,7 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) 
            ret = -EFAULT;

        } else {

            vq_config.index = lduw_phys(ccw.cda);

            vq_config.num_max = virtio_queue_get_num(dev->vdev,

            vq_config.num_max = virtio_queue_get_num(vdev,

                                                     vq_config.index);

            stw_phys(ccw.cda + sizeof(vq_config.index), vq_config.num_max);

            sch->curr_status.scsw.count = ccw.count - sizeof(vq_config);
@@ -495,7 +502,6 @@ static int virtio_ccw_device_init(VirtioCcwDevice *dev, VirtIODevice *vdev) 
    sch->driver_data = dev;

    dev->sch = sch;



    dev->vdev = vdev;

    dev->indicators = 0;



    /* Initialize subchannel structure. */
@@ -608,7 +614,7 @@ static int virtio_ccw_device_init(VirtioCcwDevice *dev, VirtIODevice *vdev) 
    memset(&sch->id, 0, sizeof(SenseId));

    sch->id.reserved = 0xff;

    sch->id.cu_type = VIRTIO_CCW_CU_TYPE;

    sch->id.cu_model = dev->vdev->device_id;

    sch->id.cu_model = vdev->device_id;



    /* Only the first 32 feature bits are used. */

    dev->host_features[0] = virtio_bus_get_vdev_features(&dev->bus,
@@ -891,9 +897,10 @@ static unsigned virtio_ccw_get_features(DeviceState *d) 
static void virtio_ccw_reset(DeviceState *d)

{

    VirtioCcwDevice *dev = VIRTIO_CCW_DEVICE(d);

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



    virtio_ccw_stop_ioeventfd(dev);

    virtio_reset(dev->vdev);

    virtio_reset(vdev);

    css_reset_sch(dev->sch);

    dev->indicators = 0;

    dev->indicators2 = 0;
@@ -933,9 +940,10 @@ static int virtio_ccw_set_host_notifier(DeviceState *d, int n, bool assign) 
static int virtio_ccw_set_guest_notifier(VirtioCcwDevice *dev, int n,

                                         bool assign, bool with_irqfd)

{

    VirtQueue *vq = virtio_get_queue(dev->vdev, n);

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

    VirtQueue *vq = virtio_get_queue(vdev, n);

    EventNotifier *notifier = virtio_queue_get_guest_notifier(vq);

    VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(dev->vdev);

    VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev);



    if (assign) {

        int r = event_notifier_init(notifier, 0);
@@ -951,16 +959,16 @@ static int virtio_ccw_set_guest_notifier(VirtioCcwDevice *dev, int n, 
         * land in qemu (and only the irq fd) in this code.

         */

        if (k->guest_notifier_mask) {

            k->guest_notifier_mask(dev->vdev, n, false);

            k->guest_notifier_mask(vdev, n, false);

        }

        /* get lost events and re-inject */

        if (k->guest_notifier_pending &&

            k->guest_notifier_pending(dev->vdev, n)) {

            k->guest_notifier_pending(vdev, n)) {

            event_notifier_set(notifier);

        }

    } else {

        if (k->guest_notifier_mask) {

            k->guest_notifier_mask(dev->vdev, n, true);

            k->guest_notifier_mask(vdev, n, true);

        }

        virtio_queue_set_guest_notifier_fd_handler(vq, false, with_irqfd);

        event_notifier_cleanup(notifier);
@@ -972,7 +980,7 @@ static int virtio_ccw_set_guest_notifiers(DeviceState *d, int nvqs, 
                                          bool assigned)

{

    VirtioCcwDevice *dev = VIRTIO_CCW_DEVICE(d);

    VirtIODevice *vdev = dev->vdev;

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

    int r, n;



    for (n = 0; n < nvqs; n++) {

hw/s390x/virtio-ccw.h

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

    DeviceState parent_obj;

    SubchDev *sch;

    VirtIODevice *vdev;

    char *bus_id;

    uint32_t host_features[VIRTIO_CCW_FEATURE_SIZE];

    VirtioBusState bus;