From patchwork Fri Jun 4 12:08:07 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 54571 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3A225B7D5B for ; Fri, 4 Jun 2010 22:09:24 +1000 (EST) Received: from localhost ([127.0.0.1]:54364 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OKViD-0004iP-3X for incoming@patchwork.ozlabs.org; Fri, 04 Jun 2010 08:09:21 -0400 Received: from [140.186.70.92] (port=40239 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OKVh6-0004h9-4E for qemu-devel@nongnu.org; Fri, 04 Jun 2010 08:08:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OKVh5-0003mE-1X for qemu-devel@nongnu.org; Fri, 04 Jun 2010 08:08:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15359) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OKVh4-0003m4-K2 for qemu-devel@nongnu.org; Fri, 04 Jun 2010 08:08:10 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o54C891S023392 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 4 Jun 2010 08:08:09 -0400 Received: from zweiblum.home.kraxel.org (vpn1-4-214.ams2.redhat.com [10.36.4.214]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o54C88vj019501; Fri, 4 Jun 2010 08:08:09 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 48A1C7012B; Fri, 4 Jun 2010 14:08:07 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 4 Jun 2010 14:08:07 +0200 Message-Id: <1275653287-30862-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH] Add exit notifiers. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 ] --- sysemu.h | 4 ++++ vl.c | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletions(-) 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 @@ -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..52c6b22 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; @@ -2117,6 +2120,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); +} + #ifdef _WIN32 static BOOL WINAPI qemu_ctrl_handler(DWORD type) { @@ -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();