From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51365) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vq7ll-0005zI-Hk for qemu-devel@nongnu.org; Mon, 09 Dec 2013 15:49:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vq7lf-0003qW-Vm for qemu-devel@nongnu.org; Mon, 09 Dec 2013 15:49:33 -0500 Received: from mail-ee0-x22f.google.com ([2a00:1450:4013:c00::22f]:57491) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vq7lf-0003qI-PJ for qemu-devel@nongnu.org; Mon, 09 Dec 2013 15:49:27 -0500 Received: by mail-ee0-f47.google.com with SMTP id e51so1803345eek.6 for ; Mon, 09 Dec 2013 12:49:26 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 9 Dec 2013 21:48:18 +0100 Message-Id: <1386622112-27257-17-git-send-email-pbonzini@redhat.com> In-Reply-To: <1386622112-27257-1-git-send-email-pbonzini@redhat.com> References: <1386622112-27257-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] [PULL 16/30] virtio-serial: QOM realize preparations List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: cornelia.huck@de.ibm.com, 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 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c index a7ede90..313a5d8 100644 --- a/hw/char/virtio-serial-bus.c +++ b/hw/char/virtio-serial-bus.c @@ -891,8 +891,9 @@ static int virtser_port_qdev_exit(DeviceState *qdev) static int virtio_serial_device_init(VirtIODevice *vdev) { - DeviceState *qdev = DEVICE(vdev); - VirtIOSerial *vser = VIRTIO_SERIAL(vdev); + DeviceState *dev = DEVICE(vdev); + VirtIOSerial *vser = VIRTIO_SERIAL(dev); + BusState *bus; uint32_t i, max_supported_ports; if (!vser->serial.max_virtserial_ports) { @@ -912,8 +913,9 @@ static int virtio_serial_device_init(VirtIODevice *vdev) /* Spawn a new virtio-serial bus on which the ports will ride as devices */ qbus_create_inplace(&vser->bus, sizeof(vser->bus), TYPE_VIRTIO_SERIAL_BUS, - qdev, vdev->bus_name); - vser->bus.qbus.allow_hotplug = 1; + dev, vdev->bus_name); + bus = BUS(&vser->bus); + bus->allow_hotplug = 1; vser->bus.vser = vser; QTAILQ_INIT(&vser->ports); @@ -961,7 +963,7 @@ static int virtio_serial_device_init(VirtIODevice *vdev) * Register for the savevm section with the virtio-console name * to preserve backward compat */ - register_savevm(qdev, "virtio-console", -1, 3, virtio_serial_save, + register_savevm(dev, "virtio-console", -1, 3, virtio_serial_save, virtio_serial_load, vser); return 0; -- 1.8.4.2