From patchwork Thu Jun 25 02:17:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Guihua X-Patchwork-Id: 488267 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id CC0C31402EC for ; Thu, 25 Jun 2015 12:19:03 +1000 (AEST) Received: from localhost ([::1]:53610 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7wkn-0005zK-Lc for incoming@patchwork.ozlabs.org; Wed, 24 Jun 2015 22:19:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43571) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7wkG-000527-5J for qemu-devel@nongnu.org; Wed, 24 Jun 2015 22:18:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z7wkD-0001y6-GX for qemu-devel@nongnu.org; Wed, 24 Jun 2015 22:18:28 -0400 Received: from [59.151.112.132] (port=32761 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7wkD-0001xT-4x for qemu-devel@nongnu.org; Wed, 24 Jun 2015 22:18:25 -0400 X-IronPort-AV: E=Sophos;i="5.13,665,1427731200"; d="scan'208";a="97725363" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 25 Jun 2015 10:22:24 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id t5P2GggP026245; Thu, 25 Jun 2015 10:16:42 +0800 Received: from G08FNSTD140041.g08.fujitsu.local (10.167.226.252) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Thu, 25 Jun 2015 10:18:19 +0800 From: Zhu Guihua To: , , , , Date: Thu, 25 Jun 2015 10:17:09 +0800 Message-ID: <7d54c33fa2a928fd317f3a95af61f854f43ba23c.1435195913.git.zhugh.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.167.226.252] X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Cc: chen.fan.fnst@cn.fujitsu.com, izumi.taku@jp.fujitsu.com, Zhu Guihua Subject: [Qemu-devel] [RESEND PATCH v8 2/4] hw: add a wrapper for registering reset handler X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add a wrapper to specify reset order when registering reset handler, instead of non-obvious initiazation code ordering. Signed-off-by: Zhu Guihua --- include/hw/hw.h | 4 ++++ vl.c | 18 +++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/include/hw/hw.h b/include/hw/hw.h index c78adae..d9375e7 100644 --- a/include/hw/hw.h +++ b/include/hw/hw.h @@ -37,7 +37,11 @@ #endif typedef void QEMUResetHandler(void *opaque); +typedef uint64_t QEMUResetOrder; +#define default_reset_order 0x0 +void qemu_register_reset_common(QEMUResetHandler *func, void *opaque, + QEMUResetOrder reset_order); void qemu_register_reset(QEMUResetHandler *func, void *opaque); void qemu_unregister_reset(QEMUResetHandler *func, void *opaque); diff --git a/vl.c b/vl.c index 69ad90c..b205a9b 100644 --- a/vl.c +++ b/vl.c @@ -1589,6 +1589,7 @@ typedef struct QEMUResetEntry { QTAILQ_ENTRY(QEMUResetEntry) entry; QEMUResetHandler *func; void *opaque; + QEMUResetOrder reset_order; } QEMUResetEntry; static QTAILQ_HEAD(reset_handlers, QEMUResetEntry) reset_handlers = @@ -1672,15 +1673,30 @@ static int qemu_debug_requested(void) return r; } -void qemu_register_reset(QEMUResetHandler *func, void *opaque) +void qemu_register_reset_common(QEMUResetHandler *func, void *opaque, + QEMUResetOrder reset_order) { + QEMUResetEntry *item; QEMUResetEntry *re = g_malloc0(sizeof(QEMUResetEntry)); re->func = func; re->opaque = opaque; + re->reset_order = reset_order; + + QTAILQ_FOREACH(item, &reset_handlers, entry) { + if (re->reset_order >= item->reset_order) + continue; + QTAILQ_INSERT_BEFORE(item, re, entry); + return; + } QTAILQ_INSERT_TAIL(&reset_handlers, re, entry); } +void qemu_register_reset(QEMUResetHandler *func, void *opaque) +{ + qemu_register_reset_common(func, opaque, default_reset_order); +} + void qemu_unregister_reset(QEMUResetHandler *func, void *opaque) { QEMUResetEntry *re;