From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53873) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmL9s-0006mh-9u for qemu-devel@nongnu.org; Fri, 29 Nov 2013 05:18:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VmL9m-0004hv-Mo for qemu-devel@nongnu.org; Fri, 29 Nov 2013 05:18:48 -0500 Received: from mail-ea0-x232.google.com ([2a00:1450:4013:c01::232]:43154) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmL9m-0004hd-8H for qemu-devel@nongnu.org; Fri, 29 Nov 2013 05:18:42 -0500 Received: by mail-ea0-f178.google.com with SMTP id d10so6617338eaj.37 for ; Fri, 29 Nov 2013 02:18:41 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 29 Nov 2013 11:17:36 +0100 Message-Id: <1385720262-14107-25-git-send-email-pbonzini@redhat.com> In-Reply-To: <1385720262-14107-1-git-send-email-pbonzini@redhat.com> References: <1385720262-14107-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 24/30] virtio-serial: Convert to QOM realize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: afaerber@suse.de, mst@redhat.com From: Andreas Färber Signed-off-by: Andreas Färber Signed-off-by: Paolo Bonzini --- hw/char/virtio-serial-bus.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c index 313a5d8..df96117 100644 --- a/hw/char/virtio-serial-bus.c +++ b/hw/char/virtio-serial-bus.c @@ -889,23 +889,24 @@ static int virtser_port_qdev_exit(DeviceState *qdev) return 0; } -static int virtio_serial_device_init(VirtIODevice *vdev) +static void virtio_serial_device_realize(DeviceState *dev, Error **errp) { - DeviceState *dev = DEVICE(vdev); + VirtIODevice *vdev = VIRTIO_DEVICE(dev); VirtIOSerial *vser = VIRTIO_SERIAL(dev); BusState *bus; uint32_t i, max_supported_ports; if (!vser->serial.max_virtserial_ports) { - return -1; + error_setg(errp, "Maximum number of serial ports not specified"); + return; } /* Each port takes 2 queues, and one pair is for the control queue */ max_supported_ports = VIRTIO_PCI_QUEUE_MAX / 2 - 1; if (vser->serial.max_virtserial_ports > max_supported_ports) { - error_report("maximum ports supported: %u", max_supported_ports); - return -1; + error_setg(errp, "maximum ports supported: %u", max_supported_ports); + return; } virtio_init(vdev, "virtio-serial", VIRTIO_ID_CONSOLE, @@ -965,8 +966,6 @@ static int virtio_serial_device_init(VirtIODevice *vdev) */ register_savevm(dev, "virtio-console", -1, 3, virtio_serial_save, virtio_serial_load, vser); - - return 0; } static void virtio_serial_port_class_init(ObjectClass *klass, void *data) @@ -1016,9 +1015,10 @@ static void virtio_serial_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass); + dc->props = virtio_serial_properties; set_bit(DEVICE_CATEGORY_INPUT, dc->categories); - vdc->init = virtio_serial_device_init; + vdc->realize = virtio_serial_device_realize; vdc->exit = virtio_serial_device_exit; vdc->get_features = get_features; vdc->get_config = get_config; -- 1.8.3.1