99ba777e53
In addition to the qdev_create() patterns converted so far, we have a
qdev_set_parent_bus() pattern. Mostly when we embed a device in a
parent device rather than allocating it on the heap.
This pattern also puts devices in the dangerous "no QOM parent, but
plugged into bus" state I explained in recent commit "qdev: New
qdev_new(), qdev_realize(), etc."
Apply same solution: convert to qdev_realize(). Coccinelle script:
@@
expression dev, bus, errp;
symbol true;
@@
- qdev_set_parent_bus(DEVICE(dev), bus);
...
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize(DEVICE(dev), bus, errp);
@ depends on !(file in "qdev-monitor.c") && !(file in "hw/core/qdev.c")@
expression dev, bus, errp;
symbol true;
@@
- qdev_set_parent_bus(dev, bus);
...
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize(dev, bus, errp);
@@
expression dev, bus;
symbol true;
@@
- qdev_set_parent_bus(DEVICE(dev), bus);
...
- qdev_init_nofail(DEVICE(dev));
+ qdev_realize(DEVICE(dev), bus, &error_fatal);
Unconverted uses of qdev_set_parent_bus() remain. They'll be
converted later in this series.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-12-armbru@redhat.com>
[Also convert new hw/virtio/vhost-user-vsock-pci.c]
126 lines
3.6 KiB
C
126 lines
3.6 KiB
C
/*
|
|
* virtio ccw scsi implementation
|
|
*
|
|
* Copyright 2012, 2015 IBM Corp.
|
|
* Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or (at
|
|
* your option) any later version. See the COPYING file in the top-level
|
|
* directory.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "hw/qdev-properties.h"
|
|
#include "hw/virtio/virtio.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu/module.h"
|
|
#include "virtio-ccw.h"
|
|
|
|
static void virtio_ccw_scsi_realize(VirtioCcwDevice *ccw_dev, Error **errp)
|
|
{
|
|
VirtIOSCSICcw *dev = VIRTIO_SCSI_CCW(ccw_dev);
|
|
DeviceState *vdev = DEVICE(&dev->vdev);
|
|
DeviceState *qdev = DEVICE(ccw_dev);
|
|
char *bus_name;
|
|
|
|
/*
|
|
* For command line compatibility, this sets the virtio-scsi-device bus
|
|
* name as before.
|
|
*/
|
|
if (qdev->id) {
|
|
bus_name = g_strdup_printf("%s.0", qdev->id);
|
|
virtio_device_set_child_bus_name(VIRTIO_DEVICE(vdev), bus_name);
|
|
g_free(bus_name);
|
|
}
|
|
|
|
qdev_realize(vdev, BUS(&ccw_dev->bus), errp);
|
|
}
|
|
|
|
static void virtio_ccw_scsi_instance_init(Object *obj)
|
|
{
|
|
VirtIOSCSICcw *dev = VIRTIO_SCSI_CCW(obj);
|
|
|
|
virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
|
|
TYPE_VIRTIO_SCSI);
|
|
}
|
|
|
|
static Property virtio_ccw_scsi_properties[] = {
|
|
DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags,
|
|
VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true),
|
|
DEFINE_PROP_UINT32("max_revision", VirtioCcwDevice, max_rev,
|
|
VIRTIO_CCW_MAX_REV),
|
|
DEFINE_PROP_END_OF_LIST(),
|
|
};
|
|
|
|
static void virtio_ccw_scsi_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);
|
|
|
|
k->realize = virtio_ccw_scsi_realize;
|
|
device_class_set_props(dc, virtio_ccw_scsi_properties);
|
|
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
|
|
}
|
|
|
|
static const TypeInfo virtio_ccw_scsi = {
|
|
.name = TYPE_VIRTIO_SCSI_CCW,
|
|
.parent = TYPE_VIRTIO_CCW_DEVICE,
|
|
.instance_size = sizeof(VirtIOSCSICcw),
|
|
.instance_init = virtio_ccw_scsi_instance_init,
|
|
.class_init = virtio_ccw_scsi_class_init,
|
|
};
|
|
|
|
#ifdef CONFIG_VHOST_SCSI
|
|
|
|
static void vhost_ccw_scsi_realize(VirtioCcwDevice *ccw_dev, Error **errp)
|
|
{
|
|
VHostSCSICcw *dev = VHOST_SCSI_CCW(ccw_dev);
|
|
DeviceState *vdev = DEVICE(&dev->vdev);
|
|
|
|
qdev_realize(vdev, BUS(&ccw_dev->bus), errp);
|
|
}
|
|
|
|
static void vhost_ccw_scsi_instance_init(Object *obj)
|
|
{
|
|
VHostSCSICcw *dev = VHOST_SCSI_CCW(obj);
|
|
|
|
virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
|
|
TYPE_VHOST_SCSI);
|
|
}
|
|
|
|
static Property vhost_ccw_scsi_properties[] = {
|
|
DEFINE_PROP_UINT32("max_revision", VirtioCcwDevice, max_rev,
|
|
VIRTIO_CCW_MAX_REV),
|
|
DEFINE_PROP_END_OF_LIST(),
|
|
};
|
|
|
|
static void vhost_ccw_scsi_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);
|
|
|
|
k->realize = vhost_ccw_scsi_realize;
|
|
device_class_set_props(dc, vhost_ccw_scsi_properties);
|
|
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
|
|
}
|
|
|
|
static const TypeInfo vhost_ccw_scsi = {
|
|
.name = TYPE_VHOST_SCSI_CCW,
|
|
.parent = TYPE_VIRTIO_CCW_DEVICE,
|
|
.instance_size = sizeof(VHostSCSICcw),
|
|
.instance_init = vhost_ccw_scsi_instance_init,
|
|
.class_init = vhost_ccw_scsi_class_init,
|
|
};
|
|
|
|
#endif
|
|
|
|
static void virtio_ccw_scsi_register(void)
|
|
{
|
|
type_register_static(&virtio_ccw_scsi);
|
|
#ifdef CONFIG_VHOST_SCSI
|
|
type_register_static(&vhost_ccw_scsi);
|
|
#endif
|
|
}
|
|
|
|
type_init(virtio_ccw_scsi_register)
|