From 6acf69cd4fcc089f6c2415912431c04e096b5d5e Mon Sep 17 00:00:00 2001 From: KONRAD Frederic Date: Tue, 9 Apr 2013 14:53:33 +0200 Subject: virtio-serial-ccw: switch to the new API. Here the virtio-serial-ccw is modified for the new API. The device virtio-serial-ccw extends virtio-ccw-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-5-git-send-email-fred.konrad@greensocs.com Signed-off-by: Anthony Liguori --- hw/s390x/virtio-ccw.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'hw/s390x/virtio-ccw.h') diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h index 46e9a558af..2208a11ca2 100644 --- a/hw/s390x/virtio-ccw.h +++ b/hw/s390x/virtio-ccw.h @@ -75,7 +75,6 @@ struct VirtioCcwDevice { char *bus_id; NICConf nic; uint32_t host_features[VIRTIO_CCW_FEATURE_SIZE]; - virtio_serial_conf serial; virtio_net_conf net; VirtIORNGConf rng; VirtioBusState bus; @@ -127,6 +126,17 @@ typedef struct VirtIOBalloonCcw { VirtIOBalloon vdev; } VirtIOBalloonCcw; +/* virtio-serial-ccw */ + +#define TYPE_VIRTIO_SERIAL_CCW "virtio-serial-ccw" +#define VIRTIO_SERIAL_CCW(obj) \ + OBJECT_CHECK(VirtioSerialCcw, (obj), TYPE_VIRTIO_SERIAL_CCW) + +typedef struct VirtioSerialCcw { + VirtioCcwDevice parent_obj; + VirtIOSerial vdev; +} VirtioSerialCcw; + VirtualCssBus *virtual_css_bus_init(void); void virtio_ccw_device_update_status(SubchDev *sch); VirtIODevice *virtio_ccw_get_vdev(SubchDev *sch); -- cgit v1.2.1