Commit 30bff6a0 authored by KONRAD Frederic's avatar KONRAD Frederic Committed by Anthony Liguori
Browse files

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: default avatarKONRAD Frederic <fred.konrad@greensocs.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Tested-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Message-id: 1364377755-15508-4-git-send-email-fred.konrad@greensocs.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent e378e88d

hw/s390x/virtio-ccw.c

+14 −11
Original line number Diff line number Diff line
@@ -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,

};

hw/s390x/virtio-ccw.h

+11 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <hw/virtio-net.h>

#include <hw/virtio-serial.h>

#include <hw/virtio-scsi.h>

#include "hw/virtio-balloon.h"

#include <hw/virtio-rng.h>

#include <hw/virtio-bus.h>
@@ -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);