diff options
| author | Dmitry Fleytman <dmitry@daynix.com> | 2017-02-16 14:29:36 +0200 |
|---|---|---|
| committer | Jason Wang <jasowang@redhat.com> | 2017-03-06 11:46:02 +0800 |
| commit | 002d394fd492f837083058832edd7ee97a8c3280 (patch) | |
| tree | 0f765fd1dd8e29e79ed2c689c1dd370a7d1842e7 /hw | |
| parent | c5d083c561a4f5297cc2e44a2f3cef3324d77a88 (diff) | |
| download | qemu-002d394fd492f837083058832edd7ee97a8c3280.zip qemu-002d394fd492f837083058832edd7ee97a8c3280.tar.gz qemu-002d394fd492f837083058832edd7ee97a8c3280.tar.bz2 | |
NetRxPkt: Remove code duplication in net_rx_pkt_pull_data()
This is a refactoring commit that does not change behavior.
Signed-off-by: Dmitry Fleytman <dmitry@daynix.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/net/net_rx_pkt.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/hw/net/net_rx_pkt.c b/hw/net/net_rx_pkt.c index 2649d40..cef1c2e 100644 --- a/hw/net/net_rx_pkt.c +++ b/hw/net/net_rx_pkt.c @@ -88,20 +88,21 @@ net_rx_pkt_pull_data(struct NetRxPkt *pkt, const struct iovec *iov, int iovcnt, size_t ploff) { + uint32_t pllen = iov_size(iov, iovcnt) - ploff; + if (pkt->ehdr_buf_len) { net_rx_pkt_iovec_realloc(pkt, iovcnt + 1); pkt->vec[0].iov_base = pkt->ehdr_buf; pkt->vec[0].iov_len = pkt->ehdr_buf_len; - pkt->tot_len = iov_size(iov, iovcnt) - ploff + pkt->ehdr_buf_len; + pkt->tot_len = pllen + pkt->ehdr_buf_len; pkt->vec_len = iov_copy(pkt->vec + 1, pkt->vec_len_total - 1, - iov, iovcnt, ploff, - pkt->tot_len - pkt->ehdr_buf_len) + 1; + iov, iovcnt, ploff, pllen) + 1; } else { net_rx_pkt_iovec_realloc(pkt, iovcnt); - pkt->tot_len = iov_size(iov, iovcnt) - ploff; + pkt->tot_len = pllen; pkt->vec_len = iov_copy(pkt->vec, pkt->vec_len_total, iov, iovcnt, ploff, pkt->tot_len); } |