From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LMoPZ-0000mf-9a for qemu-devel@nongnu.org; Tue, 13 Jan 2009 13:54:49 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LMoPX-0000k4-7D for qemu-devel@nongnu.org; Tue, 13 Jan 2009 13:54:48 -0500 Received: from [199.232.76.173] (port=46275 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LMoPW-0000jj-Qt for qemu-devel@nongnu.org; Tue, 13 Jan 2009 13:54:46 -0500 Received: from mx2.redhat.com ([66.187.237.31]:35281) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LMoPW-0004Wj-BG for qemu-devel@nongnu.org; Tue, 13 Jan 2009 13:54:46 -0500 From: Mark McLoughlin Content-Type: text/plain Date: Tue, 13 Jan 2009 18:54:39 +0000 Message-Id: <1231872879.4290.252.camel@localhost.localdomain> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] Fix tap downscript argument Reply-To: Mark McLoughlin , qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: John Wong , qemu-devel Kill off the hack that parses info_str for the tap interface name to pass as the argument to the downscript and, instead, just explicitly keep a copy of the string for later. As reported by John Wong, this commit: Add qemu_format_nic_info_str() changed the invocation of downscript from e.g. /path/kvm-ifdown "tap0" to: /path/kvm-ifdown "tap0,script=/path/kvm-ifup,downscript=/path/kvm-ifdown" This fix restores the original behavior. Reported-by: John Wong Signed-off-by: Mark McLoughlin --- net.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net.c b/net.c index 30ba717..e6639ec 100644 --- a/net.c +++ b/net.c @@ -652,6 +652,7 @@ typedef struct TAPState { VLANClientState *vc; int fd; char down_script[1024]; + char down_script_arg[128]; } TAPState; #ifdef HAVE_IOVEC @@ -978,8 +979,10 @@ static int net_tap_init(VLANState *vlan, const char *model, snprintf(s->vc->info_str, sizeof(s->vc->info_str), "ifname=%s,script=%s,downscript=%s", ifname, setup_script, down_script); - if (down_script && strcmp(down_script, "no")) + if (down_script && strcmp(down_script, "no")) { snprintf(s->down_script, sizeof(s->down_script), "%s", down_script); + snprintf(s->down_script_arg, sizeof(s->down_script_arg), "%s", ifname); + } return 0; } @@ -1736,13 +1739,10 @@ void net_cleanup(void) for(vc = vlan->first_client; vc != NULL; vc = vc->next) { if (vc->fd_read == tap_receive) { - char ifname[64]; TAPState *s = vc->opaque; - if (strcmp(vc->model, "tap") == 0 && - sscanf(vc->info_str, "ifname=%63s ", ifname) == 1 && - s->down_script[0]) - launch_script(s->down_script, ifname, s->fd); + if (s->down_script[0]) + launch_script(s->down_script, s->down_script_arg, s->fd); } #if defined(CONFIG_VDE) if (vc->fd_read == vde_from_qemu) { -- 1.6.1