motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-09 10:34:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

virtio-rng-ccw: switch to the new API.

Browse source 
Here the virtio-rng-ccw is modified for the new API. The device
virtio-rng-pci extends virtio-pci. It creates and connects a virtio-rng-device
during the init. The properties are not changed.

Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com>
Tested-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: Amit Shah <amit.shah@redhat.com>
Message-id: 1366790881-3026-6-git-send-email-fred.konrad@greensocs.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
KONRAD Frederic 2013-04-24 10:07:58 +02:00 • committed by Anthony Liguori
parent 0bca1f5313
commit 2db26d4ca2
2 changed files with 31 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

46
hw/s390x/virtio-ccw.c
View file

@ -709,28 +709,21 @@ static void vhost_ccw_scsi_instance_init(Object *obj)
} }
#endif #endif
static int virtio_ccw_rng_init(VirtioCcwDevice *dev) static int virtio_ccw_rng_init(VirtioCcwDevice *ccw_dev)
{ {
VirtIODevice *vdev; VirtIORNGCcw *dev = VIRTIO_RNG_CCW(ccw_dev);
DeviceState *vdev = DEVICE(&dev->vdev);
if (dev->rng.rng == NULL) { qdev_set_parent_bus(vdev, BUS(&ccw_dev->bus));
dev->rng.default_backend = RNG_RANDOM(object_new(TYPE_RNG_RANDOM)); if (qdev_init(vdev) < 0) {
object_property_add_child(OBJECT(dev), "default-backend",
OBJECT(dev->rng.default_backend), NULL);
object_property_set_link(OBJECT(dev), OBJECT(dev->rng.default_backend),
"rng", NULL);
}
vdev = virtio_rng_init((DeviceState *)dev, &dev->rng);
if (!vdev) {
return -1; return -1;
} }
return virtio_ccw_device_init(dev, vdev);
}
static int virtio_ccw_rng_exit(VirtioCcwDevice *dev) object_property_set_link(OBJECT(dev),
{ OBJECT(dev->vdev.conf.default_backend), "rng",
virtio_rng_exit(dev->vdev); NULL);
return virtio_ccw_exit(dev);
return virtio_ccw_device_init(ccw_dev, VIRTIO_DEVICE(vdev));
} }
/* DeviceState to VirtioCcwDevice. Note: used on datapath, /* DeviceState to VirtioCcwDevice. Note: used on datapath,
@ -947,18 +940,19 @@ static const TypeInfo vhost_ccw_scsi = {
}; };
#endif #endif
static void virtio_ccw_rng_initfn(Object *obj) static void virtio_ccw_rng_instance_init(Object *obj)
{ {
VirtioCcwDevice *dev = VIRTIO_CCW_DEVICE(obj); VirtIORNGCcw *dev = VIRTIO_RNG_CCW(obj);
object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_RNG);
object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);
object_property_add_link(obj, "rng", TYPE_RNG_BACKEND, object_property_add_link(obj, "rng", TYPE_RNG_BACKEND,
(Object **)&dev->rng.rng, NULL); (Object **)&dev->vdev.conf.rng, NULL);
} }
static Property virtio_ccw_rng_properties[] = { static Property virtio_ccw_rng_properties[] = {
DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id), DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id),
DEFINE_VIRTIO_COMMON_FEATURES(VirtioCcwDevice, host_features[0]), DEFINE_VIRTIO_COMMON_FEATURES(VirtioCcwDevice, host_features[0]),
DEFINE_VIRTIO_RNG_PROPERTIES(VirtioCcwDevice, rng), DEFINE_VIRTIO_RNG_PROPERTIES(VirtIORNGCcw, vdev.conf),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };
@ -968,16 +962,16 @@ static void virtio_ccw_rng_class_init(ObjectClass *klass, void *data)
VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass); VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);
k->init = virtio_ccw_rng_init; k->init = virtio_ccw_rng_init;
k->exit = virtio_ccw_rng_exit; k->exit = virtio_ccw_exit;
dc->reset = virtio_ccw_reset; dc->reset = virtio_ccw_reset;
dc->props = virtio_ccw_rng_properties; dc->props = virtio_ccw_rng_properties;
} }
static const TypeInfo virtio_ccw_rng = { static const TypeInfo virtio_ccw_rng = {
.name = "virtio-rng-ccw", .name = TYPE_VIRTIO_RNG_CCW,
.parent = TYPE_VIRTIO_CCW_DEVICE, .parent = TYPE_VIRTIO_CCW_DEVICE,
.instance_size = sizeof(VirtioCcwDevice), .instance_size = sizeof(VirtIORNGCcw),
.instance_init = virtio_ccw_rng_initfn, .instance_init = virtio_ccw_rng_instance_init,
.class_init = virtio_ccw_rng_class_init, .class_init = virtio_ccw_rng_class_init,
}; };

12
hw/s390x/virtio-ccw.h
View file

@ -77,7 +77,6 @@ struct VirtioCcwDevice {
VirtIODevice *vdev; VirtIODevice *vdev;
char *bus_id; char *bus_id;
uint32_t host_features[VIRTIO_CCW_FEATURE_SIZE]; uint32_t host_features[VIRTIO_CCW_FEATURE_SIZE];
VirtIORNGConf rng;
VirtioBusState bus; VirtioBusState bus;
/* Guest provided values: */ /* Guest provided values: */
hwaddr indicators; hwaddr indicators;
@ -160,6 +159,17 @@ typedef struct VirtIONetCcw {
VirtIONet vdev; VirtIONet vdev;
} VirtIONetCcw; } VirtIONetCcw;
/* virtio-rng-ccw */
#define TYPE_VIRTIO_RNG_CCW "virtio-rng-ccw"
#define VIRTIO_RNG_CCW(obj) \
OBJECT_CHECK(VirtIORNGCcw, (obj), TYPE_VIRTIO_RNG_CCW)
typedef struct VirtIORNGCcw {
VirtioCcwDevice parent_obj;
VirtIORNG vdev;
} VirtIORNGCcw;
VirtualCssBus *virtual_css_bus_init(void); VirtualCssBus *virtual_css_bus_init(void);
void virtio_ccw_device_update_status(SubchDev *sch); void virtio_ccw_device_update_status(SubchDev *sch);
VirtIODevice *virtio_ccw_get_vdev(SubchDev *sch); VirtIODevice *virtio_ccw_get_vdev(SubchDev *sch);