tests: use g_new() family of functions
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> [PMD: split of some files in other commits of the same series, add libqtest.c] Acked-by: John Snow <jsnow@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
parent
d3c9218840
commit
790bbb9768
@ -155,7 +155,7 @@ static AHCIQState *ahci_vboot(const char *cli, va_list ap)
|
|||||||
{
|
{
|
||||||
AHCIQState *s;
|
AHCIQState *s;
|
||||||
|
|
||||||
s = g_malloc0(sizeof(AHCIQState));
|
s = g_new0(AHCIQState, 1);
|
||||||
s->parent = qtest_pc_vboot(cli, ap);
|
s->parent = qtest_pc_vboot(cli, ap);
|
||||||
alloc_set_flags(s->parent->alloc, ALLOC_LEAK_ASSERT);
|
alloc_set_flags(s->parent->alloc, ALLOC_LEAK_ASSERT);
|
||||||
|
|
||||||
@ -1806,7 +1806,7 @@ static void create_ahci_io_test(enum IOMode type, enum AddrMode addr,
|
|||||||
char *name;
|
char *name;
|
||||||
AHCIIOTestOptions *opts;
|
AHCIIOTestOptions *opts;
|
||||||
|
|
||||||
opts = g_malloc(sizeof(AHCIIOTestOptions));
|
opts = g_new(AHCIIOTestOptions, 1);
|
||||||
opts->length = len;
|
opts->length = len;
|
||||||
opts->address_type = addr;
|
opts->address_type = addr;
|
||||||
opts->io_type = type;
|
opts->io_type = type;
|
||||||
|
@ -79,8 +79,8 @@ static void test_fw_cfg_numa(void)
|
|||||||
|
|
||||||
g_assert_cmpint(qfw_cfg_get_u64(fw_cfg, FW_CFG_NUMA), ==, nb_nodes);
|
g_assert_cmpint(qfw_cfg_get_u64(fw_cfg, FW_CFG_NUMA), ==, nb_nodes);
|
||||||
|
|
||||||
cpu_mask = g_malloc0(sizeof(uint64_t) * max_cpus);
|
cpu_mask = g_new0(uint64_t, max_cpus);
|
||||||
node_mask = g_malloc0(sizeof(uint64_t) * nb_nodes);
|
node_mask = g_new0(uint64_t, nb_nodes);
|
||||||
|
|
||||||
qfw_cfg_read_data(fw_cfg, cpu_mask, sizeof(uint64_t) * max_cpus);
|
qfw_cfg_read_data(fw_cfg, cpu_mask, sizeof(uint64_t) * max_cpus);
|
||||||
qfw_cfg_read_data(fw_cfg, node_mask, sizeof(uint64_t) * nb_nodes);
|
qfw_cfg_read_data(fw_cfg, node_mask, sizeof(uint64_t) * nb_nodes);
|
||||||
|
@ -843,7 +843,7 @@ AHCICommand *ahci_command_create(uint8_t command_name)
|
|||||||
AHCICommand *cmd;
|
AHCICommand *cmd;
|
||||||
|
|
||||||
g_assert(props);
|
g_assert(props);
|
||||||
cmd = g_malloc0(sizeof(AHCICommand));
|
cmd = g_new0(AHCICommand, 1);
|
||||||
g_assert(!(props->dma && props->pio));
|
g_assert(!(props->dma && props->pio));
|
||||||
g_assert(!(props->lba28 && props->lba48));
|
g_assert(!(props->lba28 && props->lba48));
|
||||||
g_assert(!(props->read && props->write));
|
g_assert(!(props->read && props->write));
|
||||||
|
@ -17,7 +17,7 @@ QOSState *qtest_vboot(QOSOps *ops, const char *cmdline_fmt, va_list ap)
|
|||||||
{
|
{
|
||||||
char *cmdline;
|
char *cmdline;
|
||||||
|
|
||||||
struct QOSState *qs = g_malloc(sizeof(QOSState));
|
struct QOSState *qs = g_new(QOSState, 1);
|
||||||
|
|
||||||
cmdline = g_strdup_vprintf(cmdline_fmt, ap);
|
cmdline = g_strdup_vprintf(cmdline_fmt, ap);
|
||||||
qs->qts = qtest_start(cmdline);
|
qs->qts = qtest_start(cmdline);
|
||||||
|
@ -129,7 +129,7 @@ static MemBlock *mlist_new(uint64_t addr, uint64_t size)
|
|||||||
if (!size) {
|
if (!size) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
block = g_malloc0(sizeof(MemBlock));
|
block = g_new0(MemBlock, 1);
|
||||||
|
|
||||||
block->addr = addr;
|
block->addr = addr;
|
||||||
block->size = size;
|
block->size = size;
|
||||||
@ -305,8 +305,8 @@ QGuestAllocator *alloc_init(uint64_t start, uint64_t end)
|
|||||||
s->start = start;
|
s->start = start;
|
||||||
s->end = end;
|
s->end = end;
|
||||||
|
|
||||||
s->used = g_malloc(sizeof(MemList));
|
s->used = g_new(MemList, 1);
|
||||||
s->free = g_malloc(sizeof(MemList));
|
s->free = g_new(MemList, 1);
|
||||||
QTAILQ_INIT(s->used);
|
QTAILQ_INIT(s->used);
|
||||||
QTAILQ_INIT(s->free);
|
QTAILQ_INIT(s->free);
|
||||||
|
|
||||||
|
@ -171,7 +171,7 @@ QTestState *qtest_init_without_qmp_handshake(const char *extra_args)
|
|||||||
gchar *command;
|
gchar *command;
|
||||||
const char *qemu_binary = qtest_qemu_binary();
|
const char *qemu_binary = qtest_qemu_binary();
|
||||||
|
|
||||||
s = g_malloc(sizeof(*s));
|
s = g_new(QTestState, 1);
|
||||||
|
|
||||||
socket_path = g_strdup_printf("/tmp/qtest-%d.sock", getpid());
|
socket_path = g_strdup_printf("/tmp/qtest-%d.sock", getpid());
|
||||||
qmp_socket_path = g_strdup_printf("/tmp/qtest-%d.qmp", getpid());
|
qmp_socket_path = g_strdup_printf("/tmp/qtest-%d.qmp", getpid());
|
||||||
|
@ -87,7 +87,7 @@ static void add_pc_test_case(const char *mname)
|
|||||||
if (!g_str_has_prefix(mname, "pc-")) {
|
if (!g_str_has_prefix(mname, "pc-")) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
data = g_malloc(sizeof(PCTestData));
|
data = g_new(PCTestData, 1);
|
||||||
data->machine = g_strdup(mname);
|
data->machine = g_strdup(mname);
|
||||||
data->cpu_model = "Haswell"; /* 1.3+ theoretically */
|
data->cpu_model = "Haswell"; /* 1.3+ theoretically */
|
||||||
data->sockets = 1;
|
data->sockets = 1;
|
||||||
|
Loading…
Reference in New Issue
Block a user