[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 03/11] net: Prevent multiple slirp instances
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH v2 03/11] net: Prevent multiple slirp instances |
Date: |
Sun, 19 Apr 2009 12:04:25 +0200 |
User-agent: |
StGIT/0.14.2 |
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>
---
net.c | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/net.c b/net.c
index ff6230c..ca4d87f 100644
--- a/net.c
+++ b/net.c
@@ -519,15 +519,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;
}
- [Qemu-devel] [PATCH v2 00/11] Various small networking improvements, Jan Kiszka, 2009/04/19
- [Qemu-devel] [PATCH v2 03/11] net: Prevent multiple slirp instances,
Jan Kiszka <=
- [Qemu-devel] [PATCH v2 02/11] net: Check device passed to host_net_remove, Jan Kiszka, 2009/04/19
- [Qemu-devel] [PATCH v2 01/11] net: Fix -net socket,listen, Jan Kiszka, 2009/04/19
- [Qemu-devel] [PATCH v2 07/11] net: Add parameter checks for VLAN clients, Jan Kiszka, 2009/04/19
- [Qemu-devel] [PATCH v2 10/11] slirp: Handle DHCP requests for specific IP, Jan Kiszka, 2009/04/19
- [Qemu-devel] [PATCH v2 06/11] Allow empty params for check_params, Jan Kiszka, 2009/04/19
- [Qemu-devel] [PATCH v2 09/11] net: Add support for capturing VLANs, Jan Kiszka, 2009/04/19
- [Qemu-devel] [PATCH v2 04/11] monitor: Improve host_net_add, Jan Kiszka, 2009/04/19