diff options
| author | Anthony Liguori | 2010-09-08 21:26:14 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2010-09-08 21:26:14 +0200 |
| commit | dccbe6fbab47c9a2589f436e0592933b47cbe40b (patch) | |
| tree | e5a851b48a3801dd28282eb17533975cade7ac23 /hw/syborg_virtio.c | |
| parent | virtio-9p: Change handling of flags in open() path for 9P2000.L (diff) | |
| parent | virtio-net: Introduce a new bottom half packet TX (diff) | |
| download | qemu-dccbe6fbab47c9a2589f436e0592933b47cbe40b.tar.gz qemu-dccbe6fbab47c9a2589f436e0592933b47cbe40b.tar.xz qemu-dccbe6fbab47c9a2589f436e0592933b47cbe40b.zip | |
Merge remote branch 'mst/for_anthony' into staging
Diffstat (limited to 'hw/syborg_virtio.c')
| -rw-r--r-- | hw/syborg_virtio.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/hw/syborg_virtio.c b/hw/syborg_virtio.c index abf0370107..4dfd1a87b9 100644 --- a/hw/syborg_virtio.c +++ b/hw/syborg_virtio.c @@ -68,6 +68,7 @@ typedef struct { uint32_t id; NICConf nic; uint32_t host_features; + virtio_net_conf net; } SyborgVirtIOProxy; static uint32_t syborg_virtio_readl(void *opaque, target_phys_addr_t offset) @@ -284,7 +285,7 @@ static int syborg_virtio_net_init(SysBusDevice *dev) VirtIODevice *vdev; SyborgVirtIOProxy *proxy = FROM_SYSBUS(SyborgVirtIOProxy, dev); - vdev = virtio_net_init(&dev->qdev, &proxy->nic); + vdev = virtio_net_init(&dev->qdev, &proxy->nic, &proxy->net); return syborg_virtio_init(proxy, vdev); } @@ -295,6 +296,11 @@ static SysBusDeviceInfo syborg_virtio_net_info = { .qdev.props = (Property[]) { DEFINE_NIC_PROPERTIES(SyborgVirtIOProxy, nic), DEFINE_VIRTIO_NET_FEATURES(SyborgVirtIOProxy, host_features), + DEFINE_PROP_UINT32("x-txtimer", SyborgVirtIOProxy, + net.txtimer, TX_TIMER_INTERVAL), + DEFINE_PROP_INT32("x-txburst", SyborgVirtIOProxy, + net.txburst, TX_BURST), + DEFINE_PROP_STRING("tx", SyborgVirtIOProxy, net.tx), DEFINE_PROP_END_OF_LIST(), } }; |