diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-09-08 14:26:14 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-09-08 14:26:14 -0500 |
| commit | dccbe6fbab47c9a2589f436e0592933b47cbe40b (patch) | |
| tree | e5a851b48a3801dd28282eb17533975cade7ac23 /hw/virtio-pci.c | |
| parent | 630c26893d6dc7713c0fcfc3c09d6bfe536a6ce3 (diff) | |
| parent | a697a334b3c4d3250e6420f5d38550ea10eb5319 (diff) | |
| download | focaccia-qemu-dccbe6fbab47c9a2589f436e0592933b47cbe40b.tar.gz focaccia-qemu-dccbe6fbab47c9a2589f436e0592933b47cbe40b.zip | |
Merge remote branch 'mst/for_anthony' into staging
Diffstat (limited to 'hw/virtio-pci.c')
| -rw-r--r-- | hw/virtio-pci.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 6e8f88a141..86e6b0a561 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -107,6 +107,7 @@ typedef struct { #endif /* Max. number of ports we can have for a the virtio-serial device */ uint32_t max_virtserial_ports; + virtio_net_conf net; } VirtIOPCIProxy; /* virtio device */ @@ -613,7 +614,7 @@ static int virtio_net_init_pci(PCIDevice *pci_dev) VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev); VirtIODevice *vdev; - vdev = virtio_net_init(&pci_dev->qdev, &proxy->nic); + vdev = virtio_net_init(&pci_dev->qdev, &proxy->nic, &proxy->net); vdev->nvectors = proxy->nvectors; virtio_init_pci(proxy, vdev, @@ -690,6 +691,11 @@ static PCIDeviceInfo virtio_info[] = { DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 3), DEFINE_VIRTIO_NET_FEATURES(VirtIOPCIProxy, host_features), DEFINE_NIC_PROPERTIES(VirtIOPCIProxy, nic), + DEFINE_PROP_UINT32("x-txtimer", VirtIOPCIProxy, + net.txtimer, TX_TIMER_INTERVAL), + DEFINE_PROP_INT32("x-txburst", VirtIOPCIProxy, + net.txburst, TX_BURST), + DEFINE_PROP_STRING("tx", VirtIOPCIProxy, net.tx), DEFINE_PROP_END_OF_LIST(), }, .qdev.reset = virtio_pci_reset, |