From nobody Sun May 5 20:05:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=163.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552314210393509.37911332904014; Mon, 11 Mar 2019 07:23:30 -0700 (PDT) Received: from localhost ([127.0.0.1]:34270 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3Lpx-00021Y-BR for importer@patchew.org; Mon, 11 Mar 2019 10:23:29 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55356) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3Lns-0000Sx-Ic for qemu-devel@nongnu.org; Mon, 11 Mar 2019 10:21:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3Li2-000316-L8 for qemu-devel@nongnu.org; Mon, 11 Mar 2019 10:15:19 -0400 Received: from m12-15.163.com ([220.181.12.15]:40873) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3Li0-0002pC-VQ for qemu-devel@nongnu.org; Mon, 11 Mar 2019 10:15:17 -0400 Received: from localhost.localdomain (unknown [122.233.115.62]) by smtp11 (Coremail) with SMTP id D8CowAAX8g5obYZca6REBA--.31659S2; Mon, 11 Mar 2019 22:15:05 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=jpjKjIxHwet3HetV7t 2LFfprX8uO5e/flQpL6xzFzIo=; b=evaSOfVF2/1iUdB5kutksWBz5+1FUQR4iA I5zshnIKe8u/w5N2EaVZOsGj0ILyijDCTK16GIuz4LuZA+Lk6W1RvTbuDFclhVuQ AcbPsyQ9yXES4CyDdy8DX4CqcutzPzMG4nyQadxgk+3cLWuORzTEukZFwYeuzSRV QCGMXNOno= From: Li Qiang To: vyasevic@redhat.com, dgilbert@redhat.com, mst@redhat.com, jasowang@redhat.com, thuth@redhat.com Date: Mon, 11 Mar 2019 07:14:57 -0700 Message-Id: <20190311141457.109436-1-liq3ea@163.com> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: D8CowAAX8g5obYZca6REBA--.31659S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7ur45JF1xKF43tr4xuFWfXwb_yoW8AF1fp3 sxC3WSkF4fJF4fX34UtF13GFn5AFs7A3y3G3yDJw1xAFW8CryYqa1UKa4F9a4DCrWkZwn3 Ary8Kr4fGr15Za7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UkWrAUUUUU= X-Originating-IP: [122.233.115.62] X-CM-SenderInfo: 5oltjvrd6rljoofrz/xtbBLwl0bVUMINC6qgAAsG X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.12.15 Subject: [Qemu-devel] [PATCH v2] tests: test-announce-self: fix memory leak X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: liq3ea@gmail.com, philmd@redhat.com, qemu-devel@nongnu.org, Li Qiang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Spotted by ASAN while running 'make check'. Fixes: 4b9b7000(tests: Add a test for qemu self announcements) Suggested-by: Thomas Huth Signed-off-by: Li Qiang --- Changes since v1: Use Thomas's patch tests/test-announce-self.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/tests/test-announce-self.c b/tests/test-announce-self.c index 1644d34a3f..662c3aaf06 100644 --- a/tests/test-announce-self.c +++ b/tests/test-announce-self.c @@ -21,18 +21,8 @@ #define ETH_P_RARP 0x8035 #endif =20 -static QTestState *test_init(int socket) -{ - char *args; - - args =3D g_strdup_printf("-netdev socket,fd=3D%d,id=3Dhs0 -device " - "virtio-net-pci,netdev=3Dhs0", socket); - - return qtest_start(args); -} - =20 -static void test_announce(int socket) +static void test_announce(QTestState *qs, int socket) { char buffer[60]; int len; @@ -40,7 +30,7 @@ static void test_announce(int socket) int ret; uint16_t *proto =3D (uint16_t *)&buffer[12]; =20 - rsp =3D qmp("{ 'execute' : 'announce-self', " + rsp =3D qtest_qmp(qs, "{ 'execute' : 'announce-self', " " 'arguments': {" " 'initial': 50, 'max': 550," " 'rounds': 10, 'step': 50 } }"); @@ -59,14 +49,15 @@ static void test_announce(int socket) static void setup(gconstpointer data) { QTestState *qs; - void (*func) (int socket) =3D data; + void (*func) (QTestState *qs, int socket) =3D data; int sv[2], ret; =20 ret =3D socketpair(PF_UNIX, SOCK_STREAM, 0, sv); g_assert_cmpint(ret, !=3D, -1); =20 - qs =3D test_init(sv[1]); - func(sv[0]); + qs =3D qtest_initf("-netdev socket,fd=3D%d,id=3Dhs0 -device " + "virtio-net-pci,netdev=3Dhs0", sv[1]); + func(qs, sv[0]); =20 /* End test */ close(sv[0]); --=20 2.17.1