From 55169140020c431bae446280858bd25e1e54f366 Mon Sep 17 00:00:00 2001 From: KONRAD Frederic Date: Tue, 9 Apr 2013 14:53:32 +0200 Subject: virtio-serial-s390: switch to the new API. Here the virtio-serial-s390 is modified for the new API. The device virtio-serial-s390 extends virtio-s390-device as before. It creates and connects a virtio-serial during the init. The properties are not modified. Signed-off-by: KONRAD Frederic Reviewed-by: Cornelia Huck Reviewed-by: Peter Maydell Tested-by: Cornelia Huck Acked-by: Amit Shah Message-id: 1365512016-21944-4-git-send-email-fred.konrad@greensocs.com Signed-off-by: Anthony Liguori --- hw/s390x/s390-virtio-bus.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'hw/s390x/s390-virtio-bus.h') diff --git a/hw/s390x/s390-virtio-bus.h b/hw/s390x/s390-virtio-bus.h index c557132166..1daf753884 100644 --- a/hw/s390x/s390-virtio-bus.h +++ b/hw/s390x/s390-virtio-bus.h @@ -91,7 +91,6 @@ struct VirtIOS390Device { VirtIODevice *vdev; NICConf nic; uint32_t host_features; - virtio_serial_conf serial; virtio_net_conf net; VirtIORNGConf rng; VirtioBusState bus; @@ -141,4 +140,15 @@ typedef struct VirtIOSCSIS390 { VirtIOSCSI vdev; } VirtIOSCSIS390; +/* virtio-serial-s390 */ + +#define TYPE_VIRTIO_SERIAL_S390 "virtio-serial-s390" +#define VIRTIO_SERIAL_S390(obj) \ + OBJECT_CHECK(VirtIOSerialS390, (obj), TYPE_VIRTIO_SERIAL_S390) + +typedef struct VirtIOSerialS390 { + VirtIOS390Device parent_obj; + VirtIOSerial vdev; +} VirtIOSerialS390; + #endif -- cgit v1.2.1