[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [6285] Fix tap downscript argument (Mark McLoughlin)
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [6285] Fix tap downscript argument (Mark McLoughlin) |
Date: |
Tue, 13 Jan 2009 19:15:56 +0000 |
Revision: 6285
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6285
Author: aliguori
Date: 2009-01-13 19:15:55 +0000 (Tue, 13 Jan 2009)
Log Message:
-----------
Fix tap downscript argument (Mark McLoughlin)
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 <address@hidden>
Signed-off-by: Mark McLoughlin <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
Modified Paths:
--------------
trunk/net.c
Modified: trunk/net.c
===================================================================
--- trunk/net.c 2009-01-13 19:08:18 UTC (rev 6284)
+++ trunk/net.c 2009-01-13 19:15:55 UTC (rev 6285)
@@ -652,6 +652,7 @@
VLANClientState *vc;
int fd;
char down_script[1024];
+ char down_script_arg[128];
} TAPState;
#ifdef HAVE_IOVEC
@@ -978,8 +979,10 @@
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;
}
@@ -1770,13 +1773,10 @@
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) {
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [6285] Fix tap downscript argument (Mark McLoughlin),
Anthony Liguori <=