| Message ID | 1275644132-22176-1-git-send-email-kraxel@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Fri, Jun 4, 2010 at 10:35 AM, Gerd Hoffmann <kraxel@redhat.com> wrote: > 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. This looks useful to me. Just yesterday I added an atexit(3) case for some local hacking. > diff --git a/roms/seabios b/roms/seabios > index 8f469b9..7d09d0e 160000 > --- a/roms/seabios > +++ b/roms/seabios > @@ -1 +1 @@ > -Subproject commit 8f469b9676127ba6bb52609d89ec774e61db0ee1 > +Subproject commit 7d09d0e3ba11310e973d4302c7fcc3fc2184e04c This hunk seems unrelated to your commit. > diff --git a/vl.c b/vl.c > index ac1a998..1577566 100644 > --- a/vl.c > +++ b/vl.c > @@ -2127,6 +2130,21 @@ static BOOL WINAPI qemu_ctrl_handler(DWORD type) > > #ifndef _WIN32 > > +void qemu_add_exit_notifier(Notifier *notify) Why #ifndef _WIN32? I think this patch will break _WIN32 builds. Stefan
>> --- a/roms/seabios >> +++ b/roms/seabios >> @@ -1 +1 @@ >> -Subproject commit 8f469b9676127ba6bb52609d89ec774e61db0ee1 >> +Subproject commit 7d09d0e3ba11310e973d4302c7fcc3fc2184e04c > > This hunk seems unrelated to your commit. Damn. Yea. These seem to creap in now and then, I think when rebasing to a new version with new seabios, then carelessly doing 'git commit -a'. >> +void qemu_add_exit_notifier(Notifier *notify) > > Why #ifndef _WIN32? I think this patch will break _WIN32 builds. Not intentionally. Sent fixed version. cheers, Gerd
diff --git a/roms/seabios b/roms/seabios index 8f469b9..7d09d0e 160000 --- a/roms/seabios +++ b/roms/seabios @@ -1 +1 @@ -Subproject commit 8f469b9676127ba6bb52609d89ec774e61db0ee1 +Subproject commit 7d09d0e3ba11310e973d4302c7fcc3fc2184e04c diff --git a/sysemu.h b/sysemu.h index fd9dd9d..140b7ff 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> @@ -51,6 +52,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 ac1a998..1577566 100644 --- a/vl.c +++ b/vl.c @@ -243,6 +243,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; @@ -2127,6 +2130,21 @@ static BOOL WINAPI qemu_ctrl_handler(DWORD type) #ifndef _WIN32 +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); +} + static void termsig_handler(int signal) { qemu_system_shutdown_request(); @@ -2583,6 +2601,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();
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. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- roms/seabios | 2 +- sysemu.h | 4 ++++ vl.c | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletions(-)