From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55079) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e45CR-0003IZ-Q7 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 09:12:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e45CQ-0001Ah-N7 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 09:12:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34504) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e45CQ-0001A0-DD for qemu-devel@nongnu.org; Mon, 16 Oct 2017 09:12:54 -0400 From: Thomas Huth Date: Mon, 16 Oct 2017 15:12:42 +0200 Message-Id: <1508159564-30317-4-git-send-email-thuth@redhat.com> In-Reply-To: <1508159564-30317-1-git-send-email-thuth@redhat.com> References: <1508159564-30317-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 3/5] tests: use g_new() family of functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Dmitry Fleytman , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Philippe Mathieu-Daud=C3=A9 [PMD: split of some files in other commits of the same series, add libqte= st.c] Acked-by: John Snow Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth --- 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 999121b..cb84edc 100644 --- a/tests/ahci-test.c +++ b/tests/ahci-test.c @@ -155,7 +155,7 @@ static AHCIQState *ahci_vboot(const char *cli, va_lis= t ap) { AHCIQState *s; =20 - s =3D g_malloc0(sizeof(AHCIQState)); + s =3D g_new0(AHCIQState, 1); s->parent =3D qtest_pc_vboot(cli, ap); alloc_set_flags(s->parent->alloc, ALLOC_LEAK_ASSERT); =20 @@ -1806,7 +1806,7 @@ static void create_ahci_io_test(enum IOMode type, e= num AddrMode addr, char *name; AHCIIOTestOptions *opts; =20 - opts =3D g_malloc(sizeof(AHCIIOTestOptions)); + opts =3D g_new(AHCIIOTestOptions, 1); opts->length =3D len; opts->address_type =3D addr; opts->io_type =3D type; diff --git a/tests/fw_cfg-test.c b/tests/fw_cfg-test.c index 688342b..81f45bd 100644 --- a/tests/fw_cfg-test.c +++ b/tests/fw_cfg-test.c @@ -79,8 +79,8 @@ static void test_fw_cfg_numa(void) =20 g_assert_cmpint(qfw_cfg_get_u64(fw_cfg, FW_CFG_NUMA), =3D=3D, nb_nod= es); =20 - cpu_mask =3D g_malloc0(sizeof(uint64_t) * max_cpus); - node_mask =3D g_malloc0(sizeof(uint64_t) * nb_nodes); + cpu_mask =3D g_new0(uint64_t, max_cpus); + node_mask =3D g_new0(uint64_t, nb_nodes); =20 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 1ca7f45..13c0749 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; =20 g_assert(props); - cmd =3D g_malloc0(sizeof(AHCICommand)); + cmd =3D 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 6226546..991bc1a 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; =20 - struct QOSState *qs =3D g_malloc(sizeof(QOSState)); + struct QOSState *qs =3D g_new(QOSState, 1); =20 cmdline =3D g_strdup_vprintf(cmdline_fmt, ap); qs->qts =3D qtest_start(cmdline); diff --git a/tests/libqos/malloc.c b/tests/libqos/malloc.c index b8eff5f..ac05874 100644 --- a/tests/libqos/malloc.c +++ b/tests/libqos/malloc.c @@ -129,7 +129,7 @@ static MemBlock *mlist_new(uint64_t addr, uint64_t si= ze) if (!size) { return NULL; } - block =3D g_malloc0(sizeof(MemBlock)); + block =3D g_new0(MemBlock, 1); =20 block->addr =3D addr; block->size =3D size; @@ -305,8 +305,8 @@ QGuestAllocator *alloc_init(uint64_t start, uint64_t = end) s->start =3D start; s->end =3D end; =20 - s->used =3D g_malloc(sizeof(MemList)); - s->free =3D g_malloc(sizeof(MemList)); + s->used =3D g_new(MemList, 1); + s->free =3D g_new(MemList, 1); QTAILQ_INIT(s->used); QTAILQ_INIT(s->free); =20 diff --git a/tests/libqtest.c b/tests/libqtest.c index cbd7094..adf7118 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -171,7 +171,7 @@ QTestState *qtest_init_without_qmp_handshake(const ch= ar *extra_args) gchar *command; const char *qemu_binary =3D qtest_qemu_binary(); =20 - s =3D g_malloc(sizeof(*s)); + s =3D g_new(QTestState, 1); =20 socket_path =3D g_strdup_printf("/tmp/qtest-%d.sock", getpid()); qmp_socket_path =3D g_strdup_printf("/tmp/qtest-%d.qmp", getpid()); diff --git a/tests/pc-cpu-test.c b/tests/pc-cpu-test.c index c4211a4..11d3e81 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 =3D g_malloc(sizeof(PCTestData)); + data =3D g_new(PCTestData, 1); data->machine =3D g_strdup(mname); data->cpu_model =3D "Haswell"; /* 1.3+ theoretically */ data->sockets =3D 1; --=20 1.8.3.1