On 10/06/2017 07:49 PM, Philippe Mathieu-Daudé wrote:
> From: Marc-André Lureau
>
> Signed-off-by: Marc-André Lureau
> Signed-off-by: Philippe Mathieu-Daudé
> [PMD: split of some files in other commits of the same series, add libqtest.c]
I think you don't need to add a maintainer's note here unless you
changed something after it was posted to the list.
Acked-by: John Snow
> ---
You can put a V2 notice down here instead.
> tests/ahci-test.c | 4 ++--
> tests/fw_cfg-test.c | 4 ++--
> tests/libqos/ahci.c | 2 +-
> tests/libqos/libqos.c | 2 +-
> tests/libqos/malloc.c | 6 +++---
> tests/libqtest.c | 2 +-
> tests/pc-cpu-test.c | 2 +-
> 7 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/tests/ahci-test.c b/tests/ahci-test.c
> index 999121bb7c..cb84edc8fb 100644
> --- a/tests/ahci-test.c
> +++ b/tests/ahci-test.c
> @@ -155,7 +155,7 @@ static AHCIQState *ahci_vboot(const char *cli, va_list ap)
> {
> AHCIQState *s;
>
> -s = g_malloc0(sizeof(AHCIQState));
> +s = g_new0(AHCIQState, 1);
> s->parent = qtest_pc_vboot(cli, ap);
> 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;
> AHCIIOTestOptions *opts;
>
> -opts = g_malloc(sizeof(AHCIIOTestOptions));
> +opts = g_new(AHCIIOTestOptions, 1);
> opts->length = len;
> opts->address_type = addr;
> opts->io_type = type;
> diff --git a/tests/fw_cfg-test.c b/tests/fw_cfg-test.c
> index 688342bed5..81f45bdfc8 100644
> --- a/tests/fw_cfg-test.c
> +++ b/tests/fw_cfg-test.c
> @@ -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);
>
> -cpu_mask = g_malloc0(sizeof(uint64_t) * max_cpus);
> -node_mask = g_malloc0(sizeof(uint64_t) * nb_nodes);
> +cpu_mask = g_new0(uint64_t, max_cpus);
> +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, node_mask, sizeof(uint64_t) * nb_nodes);
> diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c
> index 1ca7f456b5..13c0749582 100644
> --- a/tests/libqos/ahci.c
> +++ b/tests/libqos/ahci.c
> @@ -843,7 +843,7 @@ AHCICommand *ahci_command_create(uint8_t command_name)
> AHCICommand *cmd;
>
> g_assert(props);
> -cmd = g_malloc0(sizeof(AHCICommand));
> +cmd = g_new0(AHCICommand, 1);
> g_assert(!(props->dma && props->pio));
> g_assert(!(props->lba28 && props->lba48));
> g_assert(!(props->read && props->write));
> diff --git a/tests/libqos/libqos.c b/tests/libqos/libqos.c
> index 6226546c28..991bc1aec2 100644
> --- a/tests/libqos/libqos.c
> +++ b/tests/libqos/libqos.c
> @@ -17,7 +17,7 @@ QOSState *qtest_vboot(QOSOps *ops, const char *cmdline_fmt,
> va_list ap)
> {
> char *cmdline;
>
> -struct QOSState *qs = g_malloc(sizeof(QOSState));
> +struct QOSState *qs = g_new(QOSState, 1);
>
> cmdline = g_strdup_vprintf(cmdline_fmt, ap);
> qs->qts = qtest_start(cmdline);
> diff --git a/tests/libqos/malloc.c b/tests/libqos/malloc.c
> index b8eff5f495..ac05874b0a 100644
> --- a/tests/libqos/malloc.c
> +++ b/tests/libqos/malloc.c
> @@ -129,7 +129,7 @@ static MemBlock *mlist_new(uint64_t addr, uint64_t size)
> if (!size) {
> return NULL;
> }
> -block = g_malloc0(sizeof(MemBlock));
> +block = g_new0(MemBlock, 1);
>
> block->addr = addr;
> block->size = size;
> @@ -305,8 +305,8 @@ QGuestAllocator *alloc_init(uint64_t start, uint64_t end)
> s->start = start;
> s->end = end;
>
> -s->used = g_malloc(sizeof(MemList));
> -s->free = g_malloc(sizeof(MemList));
> +s->used = g_new(MemList, 1);
> +s->free = g_new(MemList, 1);
> QTAILQ_INIT(s->used);
> QTAILQ_INIT(s->free);
>
> diff --git a/tests/libqtest.c b/tests/libqtest.c
> index cbd709470b..adf71188b6 100644
> --- a/tests/libqtest.c
> +++ b/tests/libqtest.c
> @@ -171,7 +171,7 @@ QTestState *qtest_init_without_qmp_handshake(const char
> *extra_args)
> gchar *command;
> 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());
> qmp_socket_path = g_strdup_printf("/tmp/qtest-%d.qmp", getpid());
> diff --git a/tests/pc-cpu-test.c b/tests/pc-cpu-test.c
> index c4211a4e85..11d3e810ef 100644
> --- a/tests/pc-cpu-test.c
> +++ b/tests/pc-cpu-test.c
> @@ -87,7 +87,7 @@ static void add_pc_test_case(const char *mname)
> if (!g_str_has_prefix(mname, "pc-")) {
> return;
> }
> -data = g_malloc(sizeof(PCTestData));
> +data = g_new(PCTestData, 1);
> data->machine = g_strdup(mname);
> data->cpu_model = "Haswell"; /*