diff options
| author | KONRAD Frederic <fred.konrad@greensocs.com> | 2013-04-11 16:29:59 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-17 10:28:59 -0500 |
| commit | 74b4fe3d79098b72813e461af565557bb5d35649 (patch) | |
| tree | 26bfa2ad91aeec82a3650ee592321bba5b2b1d20 /hw/s390x/s390-virtio-bus.h | |
| parent | e37da3945fa2fde161e1b217f937fc318c4b7639 (diff) | |
virtio-net-s390: switch to the new API.
Here the virtio-net-s390 is modified for the new API. The device
virtio-net-s390 extends virtio-s390-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-5-git-send-email-fred.konrad@greensocs.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/s390x/s390-virtio-bus.h')
| -rw-r--r-- | hw/s390x/s390-virtio-bus.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/hw/s390x/s390-virtio-bus.h b/hw/s390x/s390-virtio-bus.h index 1daf753884..925ed2b0b1 100644 --- a/hw/s390x/s390-virtio-bus.h +++ b/hw/s390x/s390-virtio-bus.h @@ -89,9 +89,7 @@ struct VirtIOS390Device { ram_addr_t feat_offs; uint8_t feat_len; VirtIODevice *vdev; - NICConf nic; uint32_t host_features; - virtio_net_conf net; VirtIORNGConf rng; VirtioBusState bus; }; @@ -151,4 +149,15 @@ typedef struct VirtIOSerialS390 { VirtIOSerial vdev; } VirtIOSerialS390; +/* virtio-net-s390 */ + +#define TYPE_VIRTIO_NET_S390 "virtio-net-s390" +#define VIRTIO_NET_S390(obj) \ + OBJECT_CHECK(VirtIONetS390, (obj), TYPE_VIRTIO_NET_S390) + +typedef struct VirtIONetS390 { + VirtIOS390Device parent_obj; + VirtIONet vdev; +} VirtIONetS390; + #endif |