From patchwork Tue Apr 9 12:53:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fred.konrad@greensocs.com X-Patchwork-Id: 235071 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 879BE2C00A5 for ; Tue, 9 Apr 2013 22:54:41 +1000 (EST) Received: from localhost ([::1]:32784 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPY4N-0007Zm-OB for incoming@patchwork.ozlabs.org; Tue, 09 Apr 2013 08:54:39 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57280) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPY3l-0007Lk-75 for qemu-devel@nongnu.org; Tue, 09 Apr 2013 08:54:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UPY3j-000582-Jn for qemu-devel@nongnu.org; Tue, 09 Apr 2013 08:54:01 -0400 Received: from greensocs.com ([87.106.252.221]:42119 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPY3j-00057p-BF for qemu-devel@nongnu.org; Tue, 09 Apr 2013 08:53:59 -0400 Received: from localhost (unknown [127.0.0.1]) by s15328186.onlinehome-server.info (Postfix) with ESMTP id C36B5400091; Tue, 9 Apr 2013 12:53:58 +0000 (UTC) Received: from s15328186.onlinehome-server.info ([127.0.0.1]) by localhost (s15328186.onlinehome-server.info [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BBCiUCxw8tWJ; Tue, 9 Apr 2013 14:53:55 +0200 (CEST) Received: by s15328186.onlinehome-server.info (Postfix, from userid 491) id C91A540EC67; Tue, 9 Apr 2013 14:53:55 +0200 (CEST) Received: from localhost.localdomain (unknown [84.7.168.138]) by s15328186.onlinehome-server.info (Postfix) with ESMTPSA id A39E2400091; Tue, 9 Apr 2013 14:53:54 +0200 (CEST) From: fred.konrad@greensocs.com To: aliguori@us.ibm.com, qemu-devel@nongnu.org, amit.shah@redhat.com Date: Tue, 9 Apr 2013 14:53:35 +0200 Message-Id: <1365512016-21944-7-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1365512016-21944-1-git-send-email-fred.konrad@greensocs.com> References: <1365512016-21944-1-git-send-email-fred.konrad@greensocs.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 87.106.252.221 Cc: cornelia.huck@de.ibm.com, peter.maydell@linaro.org, mark.burton@greensocs.com, fred.konrad@greensocs.com Subject: [Qemu-devel] [PATCH v6 6/7] virtio-serial: cleanup: use QOM casts. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: KONRAD Frederic As the virtio-serial-pci and virtio-serial-s390 are switched to the new API, we can use QOM casts. Signed-off-by: KONRAD Frederic --- hw/char/virtio-serial-bus.c | 50 ++++++++++++++++++++------------------- include/hw/virtio/virtio-serial.h | 2 +- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c index 6dec044..aabb36a 100644 --- a/hw/char/virtio-serial-bus.c +++ b/hw/char/virtio-serial-bus.c @@ -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; diff --git a/include/hw/virtio/virtio-serial.h b/include/hw/virtio/virtio-serial.h index fbaf65f..3808bc3 100644 --- a/include/hw/virtio/virtio-serial.h +++ b/include/hw/virtio/virtio-serial.h @@ -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 */