tests/qtest/e1000e-test: De-duplicate constants
De-duplicate constants found in e1000e_send_verify() and e1000e_receive_verify() to avoid mismatch and improve readability. Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> Message-Id: <20221110114426.65951-1-akihiko.odaki@daynix.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
parent
ff6b7d3cd5
commit
f2ae2fab47
|
@ -37,15 +37,15 @@
|
||||||
|
|
||||||
static void e1000e_send_verify(QE1000E *d, int *test_sockets, QGuestAllocator *alloc)
|
static void e1000e_send_verify(QE1000E *d, int *test_sockets, QGuestAllocator *alloc)
|
||||||
{
|
{
|
||||||
|
static const char test[] = "TEST";
|
||||||
struct e1000_tx_desc descr;
|
struct e1000_tx_desc descr;
|
||||||
static const int data_len = 64;
|
|
||||||
char buffer[64];
|
char buffer[64];
|
||||||
int ret;
|
int ret;
|
||||||
uint32_t recv_len;
|
uint32_t recv_len;
|
||||||
|
|
||||||
/* Prepare test data buffer */
|
/* Prepare test data buffer */
|
||||||
uint64_t data = guest_alloc(alloc, data_len);
|
uint64_t data = guest_alloc(alloc, sizeof(buffer));
|
||||||
memwrite(data, "TEST", 5);
|
memwrite(data, test, sizeof(test));
|
||||||
|
|
||||||
/* Prepare TX descriptor */
|
/* Prepare TX descriptor */
|
||||||
memset(&descr, 0, sizeof(descr));
|
memset(&descr, 0, sizeof(descr));
|
||||||
|
@ -54,7 +54,7 @@ static void e1000e_send_verify(QE1000E *d, int *test_sockets, QGuestAllocator *a
|
||||||
E1000_TXD_CMD_EOP |
|
E1000_TXD_CMD_EOP |
|
||||||
E1000_TXD_CMD_DEXT |
|
E1000_TXD_CMD_DEXT |
|
||||||
E1000_TXD_DTYP_D |
|
E1000_TXD_DTYP_D |
|
||||||
data_len);
|
sizeof(buffer));
|
||||||
|
|
||||||
/* Put descriptor to the ring */
|
/* Put descriptor to the ring */
|
||||||
e1000e_tx_ring_push(d, &descr);
|
e1000e_tx_ring_push(d, &descr);
|
||||||
|
@ -69,9 +69,9 @@ static void e1000e_send_verify(QE1000E *d, int *test_sockets, QGuestAllocator *a
|
||||||
/* Check data sent to the backend */
|
/* Check data sent to the backend */
|
||||||
ret = recv(test_sockets[0], &recv_len, sizeof(recv_len), 0);
|
ret = recv(test_sockets[0], &recv_len, sizeof(recv_len), 0);
|
||||||
g_assert_cmpint(ret, == , sizeof(recv_len));
|
g_assert_cmpint(ret, == , sizeof(recv_len));
|
||||||
ret = recv(test_sockets[0], buffer, 64, 0);
|
ret = recv(test_sockets[0], buffer, sizeof(buffer), 0);
|
||||||
g_assert_cmpint(ret, >=, 5);
|
g_assert_cmpint(ret, ==, sizeof(buffer));
|
||||||
g_assert_cmpstr(buffer, == , "TEST");
|
g_assert_cmpstr(buffer, == , test);
|
||||||
|
|
||||||
/* Free test data buffer */
|
/* Free test data buffer */
|
||||||
guest_free(alloc, data);
|
guest_free(alloc, data);
|
||||||
|
@ -93,7 +93,6 @@ static void e1000e_receive_verify(QE1000E *d, int *test_sockets, QGuestAllocator
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
static const int data_len = 64;
|
|
||||||
char buffer[64];
|
char buffer[64];
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
@ -102,7 +101,7 @@ static void e1000e_receive_verify(QE1000E *d, int *test_sockets, QGuestAllocator
|
||||||
g_assert_cmpint(ret, == , sizeof(test) + sizeof(len));
|
g_assert_cmpint(ret, == , sizeof(test) + sizeof(len));
|
||||||
|
|
||||||
/* Prepare test data buffer */
|
/* Prepare test data buffer */
|
||||||
uint64_t data = guest_alloc(alloc, data_len);
|
uint64_t data = guest_alloc(alloc, sizeof(buffer));
|
||||||
|
|
||||||
/* Prepare RX descriptor */
|
/* Prepare RX descriptor */
|
||||||
memset(&descr, 0, sizeof(descr));
|
memset(&descr, 0, sizeof(descr));
|
||||||
|
@ -120,7 +119,7 @@ static void e1000e_receive_verify(QE1000E *d, int *test_sockets, QGuestAllocator
|
||||||
|
|
||||||
/* Check data sent to the backend */
|
/* Check data sent to the backend */
|
||||||
memread(data, buffer, sizeof(buffer));
|
memread(data, buffer, sizeof(buffer));
|
||||||
g_assert_cmpstr(buffer, == , "TEST");
|
g_assert_cmpstr(buffer, == , test);
|
||||||
|
|
||||||
/* Free test data buffer */
|
/* Free test data buffer */
|
||||||
guest_free(alloc, data);
|
guest_free(alloc, data);
|
||||||
|
|
Loading…
Reference in New Issue