From 30bff6a0f1d12742475a980708cfa82be56a881f Mon Sep 17 00:00:00 2001 From: KONRAD Frederic Date: Wed, 27 Mar 2013 10:49:12 +0100 Subject: virtio-balloon-ccw: switch to the new API. Here the virtio-balloon-ccw is modified for the new API. The device virtio-balloon-ccw extends virtio-ccw-device as before. It creates and connects a virtio-balloon during the init. The properties are not modified. Signed-off-by: KONRAD Frederic Reviewed-by: Cornelia Huck Reviewed-by: Peter Maydell Tested-by: Cornelia Huck Message-id: 1364377755-15508-4-git-send-email-fred.konrad@greensocs.com Signed-off-by: Anthony Liguori --- hw/s390x/virtio-ccw.c | 25 ++++++++++++++----------- hw/s390x/virtio-ccw.h | 11 +++++++++++ 2 files changed, 25 insertions(+), 11 deletions(-) (limited to 'hw/s390x') diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 7e79c5795a..5dce791406 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -608,22 +608,24 @@ static int virtio_ccw_serial_exit(VirtioCcwDevice *dev) return virtio_ccw_exit(dev); } -static int virtio_ccw_balloon_init(VirtioCcwDevice *dev) +static int virtio_ccw_balloon_init(VirtioCcwDevice *ccw_dev) { - VirtIODevice *vdev; + VirtIOBalloonCcw *dev = VIRTIO_BALLOON_CCW(ccw_dev); + DeviceState *vdev = DEVICE(&dev->vdev); - vdev = virtio_balloon_init((DeviceState *)dev); - if (!vdev) { + qdev_set_parent_bus(vdev, BUS(&ccw_dev->bus)); + if (qdev_init(vdev) < 0) { return -1; } - return virtio_ccw_device_init(dev, vdev); + return virtio_ccw_device_init(ccw_dev, VIRTIO_DEVICE(vdev)); } -static int virtio_ccw_balloon_exit(VirtioCcwDevice *dev) +static void virtio_ccw_balloon_instance_init(Object *obj) { - virtio_balloon_exit(dev->vdev); - return virtio_ccw_exit(dev); + VirtIOBalloonCcw *dev = VIRTIO_BALLOON_CCW(obj); + object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_BALLOON); + object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); } static int virtio_ccw_scsi_init(VirtioCcwDevice *ccw_dev) @@ -820,15 +822,16 @@ static void virtio_ccw_balloon_class_init(ObjectClass *klass, void *data) VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass); k->init = virtio_ccw_balloon_init; - k->exit = virtio_ccw_balloon_exit; + k->exit = virtio_ccw_exit; dc->reset = virtio_ccw_reset; dc->props = virtio_ccw_balloon_properties; } static const TypeInfo virtio_ccw_balloon = { - .name = "virtio-balloon-ccw", + .name = TYPE_VIRTIO_BALLOON_CCW, .parent = TYPE_VIRTIO_CCW_DEVICE, - .instance_size = sizeof(VirtioCcwDevice), + .instance_size = sizeof(VirtIOBalloonCcw), + .instance_init = virtio_ccw_balloon_instance_init, .class_init = virtio_ccw_balloon_class_init, }; diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h index d9f73997df..d580510283 100644 --- a/hw/s390x/virtio-ccw.h +++ b/hw/s390x/virtio-ccw.h @@ -16,6 +16,7 @@ #include #include #include +#include "hw/virtio-balloon.h" #include #include @@ -115,6 +116,16 @@ typedef struct VirtIOBlkCcw { VirtIOBlkConf blk; } VirtIOBlkCcw; +/* virtio-balloon-ccw */ + +#define TYPE_VIRTIO_BALLOON_CCW "virtio-balloon-ccw" +#define VIRTIO_BALLOON_CCW(obj) \ + OBJECT_CHECK(VirtIOBalloonCcw, (obj), TYPE_VIRTIO_BALLOON_CCW) + +typedef struct VirtIOBalloonCcw { + VirtioCcwDevice parent_obj; + VirtIOBalloon vdev; +} VirtIOBalloonCcw; VirtualCssBus *virtual_css_bus_init(void); void virtio_ccw_device_update_status(SubchDev *sch); -- cgit v1.2.1