mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: Prevent multiple slirp instances (Jan Kiszka)

Browse Source 
The slirp stack is full of global variables which prevents instantiating
it more than once. Catch this during net_slirp_init to prevent more harm
later on.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7208 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aliguori 2009-04-21 20:49:11 +00:00
parent d4ebe1934a
commit 8d6249a73a
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net.c
View File

@ -544,15 +544,27 @@ static void slirp_receive(void *opaque, const uint8_t *buf, int size)
slirp_input(buf, size);
}
static int slirp_in_use;
static void net_slirp_cleanup(VLANClientState *vc)
{
slirp_in_use = 0;
}
static int net_slirp_init(VLANState *vlan, const char *model, const char *name)
{
if (slirp_in_use) {
/* slirp only supports a single instance so far */
return -1;
}
if (!slirp_inited) {
slirp_inited = 1;
slirp_init(slirp_restrict, slirp_ip);
}
slirp_vc = qemu_new_vlan_client(vlan, model, name,
slirp_receive, NULL, NULL, NULL);
slirp_receive, NULL, net_slirp_cleanup, NULL);
slirp_vc->info_str[0] = '\0';
slirp_in_use = 1;
return 0;
}