From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59958) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VFUOS-0005e2-L4 for qemu-devel@nongnu.org; Fri, 30 Aug 2013 15:30:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VFUOM-0000As-Ml for qemu-devel@nongnu.org; Fri, 30 Aug 2013 15:30:04 -0400 Received: from cantor2.suse.de ([195.135.220.15]:54914 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VFUOM-0000Ak-Gg for qemu-devel@nongnu.org; Fri, 30 Aug 2013 15:29:58 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 30 Aug 2013 21:29:38 +0200 Message-Id: <1377890983-6481-13-git-send-email-afaerber@suse.de> In-Reply-To: <1377890983-6481-1-git-send-email-afaerber@suse.de> References: <1377890983-6481-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 12/17] virtio-ccw: Pass size to virtio_ccw_bus_new() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Cornelia Huck , Alexander Graf , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori , Richard Henderson To be passed to qbus_create_inplace(). Reviewed-by: Wenchao Xia Acked-by: Cornelia Huck Signed-off-by: Andreas F=C3=A4rber --- hw/s390x/virtio-ccw.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index e3b207f..36cbf42 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -27,7 +27,8 @@ #include "virtio-ccw.h" #include "trace.h" =20 -static void virtio_ccw_bus_new(VirtioBusState *bus, VirtioCcwDevice *dev= ); +static void virtio_ccw_bus_new(VirtioBusState *bus, size_t bus_size, + VirtioCcwDevice *dev); =20 static int virtual_css_bus_reset(BusState *qbus) { @@ -1209,7 +1210,7 @@ static int virtio_ccw_busdev_init(DeviceState *dev) VirtioCcwDevice *_dev =3D (VirtioCcwDevice *)dev; VirtIOCCWDeviceClass *_info =3D VIRTIO_CCW_DEVICE_GET_CLASS(dev); =20 - virtio_ccw_bus_new(&_dev->bus, _dev); + virtio_ccw_bus_new(&_dev->bus, sizeof(_dev->bus), _dev); =20 return _info->init(_dev); } @@ -1289,7 +1290,8 @@ static const TypeInfo virtual_css_bridge_info =3D { =20 /* virtio-ccw-bus */ =20 -static void virtio_ccw_bus_new(VirtioBusState *bus, VirtioCcwDevice *dev= ) +static void virtio_ccw_bus_new(VirtioBusState *bus, size_t bus_size, + VirtioCcwDevice *dev) { DeviceState *qdev =3D DEVICE(dev); BusState *qbus; --=20 1.8.1.4