diff options
author | Mark McLoughlin <markmc@redhat.com> | 2009-11-25 18:49:32 +0000 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-12-03 09:41:35 -0600 |
commit | f401ca22d872e93fd5f12c99ffcb4f1261bb46b9 (patch) | |
tree | f9a472c4cde2a4f0a1d13f9c0f1c61eb3c73ecdd /savevm.c | |
parent | 57f9ef173d940ec5c2d04a9d1a37b4c86c9f5b27 (diff) | |
download | qemu-f401ca22d872e93fd5f12c99ffcb4f1261bb46b9.zip qemu-f401ca22d872e93fd5f12c99ffcb4f1261bb46b9.tar.gz qemu-f401ca22d872e93fd5f12c99ffcb4f1261bb46b9.tar.bz2 |
net: fix qemu_announce_self()
Now that we have a way to iterate NICs.
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'savevm.c')
-rw-r--r-- | savevm.c | 26 |
1 files changed, 13 insertions, 13 deletions
@@ -120,24 +120,24 @@ static int announce_self_create(uint8_t *buf, return 60; /* len (FCS will be added by hardware) */ } -static void qemu_announce_self_once(void *opaque) +static void qemu_announce_self_iter(NICState *nic, void *opaque) { - int i, len; - VLANState *vlan; - VLANClientState *vc; uint8_t buf[60]; + int len; + + len = announce_self_create(buf, nic->conf->macaddr.a); + + qemu_send_packet_raw(&nic->nc, buf, len); +} + + +static void qemu_announce_self_once(void *opaque) +{ static int count = SELF_ANNOUNCE_ROUNDS; QEMUTimer *timer = *(QEMUTimer **)opaque; - for (i = 0; i < MAX_NICS; i++) { - if (!nd_table[i].used) - continue; - len = announce_self_create(buf, nd_table[i].macaddr); - vlan = nd_table[i].vlan; - QTAILQ_FOREACH(vc, &vlan->clients, next) { - qemu_send_packet_raw(vc, buf, len); - } - } + qemu_foreach_nic(qemu_announce_self_iter, NULL); + if (--count) { /* delay 50ms, 150ms, 250ms, ... */ qemu_mod_timer(timer, qemu_get_clock(rt_clock) + |