* [Qemu-devel] [PATCH] net: Use iov helper functions
@ 2011-02-24 0:57 Benjamin Poirier
2011-02-24 10:08 ` Stefan Hajnoczi
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Benjamin Poirier @ 2011-02-24 0:57 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Benjamin Poirier <benjamin.poirier@gmail.com>
---
net.c | 28 ++++++----------------------
1 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/net.c b/net.c
index ec4745d..15ed40b 100644
--- a/net.c
+++ b/net.c
@@ -36,6 +36,7 @@
#include "qemu-common.h"
#include "qemu_socket.h"
#include "hw/qdev.h"
+#include "iov.h"
static QTAILQ_HEAD(, VLANState) vlans;
static QTAILQ_HEAD(, VLANClientState) non_vlan_clients;
@@ -572,30 +573,13 @@ static ssize_t vc_sendv_compat(VLANClientState *vc, const struct iovec *iov,
int iovcnt)
{
uint8_t buffer[4096];
- size_t offset = 0;
- int i;
-
- for (i = 0; i < iovcnt; i++) {
- size_t len;
+ size_t offset;
- len = MIN(sizeof(buffer) - offset, iov[i].iov_len);
- memcpy(buffer + offset, iov[i].iov_base, len);
- offset += len;
- }
+ offset = iov_to_buf(iov, iovcnt, buffer, 0, sizeof(buffer));
return vc->info->receive(vc, buffer, offset);
}
-static ssize_t calc_iov_length(const struct iovec *iov, int iovcnt)
-{
- size_t offset = 0;
- int i;
-
- for (i = 0; i < iovcnt; i++)
- offset += iov[i].iov_len;
- return offset;
-}
-
static ssize_t qemu_deliver_packet_iov(VLANClientState *sender,
unsigned flags,
const struct iovec *iov,
@@ -605,7 +589,7 @@ static ssize_t qemu_deliver_packet_iov(VLANClientState *sender,
VLANClientState *vc = opaque;
if (vc->link_down) {
- return calc_iov_length(iov, iovcnt);
+ return iov_size(iov, iovcnt);
}
if (vc->info->receive_iov) {
@@ -633,7 +617,7 @@ static ssize_t qemu_vlan_deliver_packet_iov(VLANClientState *sender,
}
if (vc->link_down) {
- ret = calc_iov_length(iov, iovcnt);
+ ret = iov_size(iov, iovcnt);
continue;
}
@@ -658,7 +642,7 @@ ssize_t qemu_sendv_packet_async(VLANClientState *sender,
NetQueue *queue;
if (sender->link_down || (!sender->peer && !sender->vlan)) {
- return calc_iov_length(iov, iovcnt);
+ return iov_size(iov, iovcnt);
}
if (sender->peer) {
--
1.7.2.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] net: Use iov helper functions
2011-02-24 0:57 [Qemu-devel] [PATCH] net: Use iov helper functions Benjamin Poirier
@ 2011-02-24 10:08 ` Stefan Hajnoczi
2011-02-25 6:21 ` Jason Wang
2011-03-06 18:29 ` Aurelien Jarno
2 siblings, 0 replies; 4+ messages in thread
From: Stefan Hajnoczi @ 2011-02-24 10:08 UTC (permalink / raw)
To: Benjamin Poirier; +Cc: qemu-devel
On Thu, Feb 24, 2011 at 12:57 AM, Benjamin Poirier
<benjamin.poirier@gmail.com> wrote:
> Signed-off-by: Benjamin Poirier <benjamin.poirier@gmail.com>
> ---
> net.c | 28 ++++++----------------------
> 1 files changed, 6 insertions(+), 22 deletions(-)
Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Qemu-devel] [PATCH] net: Use iov helper functions
2011-02-24 0:57 [Qemu-devel] [PATCH] net: Use iov helper functions Benjamin Poirier
2011-02-24 10:08 ` Stefan Hajnoczi
@ 2011-02-25 6:21 ` Jason Wang
2011-03-06 18:29 ` Aurelien Jarno
2 siblings, 0 replies; 4+ messages in thread
From: Jason Wang @ 2011-02-25 6:21 UTC (permalink / raw)
To: Benjamin Poirier; +Cc: qemu-devel
Benjamin Poirier writes:
> Signed-off-by: Benjamin Poirier <benjamin.poirier@gmail.com>
> ---
> net.c | 28 ++++++----------------------
> 1 files changed, 6 insertions(+), 22 deletions(-)
>
Looks good.
Acked-by: Jason Wang <jasowang@redhat.com>
> diff --git a/net.c b/net.c
> index ec4745d..15ed40b 100644
> --- a/net.c
> +++ b/net.c
> @@ -36,6 +36,7 @@
> #include "qemu-common.h"
> #include "qemu_socket.h"
> #include "hw/qdev.h"
> +#include "iov.h"
>
> static QTAILQ_HEAD(, VLANState) vlans;
> static QTAILQ_HEAD(, VLANClientState) non_vlan_clients;
> @@ -572,30 +573,13 @@ static ssize_t vc_sendv_compat(VLANClientState *vc, const struct iovec *iov,
> int iovcnt)
> {
> uint8_t buffer[4096];
> - size_t offset = 0;
> - int i;
> -
> - for (i = 0; i < iovcnt; i++) {
> - size_t len;
> + size_t offset;
>
> - len = MIN(sizeof(buffer) - offset, iov[i].iov_len);
> - memcpy(buffer + offset, iov[i].iov_base, len);
> - offset += len;
> - }
> + offset = iov_to_buf(iov, iovcnt, buffer, 0, sizeof(buffer));
>
> return vc->info->receive(vc, buffer, offset);
> }
>
> -static ssize_t calc_iov_length(const struct iovec *iov, int iovcnt)
> -{
> - size_t offset = 0;
> - int i;
> -
> - for (i = 0; i < iovcnt; i++)
> - offset += iov[i].iov_len;
> - return offset;
> -}
> -
> static ssize_t qemu_deliver_packet_iov(VLANClientState *sender,
> unsigned flags,
> const struct iovec *iov,
> @@ -605,7 +589,7 @@ static ssize_t qemu_deliver_packet_iov(VLANClientState *sender,
> VLANClientState *vc = opaque;
>
> if (vc->link_down) {
> - return calc_iov_length(iov, iovcnt);
> + return iov_size(iov, iovcnt);
> }
>
> if (vc->info->receive_iov) {
> @@ -633,7 +617,7 @@ static ssize_t qemu_vlan_deliver_packet_iov(VLANClientState *sender,
> }
>
> if (vc->link_down) {
> - ret = calc_iov_length(iov, iovcnt);
> + ret = iov_size(iov, iovcnt);
> continue;
> }
>
> @@ -658,7 +642,7 @@ ssize_t qemu_sendv_packet_async(VLANClientState *sender,
> NetQueue *queue;
>
> if (sender->link_down || (!sender->peer && !sender->vlan)) {
> - return calc_iov_length(iov, iovcnt);
> + return iov_size(iov, iovcnt);
> }
>
> if (sender->peer) {
> --
> 1.7.2.3
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] net: Use iov helper functions
2011-02-24 0:57 [Qemu-devel] [PATCH] net: Use iov helper functions Benjamin Poirier
2011-02-24 10:08 ` Stefan Hajnoczi
2011-02-25 6:21 ` Jason Wang
@ 2011-03-06 18:29 ` Aurelien Jarno
2 siblings, 0 replies; 4+ messages in thread
From: Aurelien Jarno @ 2011-03-06 18:29 UTC (permalink / raw)
To: Benjamin Poirier; +Cc: qemu-devel
On Wed, Feb 23, 2011 at 07:57:21PM -0500, Benjamin Poirier wrote:
> Signed-off-by: Benjamin Poirier <benjamin.poirier@gmail.com>
> ---
> net.c | 28 ++++++----------------------
> 1 files changed, 6 insertions(+), 22 deletions(-)
Thanks, applied.
> diff --git a/net.c b/net.c
> index ec4745d..15ed40b 100644
> --- a/net.c
> +++ b/net.c
> @@ -36,6 +36,7 @@
> #include "qemu-common.h"
> #include "qemu_socket.h"
> #include "hw/qdev.h"
> +#include "iov.h"
>
> static QTAILQ_HEAD(, VLANState) vlans;
> static QTAILQ_HEAD(, VLANClientState) non_vlan_clients;
> @@ -572,30 +573,13 @@ static ssize_t vc_sendv_compat(VLANClientState *vc, const struct iovec *iov,
> int iovcnt)
> {
> uint8_t buffer[4096];
> - size_t offset = 0;
> - int i;
> -
> - for (i = 0; i < iovcnt; i++) {
> - size_t len;
> + size_t offset;
>
> - len = MIN(sizeof(buffer) - offset, iov[i].iov_len);
> - memcpy(buffer + offset, iov[i].iov_base, len);
> - offset += len;
> - }
> + offset = iov_to_buf(iov, iovcnt, buffer, 0, sizeof(buffer));
>
> return vc->info->receive(vc, buffer, offset);
> }
>
> -static ssize_t calc_iov_length(const struct iovec *iov, int iovcnt)
> -{
> - size_t offset = 0;
> - int i;
> -
> - for (i = 0; i < iovcnt; i++)
> - offset += iov[i].iov_len;
> - return offset;
> -}
> -
> static ssize_t qemu_deliver_packet_iov(VLANClientState *sender,
> unsigned flags,
> const struct iovec *iov,
> @@ -605,7 +589,7 @@ static ssize_t qemu_deliver_packet_iov(VLANClientState *sender,
> VLANClientState *vc = opaque;
>
> if (vc->link_down) {
> - return calc_iov_length(iov, iovcnt);
> + return iov_size(iov, iovcnt);
> }
>
> if (vc->info->receive_iov) {
> @@ -633,7 +617,7 @@ static ssize_t qemu_vlan_deliver_packet_iov(VLANClientState *sender,
> }
>
> if (vc->link_down) {
> - ret = calc_iov_length(iov, iovcnt);
> + ret = iov_size(iov, iovcnt);
> continue;
> }
>
> @@ -658,7 +642,7 @@ ssize_t qemu_sendv_packet_async(VLANClientState *sender,
> NetQueue *queue;
>
> if (sender->link_down || (!sender->peer && !sender->vlan)) {
> - return calc_iov_length(iov, iovcnt);
> + return iov_size(iov, iovcnt);
> }
>
> if (sender->peer) {
> --
> 1.7.2.3
>
>
>
--
Aurelien Jarno GPG: 1024D/F1BCDB73
aurelien@aurel32.net http://www.aurel32.net
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-03-06 18:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-24 0:57 [Qemu-devel] [PATCH] net: Use iov helper functions Benjamin Poirier
2011-02-24 10:08 ` Stefan Hajnoczi
2011-02-25 6:21 ` Jason Wang
2011-03-06 18:29 ` Aurelien Jarno
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).