Don't leak VLANClientState on PCI hot remove

[qemu.git] / savevm.c

diff --git a/savevm.c b/savevm.c
index f186c5eb7f0f86609560fefa75b612f417280731..c7bc398d9767707fd4aa8113a8ed2de8db52f0bf 100644 (file)
--- a/savevm.c
+++ b/savevm.c
@@ -112,23 +112,37 @@ static int announce_self_create(uint8_t *buf,
     return 64; /* len */
 }
 
-void qemu_announce_self(void)
+static void qemu_announce_self_once(void *opaque)
 {
-    int i, j, len;
+    int i, len;
     VLANState *vlan;
     VLANClientState *vc;
     uint8_t buf[256];
+    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;
-        for(vc = vlan->first_client; vc != NULL; vc = vc->next) {
-            for (j=0; j < SELF_ANNOUNCE_ROUNDS; j++)
-                vc->fd_read(vc->opaque, buf, len);
+       for(vc = vlan->first_client; vc != NULL; vc = vc->next) {
+            vc->fd_read(vc->opaque, buf, len);
         }
     }
+    if (count--) {
+           qemu_mod_timer(timer, qemu_get_clock(rt_clock) + 100);
+    } else {
+           qemu_del_timer(timer);
+           qemu_free_timer(timer);
+    }
+}
+
+void qemu_announce_self(void)
+{
+       static QEMUTimer *timer;
+       timer = qemu_new_timer(rt_clock, qemu_announce_self_once, &timer);
+       qemu_announce_self_once(&timer);
 }
 
 /***********************************************************/
@@ -196,7 +210,14 @@ static int popen_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, int s
 static int popen_get_buffer(void *opaque, uint8_t *buf, int64_t pos, int size)
 {
     QEMUFilePopen *s = opaque;
-    return fread(buf, 1, size, s->popen_file);
+    FILE *fp = s->popen_file;
+    int bytes;
+
+    do {
+        clearerr(fp);
+        bytes = fread(buf, 1, size, fp);
+    } while ((bytes == 0) && ferror(fp) && (errno == EINTR));
+    return bytes;
 }
 
 static int popen_close(void *opaque)