diff options
| author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-17 17:10:59 +0000 |
|---|---|---|
| committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-17 17:10:59 +0000 |
| commit | 41bd13afdabf62ba513e00fade177749d73e1c09 (patch) | |
| tree | 1f4b20544f1488dcde434eb8ca60776c64e8443b | |
| parent | ad067148585b1fc98814b1ca3db4d0c1fdd969e0 (diff) | |
| download | focaccia-qemu-41bd13afdabf62ba513e00fade177749d73e1c09.tar.gz focaccia-qemu-41bd13afdabf62ba513e00fade177749d73e1c09.zip | |
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 <markmc@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7148 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | hw/hw.h | 2 | ||||
| -rw-r--r-- | savevm.c | 16 |
2 files changed, 18 insertions, 0 deletions
diff --git a/hw/hw.h b/hw/hw.h index e9628d46fb..d0cf598204 100644 --- a/hw/hw.h +++ b/hw/hw.h @@ -239,6 +239,8 @@ int register_savevm_live(const char *idstr, 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); diff --git a/savevm.c b/savevm.c index 70500dd57a..c15db9ae2d 100644 --- a/savevm.c +++ b/savevm.c @@ -647,6 +647,22 @@ int register_savevm(const char *idstr, 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 |