diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-07-22 09:23:43 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-07-22 09:23:43 -0500 |
| commit | bf1cd9b4f54c8f630291dcd057c3aa293a510bcb (patch) | |
| tree | f348eb9684fcc99b35797e47e12903881c8ede8b /hw/virtio-net.c | |
| parent | d1afc48b7cfdb4490f322d5d82a2aae6d545ec06 (diff) | |
| parent | aaf55b4795d95d87353a08710f237f88d81a3c35 (diff) | |
| download | focaccia-qemu-bf1cd9b4f54c8f630291dcd057c3aa293a510bcb.tar.gz focaccia-qemu-bf1cd9b4f54c8f630291dcd057c3aa293a510bcb.zip | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
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 6997e02dcf..a32cc019b0 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 |