[Qemu-devel] [7148] Add unregister_savevm() (Mark McLoughlin)

[Anthony Liguori]

Revision: 7148
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7148
Author:   aliguori
Date:     2009-04-17 17:10:59 +0000 (Fri, 17 Apr 2009)
Log Message:
-----------
Add unregister_savevm() (Mark McLoughlin)

Currently there's no way to unregister a savevm callback, so
e.g. if a NIC is hot-unplugged and a savevm is issued, we'll
segfault.

Signed-off-by: Mark McLoughlin <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>

Modified Paths:
--------------
    trunk/hw/hw.h
    trunk/savevm.c

Modified: trunk/hw/hw.h
===================================================================
--- trunk/hw/hw.h       2009-04-17 17:10:56 UTC (rev 7147)
+++ trunk/hw/hw.h       2009-04-17 17:10:59 UTC (rev 7148)
@@ -239,6 +239,8 @@
                          LoadStateHandler *load_state,
                          void *opaque);
 
+void unregister_savevm(const char *idstr, void *opaque);
+
 typedef void QEMUResetHandler(void *opaque);
 
 void qemu_register_reset(QEMUResetHandler *func, void *opaque);

Modified: trunk/savevm.c
===================================================================
--- trunk/savevm.c      2009-04-17 17:10:56 UTC (rev 7147)
+++ trunk/savevm.c      2009-04-17 17:10:59 UTC (rev 7148)
@@ -647,6 +647,22 @@
                                 NULL, save_state, load_state, opaque);
 }
 
+void unregister_savevm(const char *idstr, void *opaque)
+{
+    SaveStateEntry **pse;
+
+    pse = &first_se;
+    while (*pse != NULL) {
+        if (strcmp((*pse)->idstr, idstr) == 0 && (*pse)->opaque == opaque) {
+            SaveStateEntry *next = (*pse)->next;
+            qemu_free(*pse);
+            *pse = next;
+            continue;
+        }
+        pse = &(*pse)->next;
+    }
+}
+
 #define QEMU_VM_FILE_MAGIC           0x5145564d
 #define QEMU_VM_FILE_VERSION_COMPAT  0x00000002
 #define QEMU_VM_FILE_VERSION         0x00000003