gwj / at91sam9263 · Commits

Commit 8d6249a73adefb2468154b7da70c61b23e393d5b

Authored by aliguori
1 parent d4ebe193

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 <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
Inline Side-by-side
Showing 1 changed file with 13 additions and 1 deletions
@@ -544,15 +544,27 @@ static void slirp_receive(void *opaque, const uint8_t *buf, int size) @@ -544,15 +544,27 @@ static void slirp_receive(void *opaque, const uint8_t *buf, int size)
544 slirp_input(buf, size); 544 slirp_input(buf, size);
545 } 545 }
546 546
  547 +static int slirp_in_use;
  548 +
  549 +static void net_slirp_cleanup(VLANClientState *vc)
  550 +{
  551 + slirp_in_use = 0;
  552 +}
  553 +
547 static int net_slirp_init(VLANState *vlan, const char *model, const char *name) 554 static int net_slirp_init(VLANState *vlan, const char *model, const char *name)
548 { 555 {
  556 + if (slirp_in_use) {
  557 + /* slirp only supports a single instance so far */
  558 + return -1;
  559 + }
549 if (!slirp_inited) { 560 if (!slirp_inited) {
550 slirp_inited = 1; 561 slirp_inited = 1;
551 slirp_init(slirp_restrict, slirp_ip); 562 slirp_init(slirp_restrict, slirp_ip);
552 } 563 }
553 slirp_vc = qemu_new_vlan_client(vlan, model, name, 564 slirp_vc = qemu_new_vlan_client(vlan, model, name,
554 - slirp_receive, NULL, NULL, NULL); 565 + slirp_receive, NULL, net_slirp_cleanup, NULL);
555 slirp_vc->info_str[0] = '\0'; 566 slirp_vc->info_str[0] = '\0';
  567 + slirp_in_use = 1;
556 return 0; 568 return 0;
557 } 569 }
558 570