diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-03-13 21:50:39 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-03-13 21:50:40 +0000 |
| commit | b19fc63cadb2815d5bcb1ec25b22849e455cbb31 (patch) | |
| tree | 2b673750f06a40b9e78d5ed8142e6f8e49936a93 /hw | |
| parent | 90c5d39cb847d7f360454950be647cd83cacea58 (diff) | |
| parent | 01c22f2cdd4fcf02276ea10f48253850a5fd7259 (diff) | |
Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-2.0' into staging
QOM/QTest infrastructure fixes
* QOM cast fix for virtserialport and regression test
* QTest error handling fix
* QTest output cleanup
# gpg: Signature made Thu 13 Mar 2014 20:43:34 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg: aka "Andreas Färber <afaerber@suse.com>"
* remotes/afaerber/tags/qom-devices-for-2.0:
main-loop: Suppress "I/O thread spun" warnings for qtest
qtest: Fix crash if SIGABRT during qtest_init()
virtio-console-test: Test virtserialport as well
virtio-console: Fix VIRTIO_CONSOLE() cast macro
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/char/virtio-console.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c index ffd29a80bc..6c8be0fe26 100644 --- a/hw/char/virtio-console.c +++ b/hw/char/virtio-console.c @@ -15,9 +15,9 @@ #include "trace.h" #include "hw/virtio/virtio-serial.h" -#define TYPE_VIRTIO_CONSOLE "virtconsole" +#define TYPE_VIRTIO_CONSOLE_SERIAL_PORT "virtserialport" #define VIRTIO_CONSOLE(obj) \ - OBJECT_CHECK(VirtConsole, (obj), TYPE_VIRTIO_CONSOLE) + OBJECT_CHECK(VirtConsole, (obj), TYPE_VIRTIO_CONSOLE_SERIAL_PORT) typedef struct VirtConsole { VirtIOSerialPort parent_obj; @@ -154,28 +154,16 @@ static void virtconsole_unrealize(DeviceState *dev, Error **errp) } } -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->realize = virtconsole_realize; - k->unrealize = virtconsole_unrealize; - k->have_data = flush_buf; - k->set_guest_connected = set_guest_connected; - dc->props = virtconsole_properties; } static const TypeInfo virtconsole_info = { - .name = TYPE_VIRTIO_CONSOLE, - .parent = TYPE_VIRTIO_SERIAL_PORT, - .instance_size = sizeof(VirtConsole), + .name = "virtconsole", + .parent = TYPE_VIRTIO_CONSOLE_SERIAL_PORT, .class_init = virtconsole_class_init, }; @@ -197,7 +185,7 @@ static void virtserialport_class_init(ObjectClass *klass, void *data) } static const TypeInfo virtserialport_info = { - .name = "virtserialport", + .name = TYPE_VIRTIO_CONSOLE_SERIAL_PORT, .parent = TYPE_VIRTIO_SERIAL_PORT, .instance_size = sizeof(VirtConsole), .class_init = virtserialport_class_init, @@ -205,8 +193,8 @@ static const TypeInfo virtserialport_info = { static void virtconsole_register_types(void) { - type_register_static(&virtconsole_info); type_register_static(&virtserialport_info); + type_register_static(&virtconsole_info); } type_init(virtconsole_register_types) |