Patchwork [RESENT] Add exit notifiers.

login
register
mail settings
Submitter Gerd Hoffmann
Date June 14, 2010, 3:27 p.m.
Message ID <1276529241-21988-1-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/55552/
State New
Headers show

Comments

Gerd Hoffmann - June 14, 2010, 3:27 p.m.
Hook up any cleanup work which needs to be done here.  Advantages over
using atexit(3):

  (1) You get passed in a pointer to the notifier.  If you embed that
      into your state struct you can use container_of() to get get your
      state info.
  (2) You can unregister, say when un-plugging a device.

[ v2: move code out of #ifndef _WIN32 ]

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 sysemu.h |    4 ++++
 vl.c     |   19 +++++++++++++++++++
 2 files changed, 23 insertions(+), 0 deletions(-)
Stefan Hajnoczi - June 15, 2010, 10:15 a.m.
Looks good.

Stefan

Patch

diff --git a/sysemu.h b/sysemu.h
index 346cccd..0bfbd6a 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -6,6 +6,7 @@ 
 #include "qemu-option.h"
 #include "qemu-queue.h"
 #include "qemu-timer.h"
+#include "notify.h"
 
 #ifdef _WIN32
 #include <windows.h>
@@ -56,6 +57,9 @@  int qemu_powerdown_requested(void);
 extern qemu_irq qemu_system_powerdown;
 void qemu_system_reset(void);
 
+void qemu_add_exit_notifier(Notifier *notify);
+void qemu_remove_exit_notifier(Notifier *notify);
+
 void do_savevm(Monitor *mon, const QDict *qdict);
 int load_vmstate(const char *name);
 void do_delvm(Monitor *mon, const QDict *qdict);
diff --git a/vl.c b/vl.c
index 9cf5334..5daeb7b 100644
--- a/vl.c
+++ b/vl.c
@@ -238,6 +238,9 @@  uint8_t qemu_uuid[16];
 static QEMUBootSetHandler *boot_set_handler;
 static void *boot_set_opaque;
 
+static NotifierList exit_notifiers =
+    NOTIFIER_LIST_INITIALIZER(exit_notifiers);
+
 int kvm_allowed = 0;
 uint32_t xen_domid;
 enum xen_mode xen_mode = XEN_EMULATE;
@@ -1956,6 +1959,21 @@  static int balloon_parse(const char *arg)
     return -1;
 }
 
+void qemu_add_exit_notifier(Notifier *notify)
+{
+    notifier_list_add(&exit_notifiers, notify);
+}
+
+void qemu_remove_exit_notifier(Notifier *notify)
+{
+    notifier_list_remove(&exit_notifiers, notify);
+}
+
+static void qemu_run_exit_notifiers(void)
+{
+    notifier_list_notify(&exit_notifiers);
+}
+
 char *qemu_find_file(int type, const char *name)
 {
     int len;
@@ -2287,6 +2305,7 @@  int main(int argc, char **argv, char **envp)
     int show_vnc_port = 0;
     int defconfig = 1;
 
+    atexit(qemu_run_exit_notifiers);
     error_set_progname(argv[0]);
 
     init_clocks();