[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [7207] net: Prevent multiple slirp instances (Jan Kiszka)
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [7207] net: Prevent multiple slirp instances (Jan Kiszka) |
Date: |
Tue, 21 Apr 2009 20:48:00 +0000 |
Revision: 7207
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7207
Author: aliguori
Date: 2009-04-21 20:47:59 +0000 (Tue, 21 Apr 2009)
Log Message:
-----------
net: Prevent multiple slirp instances (Jan Kiszka)
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 <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
Modified Paths:
--------------
branches/stable_0_10/net.c
Modified: branches/stable_0_10/net.c
===================================================================
--- branches/stable_0_10/net.c 2009-04-21 20:47:55 UTC (rev 7206)
+++ branches/stable_0_10/net.c 2009-04-21 20:47:59 UTC (rev 7207)
@@ -515,15 +515,27 @@
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;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [7207] net: Prevent multiple slirp instances (Jan Kiszka),
Anthony Liguori <=