From patchwork Mon Aug 30 07:49:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 63007 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 8FA09B7100 for ; Mon, 30 Aug 2010 17:47:21 +1000 (EST) Received: from localhost ([127.0.0.1]:53841 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Opz3C-0007ud-PA for incoming@patchwork.ozlabs.org; Mon, 30 Aug 2010 03:45:06 -0400 Received: from [140.186.70.92] (port=46300 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Opyw2-0005cb-HZ for qemu-devel@nongnu.org; Mon, 30 Aug 2010 03:37:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Opyw0-0005Pq-8U for qemu-devel@nongnu.org; Mon, 30 Aug 2010 03:37:42 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:56006) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Opyvz-0005Pc-OT for qemu-devel@nongnu.org; Mon, 30 Aug 2010 03:37:40 -0400 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id 548C7107A70; Mon, 30 Aug 2010 16:37:36 +0900 (JST) Received: (nullmailer pid 7211 invoked by uid 1000); Mon, 30 Aug 2010 07:49:27 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org Date: Mon, 30 Aug 2010 16:49:26 +0900 Message-Id: <344fff332d4f4198dec0978662105727966b4c1b.1283152674.git.yamahata@valinux.co.jp> X-Mailer: git-send-email 1.7.1.1 In-Reply-To: References: In-Reply-To: References: X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: glommer@redhat.com, blauwirbel@gmail.com, yamahata@valinux.co.jp, alex.williamson@redhat.com, avi@redhat.com Subject: [Qemu-devel] [PATCH 4/5] vl.c: factor out qemu_reguster/unregister_reset(). 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 factor out qemu_reguster/unregister_reset() for later use. Signed-off-by: Isaku Yamahata --- vl.c | 34 ++++++++++++++++++++++++++-------- 1 files changed, 26 insertions(+), 8 deletions(-) diff --git a/vl.c b/vl.c index 2a89f4f..a919a32 100644 --- a/vl.c +++ b/vl.c @@ -1121,7 +1121,8 @@ typedef struct QEMUResetEntry { void *opaque; } QEMUResetEntry; -static QTAILQ_HEAD(reset_handlers, QEMUResetEntry) reset_handlers = +QTAILQ_HEAD(reset_handlers, QEMUResetEntry); +static struct reset_handlers reset_handlers = QTAILQ_HEAD_INITIALIZER(reset_handlers); static int reset_requested; static int shutdown_requested; @@ -1161,36 +1162,53 @@ static int qemu_vmstop_requested(void) return qemu_requested(&vmstop_requested); } -void qemu_register_reset(QEMUResetHandler *func, void *opaque) +static void qemu_register_reset_handler(QEMUResetHandler *func, void *opaque, + struct reset_handlers *handlers) { QEMUResetEntry *re = qemu_mallocz(sizeof(QEMUResetEntry)); re->func = func; re->opaque = opaque; - QTAILQ_INSERT_TAIL(&reset_handlers, re, entry); + QTAILQ_INSERT_TAIL(handlers, re, entry); } -void qemu_unregister_reset(QEMUResetHandler *func, void *opaque) +static void qemu_unregister_reset_handler(QEMUResetHandler *func, void *opaque, + struct reset_handlers *handlers) { QEMUResetEntry *re; - QTAILQ_FOREACH(re, &reset_handlers, entry) { + QTAILQ_FOREACH(re, handlers, entry) { if (re->func == func && re->opaque == opaque) { - QTAILQ_REMOVE(&reset_handlers, re, entry); + QTAILQ_REMOVE(handlers, re, entry); qemu_free(re); return; } } } -static void qemu_system_reset(void) +static void qemu_system_reset_handler(struct reset_handlers *handlers) { QEMUResetEntry *re, *nre; /* reset all devices */ - QTAILQ_FOREACH_SAFE(re, &reset_handlers, entry, nre) { + QTAILQ_FOREACH_SAFE(re, handlers, entry, nre) { re->func(re->opaque); } +} + +void qemu_register_reset(QEMUResetHandler *func, void *opaque) +{ + qemu_register_reset_handler(func, opaque, &reset_handlers); +} + +void qemu_unregister_reset(QEMUResetHandler *func, void *opaque) +{ + qemu_unregister_reset_handler(func, opaque, &reset_handlers); +} + +static void qemu_system_reset(void) +{ + qemu_system_reset_handler(&reset_handlers); monitor_protocol_event(QEVENT_RESET, NULL); cpu_synchronize_all_post_reset(); }