diff options
author | Dries Harnie <botje.linux@gmail.com> | 2010-06-09 21:42:18 +0200 |
---|---|---|
committer | Dries Harnie <botje.linux@gmail.com> | 2010-06-09 21:42:18 +0200 |
commit | 111d6f8ed6dea6e651ab450e1ea11310ff0b2857 (patch) | |
tree | a98e7de3c4c71b83fbe71a9c26568074ffbdf2d3 | |
parent | 38f8467357f731c4ced8548c6bb65e95745c7eff (diff) | |
download | external_qemu-111d6f8ed6dea6e651ab450e1ea11310ff0b2857.zip external_qemu-111d6f8ed6dea6e651ab450e1ea11310ff0b2857.tar.gz external_qemu-111d6f8ed6dea6e651ab450e1ea11310ff0b2857.tar.bz2 |
Inter-emulator networking: add interfaces in the correct order
Change-Id: I9cab6f47bbde9f4dacdb2a426064af63eb4709c4
-rw-r--r-- | android/main.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/android/main.c b/android/main.c index 6f5fca4..6fcc4eb 100644 --- a/android/main.c +++ b/android/main.c @@ -2276,16 +2276,17 @@ int main(int argc, char **argv) if (opts->shared_net_id) { unsigned int shared_net_id = atoi(opts->shared_net_id); char nic[37]; - args[n++] = "-net"; - snprintf(nic, 37, "nic,vlan=1,macaddr=52:54:00:12:34:%02x", shared_net_id); - args[n++] = strdup(nic); - args[n++] = "-net"; - args[n++] = "socket,vlan=1,mcast=230.0.0.10:1234"; args[n++] = "-net"; args[n++] = "nic,vlan=0"; args[n++] = "-net"; args[n++] = "user,vlan=0"; + + args[n++] = "-net"; + snprintf(nic, sizeof nic, "nic,vlan=1,macaddr=52:54:00:12:34:%02x", shared_net_id); + args[n++] = strdup(nic); + args[n++] = "-net"; + args[n++] = "socket,vlan=1,mcast=230.0.0.10:1234"; } while(argc-- > 0) { |