proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-06 12:05:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix tap downscript argument (Mark McLoughlin)

Browse Source 
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 <johnw@wonghome.net>
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6285 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aliguori 2009-01-13 19:15:55 +00:00
parent f5cbc474e8
commit 973cbd37ce
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net.c
View File

@ -652,6 +652,7 @@ typedef struct TAPState {
VLANClientState *vc; VLANClientState *vc;
int fd; int fd;
char down_script[1024]; char down_script[1024];
char down_script_arg[128];
} TAPState; } TAPState;
#ifdef HAVE_IOVEC #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), snprintf(s->vc->info_str, sizeof(s->vc->info_str),
"ifname=%s,script=%s,downscript=%s", "ifname=%s,script=%s,downscript=%s",
ifname, setup_script, down_script); 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, sizeof(s->down_script), "%s", down_script);
snprintf(s->down_script_arg, sizeof(s->down_script_arg), "%s", ifname);
}
return 0; return 0;
} }
@ -1770,13 +1773,10 @@ void net_cleanup(void)
for(vc = vlan->first_client; vc != NULL; vc = vc->next) { for(vc = vlan->first_client; vc != NULL; vc = vc->next) {
if (vc->fd_read == tap_receive) { if (vc->fd_read == tap_receive) {
char ifname[64];
TAPState *s = vc->opaque; TAPState *s = vc->opaque;
if (strcmp(vc->model, "tap") == 0 && if (s->down_script[0])
sscanf(vc->info_str, "ifname=%63s ", ifname) == 1 && launch_script(s->down_script, s->down_script_arg, s->fd);
s->down_script[0])
launch_script(s->down_script, ifname, s->fd);
} }
#if defined(CONFIG_VDE) #if defined(CONFIG_VDE)
if (vc->fd_read == vde_from_qemu) { if (vc->fd_read == vde_from_qemu) {