diff options
| author | KONRAD Frederic <fred.konrad@greensocs.com> | 2013-04-11 16:29:57 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-17 10:28:21 -0500 |
| commit | 17ec5a8686143da66208273d355f2eeb09807614 (patch) | |
| tree | a665f4a4d1d16abe0ffbb2db0877312eb1005d99 /hw/s390x | |
| parent | 6a87acf7df4b31ca0896b95b86dac9698420a9ed (diff) | |
| download | qemu-17ec5a8686143da66208273d355f2eeb09807614.tar.gz | |
virtio-net: add the virtio-net device.
Create virtio-net-device which extends virtio-device, so it can be connected on
virtio-bus.
Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com>
Tested-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Message-id: 1365690602-22729-3-git-send-email-fred.konrad@greensocs.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/s390x')
| -rw-r--r-- | hw/s390x/s390-virtio-bus.c | 6 | ||||
| -rw-r--r-- | hw/s390x/virtio-ccw.c | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c index a71c145d4e..2708af8270 100644 --- a/hw/s390x/s390-virtio-bus.c +++ b/hw/s390x/s390-virtio-bus.c @@ -427,11 +427,7 @@ static const VirtIOBindings virtio_s390_bindings = { static Property s390_virtio_net_properties[] = { DEFINE_NIC_PROPERTIES(VirtIOS390Device, nic), DEFINE_VIRTIO_NET_FEATURES(VirtIOS390Device, host_features), - DEFINE_PROP_UINT32("x-txtimer", VirtIOS390Device, - net.txtimer, TX_TIMER_INTERVAL), - DEFINE_PROP_INT32("x-txburst", VirtIOS390Device, - net.txburst, TX_BURST), - DEFINE_PROP_STRING("tx", VirtIOS390Device, net.tx), + DEFINE_VIRTIO_NET_PROPERTIES(VirtIOS390Device, net), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 666df780d1..216c983f6c 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -769,11 +769,7 @@ static Property virtio_ccw_net_properties[] = { DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id), DEFINE_VIRTIO_NET_FEATURES(VirtioCcwDevice, host_features[0]), DEFINE_NIC_PROPERTIES(VirtioCcwDevice, nic), - DEFINE_PROP_UINT32("x-txtimer", VirtioCcwDevice, - net.txtimer, TX_TIMER_INTERVAL), - DEFINE_PROP_INT32("x-txburst", VirtioCcwDevice, - net.txburst, TX_BURST), - DEFINE_PROP_STRING("tx", VirtioCcwDevice, net.tx), + DEFINE_VIRTIO_NET_PROPERTIES(VirtioCcwDevice, net), DEFINE_PROP_END_OF_LIST(), }; |