motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-07 01:33:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests/libqos: embed allocators instead of malloc-ing them separately

Browse source 
qgraph will embed these objects instead of allocating them in a separate
object.  Expose a new API "generic_alloc_init" and "generic_alloc_destroy"
for that, and rename the existing API with s/init/new/ and s/uninit/free/.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2018-11-29 12:37:04 +01:00
parent 143e6db6fa
commit eb5937bad6
21 changed files with 124 additions and 212 deletions
Download patch file Download diff file Expand all files Collapse all files

22
tests/e1000e-test.c
View file

@ -94,7 +94,7 @@ typedef struct e1000e_device {
} e1000e_device;
static int test_sockets[2];
static QGuestAllocator *test_alloc;
static QGuestAllocator test_alloc;
static QPCIBus *test_bus;
static void e1000e_pci_foreach_callback(QPCIDevice *dev, int devfn, void *data)
@ -165,7 +165,7 @@ static void e1000e_device_init(QPCIBus *bus, e1000e_device *d)
val | E1000E_CTRL_EXT_DRV_LOAD | E1000E_CTRL_EXT_TXLSFLOW);
/* Allocate and setup TX ring */
d->tx_ring = guest_alloc(test_alloc, E1000E_RING_LEN);
d->tx_ring = guest_alloc(&test_alloc, E1000E_RING_LEN);
g_assert(d->tx_ring != 0);
e1000e_macreg_write(d, E1000E_TDBAL, (uint32_t) d->tx_ring);
@ -178,7 +178,7 @@ static void e1000e_device_init(QPCIBus *bus, e1000e_device *d)
e1000e_macreg_write(d, E1000E_TCTL, E1000E_TCTL_EN);
/* Allocate and setup RX ring */
d->rx_ring = guest_alloc(test_alloc, E1000E_RING_LEN);
d->rx_ring = guest_alloc(&test_alloc, E1000E_RING_LEN);
g_assert(d->rx_ring != 0);
e1000e_macreg_write(d, E1000E_RDBAL, (uint32_t)d->rx_ring);
@ -268,7 +268,7 @@ static void e1000e_send_verify(e1000e_device *d)
uint32_t recv_len;
/* Prepare test data buffer */
uint64_t data = guest_alloc(test_alloc, data_len);
uint64_t data = guest_alloc(&test_alloc, data_len);
memwrite(data, "TEST", 5);
/* Prepare TX descriptor */
@ -296,7 +296,7 @@ static void e1000e_send_verify(e1000e_device *d)
g_assert_cmpstr(buffer, == , "TEST");
/* Free test data buffer */
guest_free(test_alloc, data);
guest_free(&test_alloc, data);
}
static void e1000e_receive_verify(e1000e_device *d)
@ -348,7 +348,7 @@ static void e1000e_receive_verify(e1000e_device *d)
g_assert_cmpint(ret, == , sizeof(test) + sizeof(len));
/* Prepare test data buffer */
uint64_t data = guest_alloc(test_alloc, data_len);
uint64_t data = guest_alloc(&test_alloc, data_len);
/* Prepare RX descriptor */
memset(&descr, 0, sizeof(descr));
@ -369,7 +369,7 @@ static void e1000e_receive_verify(e1000e_device *d)
g_assert_cmpstr(buffer, == , "TEST");
/* Free test data buffer */
guest_free(test_alloc, data);
guest_free(&test_alloc, data);
}
static void e1000e_device_clear(QPCIBus *bus, e1000e_device *d)
@ -392,10 +392,8 @@ static void data_test_init(e1000e_device *d)
qtest_start(cmdline);
g_free(cmdline);
test_alloc = pc_alloc_init(global_qtest);
g_assert_nonnull(test_alloc);
test_bus = qpci_new_pc(global_qtest, test_alloc);
pc_alloc_init(&test_alloc, global_qtest, 0);
test_bus = qpci_new_pc(global_qtest, &test_alloc);
g_assert_nonnull(test_bus);
e1000e_device_init(test_bus, d);
@ -405,7 +403,7 @@ static void data_test_clear(e1000e_device *d)
{
e1000e_device_clear(test_bus, d);
close(test_sockets[0]);
pc_alloc_uninit(test_alloc);
alloc_destroy(&test_alloc);
g_free(d->pci_dev);
qpci_free_pc(test_bus);
qtest_end();