diff options
| author | malc <av1474@comtv.ru> | 2011-07-23 00:50:37 +0400 |
|---|---|---|
| committer | malc <av1474@comtv.ru> | 2011-07-23 00:50:37 +0400 |
| commit | 670acc9bf21474b2a4456a3cd13323e48e35820d (patch) | |
| tree | 81a794b007c8b94dacf593ef8e5eaea6e90dcdc0 /hw/virtio-net.c | |
| parent | 136a0b5a66d9bdf4e2167964db2af9dbed967c85 (diff) | |
| parent | 7006b9cff356233c3db0150ec55fd999c49dfae3 (diff) | |
| download | qemu-670acc9bf21474b2a4456a3cd13323e48e35820d.zip qemu-670acc9bf21474b2a4456a3cd13323e48e35820d.tar.gz qemu-670acc9bf21474b2a4456a3cd13323e48e35820d.tar.bz2 | |
Merge branch 'master' of git://git.qemu.org/qemu
Diffstat (limited to 'hw/virtio-net.c')
| -rw-r--r-- | hw/virtio-net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/virtio-net.c b/hw/virtio-net.c index 6997e02..a32cc01 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -657,7 +657,7 @@ static ssize_t virtio_net_receive(VLANClientState *nc, const uint8_t *buf, size_ /* copy in packet. ugh */ len = iov_from_buf(sg, elem.in_num, - buf + offset, size - offset); + buf + offset, 0, size - offset); total += len; offset += len; /* If buffers can't be merged, at this point we |