[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V3 07/10] tests/virtio-net-test.c : change virtio-ne
From: |
Zhang Chen |
Subject: |
[Qemu-devel] [PATCH V3 07/10] tests/virtio-net-test.c : change virtio-net test case iov send data format |
Date: |
Fri, 28 Apr 2017 17:47:17 +0800 |
Because we change net_fill_rstate() date format from
struct {int size; const uint8_t buf[];} to {int size; int vnet_hdr_len; const
uint8_t buf[];}.
So, we add fake vnet_hdr_len in virtio-net test case.
Signed-off-by: Zhang Chen <address@hidden>
---
tests/virtio-net-test.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c
index 8f94360..93f4fe0 100644
--- a/tests/virtio-net-test.c
+++ b/tests/virtio-net-test.c
@@ -89,11 +89,15 @@ static void rx_test(QVirtioDevice *dev,
char test[] = "TEST";
char buffer[64];
int len = htonl(sizeof(test));
+ int vnet_hdr_len = 0;
struct iovec iov[] = {
{
.iov_base = &len,
.iov_len = sizeof(len),
}, {
+ .iov_base = &vnet_hdr_len,
+ .iov_len = sizeof(vnet_hdr_len),
+ }, {
.iov_base = test,
.iov_len = sizeof(test),
},
@@ -105,8 +109,9 @@ static void rx_test(QVirtioDevice *dev,
free_head = qvirtqueue_add(vq, req_addr, 64, true, false);
qvirtqueue_kick(dev, vq, free_head);
- ret = iov_send(socket, iov, 2, 0, sizeof(len) + sizeof(test));
- g_assert_cmpint(ret, ==, sizeof(test) + sizeof(len));
+ ret = iov_send(socket, iov, 3, 0, sizeof(len)
+ + sizeof(test) + sizeof(vnet_hdr_len));
+ g_assert_cmpint(ret, ==, sizeof(test) + sizeof(len) +
sizeof(vnet_hdr_len));
qvirtio_wait_queue_isr(dev, vq, QVIRTIO_NET_TIMEOUT_US);
memread(req_addr + VNET_HDR_SIZE, buffer, sizeof(test));
@@ -151,12 +156,16 @@ static void rx_stop_cont_test(QVirtioDevice *dev,
char test[] = "TEST";
char buffer[64];
int len = htonl(sizeof(test));
+ int vnet_hdr_len = 0;
QDict *rsp;
struct iovec iov[] = {
{
.iov_base = &len,
.iov_len = sizeof(len),
}, {
+ .iov_base = &vnet_hdr_len,
+ .iov_len = sizeof(vnet_hdr_len),
+ }, {
.iov_base = test,
.iov_len = sizeof(test),
},
@@ -171,8 +180,9 @@ static void rx_stop_cont_test(QVirtioDevice *dev,
rsp = qmp("{ 'execute' : 'stop'}");
QDECREF(rsp);
- ret = iov_send(socket, iov, 2, 0, sizeof(len) + sizeof(test));
- g_assert_cmpint(ret, ==, sizeof(test) + sizeof(len));
+ ret = iov_send(socket, iov, 3, 0, sizeof(len)
+ + sizeof(test) + sizeof(vnet_hdr_len));
+ g_assert_cmpint(ret, ==, sizeof(test) + sizeof(len) +
sizeof(vnet_hdr_len));
/* We could check the status, but this command is more importantly to
* ensure the packet data gets queued in QEMU, before we do 'cont'.
--
2.7.4
- [Qemu-devel] [PATCH V3 00/10] Add COLO-proxy virtio-net support, Zhang Chen, 2017/04/28
- [Qemu-devel] [PATCH V3 02/10] net/tap.c: Add tap_get_vnet_hdr_len and tap_get_using_vnet_hdr function, Zhang Chen, 2017/04/28
- [Qemu-devel] [PATCH V3 01/10] net: Add vnet_hdr_len related callback in NetClientInfo, Zhang Chen, 2017/04/28
- [Qemu-devel] [PATCH V3 10/10] net/colo-compare.c: Add vnet packet's tcp/udp/icmp compare, Zhang Chen, 2017/04/28
- [Qemu-devel] [PATCH V3 07/10] tests/virtio-net-test.c : change virtio-net test case iov send data format,
Zhang Chen <=
- [Qemu-devel] [PATCH V3 04/10] net/filter-mirror.c: Add filter-mirror and filter-redirector vnet support., Zhang Chen, 2017/04/28
- [Qemu-devel] [PATCH V3 08/10] net/colo-compare.c: Make colo-compare support vnet_hdr_len, Zhang Chen, 2017/04/28
- [Qemu-devel] [PATCH V3 05/10] net/net.c: Add vnet header length to SocketReadState, Zhang Chen, 2017/04/28
- [Qemu-devel] [PATCH V3 06/10] tests/e1000e-test.c : change e1000e test case send data format, Zhang Chen, 2017/04/28
- [Qemu-devel] [PATCH V3 09/10] net/colo.c: Add vnet packet parse feature in colo-proxy, Zhang Chen, 2017/04/28
- [Qemu-devel] [PATCH V3 03/10] net/netmap.c: Add netmap_get_vnet_hdr_len function, Zhang Chen, 2017/04/28