From 6acf69cd4fcc089f6c2415912431c04e096b5d5e Mon Sep 17 00:00:00 2001 From: KONRAD Frederic Date: Tue, 9 Apr 2013 14:53:33 +0200 Subject: [PATCH] virtio-serial-ccw: switch to the new API. Here the virtio-serial-ccw is modified for the new API. The device virtio-serial-ccw extends virtio-ccw-device as before. It creates and connects a virtio-serial 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 Acked-by: Amit Shah Message-id: 1365512016-21944-5-git-send-email-fred.konrad@greensocs.com Signed-off-by: Anthony Liguori --- hw/s390x/virtio-ccw.c | 28 ++++++++++++++++------------ hw/s390x/virtio-ccw.h | 12 +++++++++++- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 817d11ce1b..9f2289db41 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -590,22 +590,25 @@ static void virtio_ccw_blk_instance_init(Object *obj) object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); } -static int virtio_ccw_serial_init(VirtioCcwDevice *dev) +static int virtio_ccw_serial_init(VirtioCcwDevice *ccw_dev) { - VirtIODevice *vdev; + VirtioSerialCcw *dev = VIRTIO_SERIAL_CCW(ccw_dev); + DeviceState *vdev = DEVICE(&dev->vdev); - vdev = virtio_serial_init((DeviceState *)dev, &dev->serial); - 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_serial_exit(VirtioCcwDevice *dev) + +static void virtio_ccw_serial_instance_init(Object *obj) { - virtio_serial_exit(dev->vdev); - return virtio_ccw_exit(dev); + VirtioSerialCcw *dev = VIRTIO_SERIAL_CCW(obj); + object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_SERIAL); + object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); } static int virtio_ccw_balloon_init(VirtioCcwDevice *ccw_dev) @@ -786,7 +789,7 @@ static const TypeInfo virtio_ccw_blk = { static Property virtio_ccw_serial_properties[] = { DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id), - DEFINE_VIRTIO_SERIAL_PROPERTIES(VirtioCcwDevice, serial), + DEFINE_VIRTIO_SERIAL_PROPERTIES(VirtioSerialCcw, vdev.serial), DEFINE_VIRTIO_COMMON_FEATURES(VirtioCcwDevice, host_features[0]), DEFINE_PROP_END_OF_LIST(), }; @@ -797,15 +800,16 @@ static void virtio_ccw_serial_class_init(ObjectClass *klass, void *data) VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass); k->init = virtio_ccw_serial_init; - k->exit = virtio_ccw_serial_exit; + k->exit = virtio_ccw_exit; dc->reset = virtio_ccw_reset; dc->props = virtio_ccw_serial_properties; } static const TypeInfo virtio_ccw_serial = { - .name = "virtio-serial-ccw", + .name = TYPE_VIRTIO_SERIAL_CCW, .parent = TYPE_VIRTIO_CCW_DEVICE, - .instance_size = sizeof(VirtioCcwDevice), + .instance_size = sizeof(VirtioSerialCcw), + .instance_init = virtio_ccw_serial_instance_init, .class_init = virtio_ccw_serial_class_init, }; diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h index 46e9a558af..2208a11ca2 100644 --- a/hw/s390x/virtio-ccw.h +++ b/hw/s390x/virtio-ccw.h @@ -75,7 +75,6 @@ struct VirtioCcwDevice { char *bus_id; NICConf nic; uint32_t host_features[VIRTIO_CCW_FEATURE_SIZE]; - virtio_serial_conf serial; virtio_net_conf net; VirtIORNGConf rng; VirtioBusState bus; @@ -127,6 +126,17 @@ typedef struct VirtIOBalloonCcw { VirtIOBalloon vdev; } VirtIOBalloonCcw; +/* virtio-serial-ccw */ + +#define TYPE_VIRTIO_SERIAL_CCW "virtio-serial-ccw" +#define VIRTIO_SERIAL_CCW(obj) \ + OBJECT_CHECK(VirtioSerialCcw, (obj), TYPE_VIRTIO_SERIAL_CCW) + +typedef struct VirtioSerialCcw { + VirtioCcwDevice parent_obj; + VirtIOSerial vdev; +} VirtioSerialCcw; + VirtualCssBus *virtual_css_bus_init(void); void virtio_ccw_device_update_status(SubchDev *sch); VirtIODevice *virtio_ccw_get_vdev(SubchDev *sch);