diff options
| author | KONRAD Frederic <fred.konrad@greensocs.com> | 2013-04-11 16:30:00 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-17 10:28:59 -0500 |
| commit | 89334c8b6baebb1e84cd9bb6e796683e53391769 (patch) | |
| tree | 1dffba3d394c662ae5f97960435697d085a30e4f /hw/s390x/virtio-ccw.h | |
| parent | 74b4fe3d79098b72813e461af565557bb5d35649 (diff) | |
| download | qemu-89334c8b6baebb1e84cd9bb6e796683e53391769.tar.gz | |
virtio-net-ccw: switch to the new API.
Here the virtio-net-ccw is modified for the new API. The device
virtio-net-ccw extends virtio-ccw-device as before. It creates and
connects a virtio-net-device during the init. The properties are not modified.
Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com>
Tested-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Message-id: 1365690602-22729-6-git-send-email-fred.konrad@greensocs.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/s390x/virtio-ccw.h')
| -rw-r--r-- | hw/s390x/virtio-ccw.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h index 2208a11ca2..35ab1a5ef2 100644 --- a/hw/s390x/virtio-ccw.h +++ b/hw/s390x/virtio-ccw.h @@ -73,9 +73,7 @@ struct VirtioCcwDevice { SubchDev *sch; VirtIODevice *vdev; char *bus_id; - NICConf nic; uint32_t host_features[VIRTIO_CCW_FEATURE_SIZE]; - virtio_net_conf net; VirtIORNGConf rng; VirtioBusState bus; /* Guest provided values: */ @@ -137,6 +135,17 @@ typedef struct VirtioSerialCcw { VirtIOSerial vdev; } VirtioSerialCcw; +/* virtio-net-ccw */ + +#define TYPE_VIRTIO_NET_CCW "virtio-net-ccw" +#define VIRTIO_NET_CCW(obj) \ + OBJECT_CHECK(VirtIONetCcw, (obj), TYPE_VIRTIO_NET_CCW) + +typedef struct VirtIONetCcw { + VirtioCcwDevice parent_obj; + VirtIONet vdev; +} VirtIONetCcw; + VirtualCssBus *virtual_css_bus_init(void); void virtio_ccw_device_update_status(SubchDev *sch); VirtIODevice *virtio_ccw_get_vdev(SubchDev *sch); |