Skip to content

Commit

Permalink
virtio-ccw: Pass size to virtio_ccw_bus_new()
Browse files Browse the repository at this point in the history
To be passed to qbus_create_inplace().

Reviewed-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
  • Loading branch information
afaerber committed Aug 30, 2013
1 parent 5d6c0c4 commit 1bf4d7a
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions hw/s390x/virtio-ccw.c
Expand Up @@ -27,7 +27,8 @@
#include "virtio-ccw.h"
#include "trace.h"

static void virtio_ccw_bus_new(VirtioBusState *bus, VirtioCcwDevice *dev);
static void virtio_ccw_bus_new(VirtioBusState *bus, size_t bus_size,
VirtioCcwDevice *dev);

static int virtual_css_bus_reset(BusState *qbus)
{
Expand Down Expand Up @@ -1209,7 +1210,7 @@ static int virtio_ccw_busdev_init(DeviceState *dev)
VirtioCcwDevice *_dev = (VirtioCcwDevice *)dev;
VirtIOCCWDeviceClass *_info = VIRTIO_CCW_DEVICE_GET_CLASS(dev);

virtio_ccw_bus_new(&_dev->bus, _dev);
virtio_ccw_bus_new(&_dev->bus, sizeof(_dev->bus), _dev);

return _info->init(_dev);
}
Expand Down Expand Up @@ -1289,7 +1290,8 @@ static const TypeInfo virtual_css_bridge_info = {

/* virtio-ccw-bus */

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 = DEVICE(dev);
BusState *qbus;
Expand Down

0 comments on commit 1bf4d7a

Please sign in to comment.