From f401ca22d872e93fd5f12c99ffcb4f1261bb46b9 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Wed, 25 Nov 2009 18:49:32 +0000 Subject: [PATCH] net: fix qemu_announce_self() Now that we have a way to iterate NICs. Signed-off-by: Mark McLoughlin Signed-off-by: Anthony Liguori --- savevm.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/savevm.c b/savevm.c index 18c2e54..d6da050 100644 --- a/savevm.c +++ b/savevm.c @@ -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) + -- 2.7.4