diff options
Diffstat (limited to 'hw/virtio-console.c')
| -rw-r--r-- | hw/virtio-console.c | 77 |
1 files changed, 49 insertions, 28 deletions
diff --git a/hw/virtio-console.c b/hw/virtio-console.c index 0b28a30b8c..4f2c3e4379 100644 --- a/hw/virtio-console.c +++ b/hw/virtio-console.c @@ -109,10 +109,9 @@ static void chr_event(void *opaque, int event) static int virtconsole_initfn(VirtIOSerialPort *port) { VirtConsole *vcon = DO_UPCAST(VirtConsole, port, port); - VirtIOSerialPortInfo *info = DO_UPCAST(VirtIOSerialPortInfo, qdev, - vcon->port.dev.info); + VirtIOSerialPortClass *k = VIRTIO_SERIAL_PORT_GET_CLASS(port); - if (port->id == 0 && !info->is_console) { + if (port->id == 0 && !k->is_console) { error_report("Port number 0 on virtio-serial devices reserved for virtconsole devices for backward compatibility."); return -1; } @@ -125,41 +124,63 @@ static int virtconsole_initfn(VirtIOSerialPort *port) return 0; } -static VirtIOSerialPortInfo virtconsole_info = { - .qdev.name = "virtconsole", - .qdev.size = sizeof(VirtConsole), - .is_console = true, - .init = virtconsole_initfn, - .have_data = flush_buf, - .guest_open = guest_open, - .guest_close = guest_close, - .qdev.props = (Property[]) { - DEFINE_PROP_CHR("chardev", VirtConsole, chr), - DEFINE_PROP_END_OF_LIST(), - }, +static Property virtconsole_properties[] = { + DEFINE_PROP_CHR("chardev", VirtConsole, chr), + DEFINE_PROP_END_OF_LIST(), +}; + +static void virtconsole_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + VirtIOSerialPortClass *k = VIRTIO_SERIAL_PORT_CLASS(klass); + + k->is_console = true; + k->init = virtconsole_initfn; + k->have_data = flush_buf; + k->guest_open = guest_open; + k->guest_close = guest_close; + dc->props = virtconsole_properties; +} + +static TypeInfo virtconsole_info = { + .name = "virtconsole", + .parent = TYPE_VIRTIO_SERIAL_PORT, + .instance_size = sizeof(VirtConsole), + .class_init = virtconsole_class_init, }; static void virtconsole_register(void) { - virtio_serial_port_qdev_register(&virtconsole_info); + type_register_static(&virtconsole_info); } device_init(virtconsole_register) -static VirtIOSerialPortInfo virtserialport_info = { - .qdev.name = "virtserialport", - .qdev.size = sizeof(VirtConsole), - .init = virtconsole_initfn, - .have_data = flush_buf, - .guest_open = guest_open, - .guest_close = guest_close, - .qdev.props = (Property[]) { - DEFINE_PROP_CHR("chardev", VirtConsole, chr), - DEFINE_PROP_END_OF_LIST(), - }, +static Property virtserialport_properties[] = { + DEFINE_PROP_CHR("chardev", VirtConsole, chr), + DEFINE_PROP_END_OF_LIST(), +}; + +static void virtserialport_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + VirtIOSerialPortClass *k = VIRTIO_SERIAL_PORT_CLASS(klass); + + k->init = virtconsole_initfn; + k->have_data = flush_buf; + k->guest_open = guest_open; + k->guest_close = guest_close; + dc->props = virtserialport_properties; +} + +static TypeInfo virtserialport_info = { + .name = "virtserialport", + .parent = TYPE_VIRTIO_SERIAL_PORT, + .instance_size = sizeof(VirtConsole), + .class_init = virtserialport_class_init, }; static void virtserialport_register(void) { - virtio_serial_port_qdev_register(&virtserialport_info); + type_register_static(&virtserialport_info); } device_init(virtserialport_register) |