From patchwork Sun Mar 10 13:12:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Qiang X-Patchwork-Id: 1054015 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=163.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.b="aAFB6wae"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44HM9K0L4vz9sBp for ; Mon, 11 Mar 2019 00:12:49 +1100 (AEDT) Received: from localhost ([127.0.0.1]:45071 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2yFv-00046C-HU for incoming@patchwork.ozlabs.org; Sun, 10 Mar 2019 09:12:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57400) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2yFY-000462-Tu for qemu-devel@nongnu.org; Sun, 10 Mar 2019 09:12:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h2yFW-0005nK-TC for qemu-devel@nongnu.org; Sun, 10 Mar 2019 09:12:20 -0400 Received: from m12-15.163.com ([220.181.12.15]:36875) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2yFV-0005lw-U8 for qemu-devel@nongnu.org; Sun, 10 Mar 2019 09:12:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=XP5N4v3rARr6WvfvoM UlJncjcFI+LZHDYT+19wXfhFk=; b=aAFB6waeWbpQuGwQc/UhvCt04xDgw3DqQr 3/I4L41zz9B14AL7uELGVeNOOvAjVa5KADRGs+gyHM3AWkftj3ORiu/9T4eE+eAF Mk2Gfb1BFYVI4wgiAc5ffJLCeqxZ0gWGCkqtKnSA4JBslT3PBQQ+FroTW3tR1yYD CT0xc+LAw= Received: from localhost.localdomain (unknown [122.233.115.62]) by smtp11 (Coremail) with SMTP id D8CowAAHANErDYVc4peKAw--.26190S2; Sun, 10 Mar 2019 21:12:12 +0800 (CST) From: Li Qiang To: vyasevic@redhat.com, dgilbert@redhat.com, mst@redhat.com, jasowang@redhat.com Date: Sun, 10 Mar 2019 06:12:05 -0700 Message-Id: <20190310131205.75856-1-liq3ea@163.com> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: D8CowAAHANErDYVc4peKAw--.26190S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7Zr18KFWrur4fCw43tw4ktFb_yoW8JF4Dp3 s3Ga4FkF4ftF4xXa45Kas8KFn5Ars7A3y3Ka18Aw18ZF4xCryYqa17Ka40934DCrWkZw13 Zwn5tr48G3W5AaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UE0PhUUUUU= X-Originating-IP: [122.233.115.62] X-CM-SenderInfo: 5oltjvrd6rljoofrz/1tbiFAxzbVaDzmpcgQAAsq X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.12.15 Subject: [Qemu-devel] [PATCH] 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: Li Qiang , liq3ea@gmail.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Spotted by ASAN when 'make check'. Signed-off-by: Li Qiang --- tests/test-announce-self.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/tests/test-announce-self.c b/tests/test-announce-self.c index 1644d34a3f..3f370d8bf5 100644 --- a/tests/test-announce-self.c +++ b/tests/test-announce-self.c @@ -21,17 +21,6 @@ #define ETH_P_RARP 0x8035 #endif -static QTestState *test_init(int socket) -{ - char *args; - - args = g_strdup_printf("-netdev socket,fd=%d,id=hs0 -device " - "virtio-net-pci,netdev=hs0", socket); - - return qtest_start(args); -} - - static void test_announce(int socket) { char buffer[60]; @@ -58,19 +47,22 @@ static void test_announce(int socket) static void setup(gconstpointer data) { - QTestState *qs; void (*func) (int socket) = data; int sv[2], ret; + char *args; ret = socketpair(PF_UNIX, SOCK_STREAM, 0, sv); g_assert_cmpint(ret, !=, -1); - qs = test_init(sv[1]); + args = g_strdup_printf("-netdev socket,fd=%d,id=hs0 -device " + "virtio-net-pci,netdev=hs0", sv[1]); + qtest_start(args); func(sv[0]); /* End test */ close(sv[0]); - qtest_quit(qs); + qtest_end(); + g_free(args); } int main(int argc, char **argv)