From patchwork Tue Dec 11 14:20:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amos Kong X-Patchwork-Id: 205236 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1029E2C008D for ; Wed, 12 Dec 2012 01:18:05 +1100 (EST) Received: from localhost ([::1]:56318 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TiQep-0006IX-7c for incoming@patchwork.ozlabs.org; Tue, 11 Dec 2012 09:18:03 -0500 Received: from eggs.gnu.org ([208.118.235.92]:36969) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TiQec-0006Fq-Rk for qemu-devel@nongnu.org; Tue, 11 Dec 2012 09:17:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TiQeW-0004qW-IO for qemu-devel@nongnu.org; Tue, 11 Dec 2012 09:17:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:5588) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TiQeW-0004qL-Af for qemu-devel@nongnu.org; Tue, 11 Dec 2012 09:17:44 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qBBEHhih013731 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 11 Dec 2012 09:17:43 -0500 Received: from dhcp-8-167.nay.redhat.com ([10.66.7.126]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qBBEHfIr007041; Tue, 11 Dec 2012 09:17:42 -0500 From: Amos Kong To: qemu-devel@nongnu.org Date: Tue, 11 Dec 2012 22:20:15 +0800 Message-Id: <1355235615-30831-1-git-send-email-akong@redhat.com> In-Reply-To: <1355233554-28130-1-git-send-email-akong@redhat.com> References: <1355233554-28130-1-git-send-email-akong@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Amos Kong , stefanha@redhat.com, mst@redhat.com Subject: [Qemu-devel] [PATCH v2] net: clean up network at qemu process termination X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org We don't clean up network if fails to parse "-device" parameters without calling net_cleanup(). I touch a problem, the tap device which is created by qemu-ifup script could not be removed by qemu-ifdown script. Some similar problems also exist in vl.c In this patch, if network initialization successes, a cleanup function will be registered to be called at qemu process termination. Signed-off-by: Amos Kong Acked-by: Michael S. Tsirkin --- v2: register cleanup function before network initialization --- vl.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/vl.c b/vl.c index a3ab384..3bd773e 100644 --- a/vl.c +++ b/vl.c @@ -3745,6 +3745,9 @@ int main(int argc, char **argv, char **envp) } configure_icount(icount_option); + /* clean up network at qemu process termination */ + atexit(&net_cleanup); + if (net_init_clients() < 0) { exit(1); } @@ -3999,7 +4002,6 @@ int main(int argc, char **argv, char **envp) main_loop(); bdrv_close_all(); pause_all_vcpus(); - net_cleanup(); res_free(); return 0;