virtio-serial: Convert to QOM realize
Signed-off-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
75884afd5c
commit
863462440d
|
@ -889,23 +889,24 @@ static int virtser_port_qdev_exit(DeviceState *qdev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int virtio_serial_device_init(VirtIODevice *vdev)
|
static void virtio_serial_device_realize(DeviceState *dev, Error **errp)
|
||||||
{
|
{
|
||||||
DeviceState *dev = DEVICE(vdev);
|
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
|
||||||
VirtIOSerial *vser = VIRTIO_SERIAL(dev);
|
VirtIOSerial *vser = VIRTIO_SERIAL(dev);
|
||||||
BusState *bus;
|
BusState *bus;
|
||||||
uint32_t i, max_supported_ports;
|
uint32_t i, max_supported_ports;
|
||||||
|
|
||||||
if (!vser->serial.max_virtserial_ports) {
|
if (!vser->serial.max_virtserial_ports) {
|
||||||
return -1;
|
error_setg(errp, "Maximum number of serial ports not specified");
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Each port takes 2 queues, and one pair is for the control queue */
|
/* Each port takes 2 queues, and one pair is for the control queue */
|
||||||
max_supported_ports = VIRTIO_PCI_QUEUE_MAX / 2 - 1;
|
max_supported_ports = VIRTIO_PCI_QUEUE_MAX / 2 - 1;
|
||||||
|
|
||||||
if (vser->serial.max_virtserial_ports > max_supported_ports) {
|
if (vser->serial.max_virtserial_ports > max_supported_ports) {
|
||||||
error_report("maximum ports supported: %u", max_supported_ports);
|
error_setg(errp, "maximum ports supported: %u", max_supported_ports);
|
||||||
return -1;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtio_init(vdev, "virtio-serial", VIRTIO_ID_CONSOLE,
|
virtio_init(vdev, "virtio-serial", VIRTIO_ID_CONSOLE,
|
||||||
|
@ -965,8 +966,6 @@ static int virtio_serial_device_init(VirtIODevice *vdev)
|
||||||
*/
|
*/
|
||||||
register_savevm(dev, "virtio-console", -1, 3, virtio_serial_save,
|
register_savevm(dev, "virtio-console", -1, 3, virtio_serial_save,
|
||||||
virtio_serial_load, vser);
|
virtio_serial_load, vser);
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void virtio_serial_port_class_init(ObjectClass *klass, void *data)
|
static void virtio_serial_port_class_init(ObjectClass *klass, void *data)
|
||||||
|
@ -1016,9 +1015,10 @@ static void virtio_serial_class_init(ObjectClass *klass, void *data)
|
||||||
{
|
{
|
||||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||||
VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
|
VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
|
||||||
|
|
||||||
dc->props = virtio_serial_properties;
|
dc->props = virtio_serial_properties;
|
||||||
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
|
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
|
||||||
vdc->init = virtio_serial_device_init;
|
vdc->realize = virtio_serial_device_realize;
|
||||||
vdc->exit = virtio_serial_device_exit;
|
vdc->exit = virtio_serial_device_exit;
|
||||||
vdc->get_features = get_features;
|
vdc->get_features = get_features;
|
||||||
vdc->get_config = get_config;
|
vdc->get_config = get_config;
|
||||||
|
|
Loading…
Reference in a new issue