Commit 76017fd2 authored by KONRAD Frederic's avatar KONRAD Frederic Committed by Anthony Liguori
Browse files

virtio-serial: cleanup: use QOM casts. 



As the virtio-serial-pci and virtio-serial-s390 are switched to the new
API, we can use QOM casts.

Signed-off-by: default avatarKONRAD Frederic <fred.konrad@greensocs.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Tested-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: default avatarAmit Shah <amit.shah@redhat.com>
Message-id: 1365512016-21944-7-git-send-email-fred.konrad@greensocs.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 34b95b2c

hw/char/virtio-serial-bus.c

+26 −24
Original line number Diff line number Diff line
@@ -53,7 +53,8 @@ static VirtIOSerialPort *find_port_by_vq(VirtIOSerial *vser, VirtQueue *vq) 


static bool use_multiport(VirtIOSerial *vser)

{

    return vser->vdev.guest_features & (1 << VIRTIO_CONSOLE_F_MULTIPORT);

    VirtIODevice *vdev = VIRTIO_DEVICE(vser);

    return vdev->guest_features & (1 << VIRTIO_CONSOLE_F_MULTIPORT);

}



static size_t write_to_port(VirtIOSerialPort *port,
@@ -83,7 +84,7 @@ static size_t write_to_port(VirtIOSerialPort *port, 
        virtqueue_push(vq, &elem, len);

    }



    virtio_notify(&port->vser->vdev, vq);

    virtio_notify(VIRTIO_DEVICE(port->vser), vq);

    return offset;

}
@@ -156,7 +157,7 @@ static void flush_queued_data(VirtIOSerialPort *port) 
    if (!virtio_queue_ready(port->ovq)) {

        return;

    }

    do_flush_queued_data(port, port->ovq, &port->vser->vdev);

    do_flush_queued_data(port, port->ovq, VIRTIO_DEVICE(port->vser));

}



static size_t send_control_msg(VirtIOSerial *vser, void *buf, size_t len)
@@ -175,7 +176,7 @@ static size_t send_control_msg(VirtIOSerial *vser, void *buf, size_t len) 
    memcpy(elem.in_sg[0].iov_base, buf, len);



    virtqueue_push(vq, &elem, len);

    virtio_notify(&vser->vdev, vq);

    virtio_notify(VIRTIO_DEVICE(vser), vq);

    return len;

}
@@ -214,7 +215,7 @@ int virtio_serial_close(VirtIOSerialPort *port) 
     * consume, reset the throttling flag and discard the data.

     */

    port->throttled = false;

    discard_vq_data(port->ovq, &port->vser->vdev);

    discard_vq_data(port->ovq, VIRTIO_DEVICE(port->vser));



    send_control_event(port->vser, port->id, VIRTIO_CONSOLE_PORT_OPEN, 0);
@@ -237,11 +238,12 @@ ssize_t virtio_serial_write(VirtIOSerialPort *port, const uint8_t *buf, 
 */

size_t virtio_serial_guest_ready(VirtIOSerialPort *port)

{

    VirtIODevice *vdev = VIRTIO_DEVICE(port->vser);

    VirtQueue *vq = port->ivq;

    unsigned int bytes;



    if (!virtio_queue_ready(vq) ||

        !(port->vser->vdev.status & VIRTIO_CONFIG_S_DRIVER_OK) ||

        !(vdev->status & VIRTIO_CONFIG_S_DRIVER_OK) ||

        virtio_queue_empty(vq)) {

        return 0;

    }
@@ -391,7 +393,7 @@ static void control_out(VirtIODevice *vdev, VirtQueue *vq) 
    uint8_t *buf;

    size_t len;



    vser = DO_UPCAST(VirtIOSerial, vdev, vdev);

    vser = VIRTIO_SERIAL(vdev);



    len = 0;

    buf = NULL;
@@ -424,7 +426,7 @@ static void handle_output(VirtIODevice *vdev, VirtQueue *vq) 
    VirtIOSerial *vser;

    VirtIOSerialPort *port;



    vser = DO_UPCAST(VirtIOSerial, vdev, vdev);

    vser = VIRTIO_SERIAL(vdev);

    port = find_port_by_vq(vser, vq);



    if (!port || !port->host_connected) {
@@ -446,7 +448,7 @@ static uint32_t get_features(VirtIODevice *vdev, uint32_t features) 
{

    VirtIOSerial *vser;



    vser = DO_UPCAST(VirtIOSerial, vdev, vdev);

    vser = VIRTIO_SERIAL(vdev);



    if (vser->bus.max_nr_ports > 1) {

        features |= (1 << VIRTIO_CONSOLE_F_MULTIPORT);
@@ -459,7 +461,7 @@ static void get_config(VirtIODevice *vdev, uint8_t *config_data) 
{

    VirtIOSerial *vser;



    vser = DO_UPCAST(VirtIOSerial, vdev, vdev);

    vser = VIRTIO_SERIAL(vdev);

    memcpy(config_data, &vser->config, sizeof(struct virtio_console_config));

}
@@ -491,7 +493,7 @@ static void set_status(VirtIODevice *vdev, uint8_t status) 
    VirtIOSerial *vser;

    VirtIOSerialPort *port;



    vser = DO_UPCAST(VirtIOSerial, vdev, vdev);

    vser = VIRTIO_SERIAL(vdev);

    port = find_port_by_id(vser, 0);



    if (port && !use_multiport(port->vser)
@@ -513,19 +515,19 @@ static void vser_reset(VirtIODevice *vdev) 
{

    VirtIOSerial *vser;



    vser = DO_UPCAST(VirtIOSerial, vdev, vdev);

    vser = VIRTIO_SERIAL(vdev);

    guest_reset(vser);

}



static void virtio_serial_save(QEMUFile *f, void *opaque)

{

    VirtIOSerial *s = opaque;

    VirtIOSerial *s = VIRTIO_SERIAL(opaque);

    VirtIOSerialPort *port;

    uint32_t nr_active_ports;

    unsigned int i, max_nr_ports;



    /* The virtio device */

    virtio_save(&s->vdev, f);

    virtio_save(VIRTIO_DEVICE(s), f);



    /* The config space */

    qemu_put_be16s(f, &s->config.cols);
@@ -576,7 +578,7 @@ static void virtio_serial_save(QEMUFile *f, void *opaque) 
static void virtio_serial_post_load_timer_cb(void *opaque)

{

    uint32_t i;

    VirtIOSerial *s = opaque;

    VirtIOSerial *s = VIRTIO_SERIAL(opaque);

    VirtIOSerialPort *port;

    uint8_t host_connected;

    VirtIOSerialPortClass *vsc;
@@ -664,7 +666,7 @@ static int fetch_active_ports_list(QEMUFile *f, int version_id, 


static int virtio_serial_load(QEMUFile *f, void *opaque, int version_id)

{

    VirtIOSerial *s = opaque;

    VirtIOSerial *s = VIRTIO_SERIAL(opaque);

    uint32_t max_nr_ports, nr_active_ports, ports_map;

    unsigned int i;

    int ret;
@@ -674,7 +676,7 @@ static int virtio_serial_load(QEMUFile *f, void *opaque, int version_id) 
    }



    /* The virtio device */

    ret = virtio_load(&s->vdev, f);

    ret = virtio_load(VIRTIO_DEVICE(s), f);

    if (ret) {

        return ret;

    }
@@ -801,7 +803,7 @@ static void remove_port(VirtIOSerial *vser, uint32_t port_id) 
    assert(port);



    /* Flush out any unconsumed buffers first */

    discard_vq_data(port->ovq, &port->vser->vdev);

    discard_vq_data(port->ovq, VIRTIO_DEVICE(port->vser));



    send_control_event(vser, port->id, VIRTIO_CONSOLE_PORT_REMOVE, 1);

}
@@ -865,7 +867,7 @@ static int virtser_port_qdev_init(DeviceState *qdev) 
    add_port(port->vser, port->id);



    /* Send an update to the guest about this new port added */

    virtio_notify_config(&port->vser->vdev);

    virtio_notify_config(VIRTIO_DEVICE(port->vser));



    return ret;

}
@@ -952,11 +954,11 @@ static int virtio_serial_device_init(VirtIODevice *vdev) 
     */

    mark_port_added(vser, 0);



    vser->vdev.get_features = get_features;

    vser->vdev.get_config = get_config;

    vser->vdev.set_config = set_config;

    vser->vdev.set_status = set_status;

    vser->vdev.reset = vser_reset;

    vdev->get_features = get_features;

    vdev->get_config = get_config;

    vdev->set_config = set_config;

    vdev->set_status = set_status;

    vdev->reset = vser_reset;



    vser->qdev = qdev;

include/hw/virtio/virtio-serial.h

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ typedef struct VirtIOSerialPostLoad { 
} VirtIOSerialPostLoad;



struct VirtIOSerial {

    VirtIODevice vdev;

    VirtIODevice parent_obj;



    VirtQueue *c_ivq, *c_ovq;

    /* Arrays of ivqs and ovqs: one per port */