From patchwork Fri Nov 9 14:56:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 198112 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D71902C0290 for ; Sat, 10 Nov 2012 02:49:10 +1100 (EST) Received: from localhost ([::1]:36773 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TWq1Q-00019K-Lz for incoming@patchwork.ozlabs.org; Fri, 09 Nov 2012 09:57:28 -0500 Received: from eggs.gnu.org ([208.118.235.92]:55983) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TWq08-0007Cl-S4 for qemu-devel@nongnu.org; Fri, 09 Nov 2012 09:56:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TWpzv-0005XG-1F for qemu-devel@nongnu.org; Fri, 09 Nov 2012 09:56:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47753) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TWpzu-0005Wj-PI for qemu-devel@nongnu.org; Fri, 09 Nov 2012 09:55:54 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qA9EthmH027567 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 9 Nov 2012 09:55:44 -0500 Received: from blackpad.lan.raisama.net (vpn1-4-237.gru2.redhat.com [10.97.4.237]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qA9Etfbf006967; Fri, 9 Nov 2012 09:55:43 -0500 Received: by blackpad.lan.raisama.net (Postfix, from userid 500) id 87F3D203429; Fri, 9 Nov 2012 12:56:56 -0200 (BRST) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Fri, 9 Nov 2012 12:56:47 -0200 Message-Id: <1352473012-20500-20-git-send-email-ehabkost@redhat.com> In-Reply-To: <1352473012-20500-1-git-send-email-ehabkost@redhat.com> References: <1352473012-20500-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: peter.maydell@linaro.org, riku.voipio@iki.fi, blauwirbel@gmail.com, Anthony Liguori , Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH 19/24] qdev: move reset handler list from vl.c to qdev.c 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 The core qdev code uses the reset handler list from vl.c, so move qemu_register_reset(), qemu_unregister_reset() and qemu_devices_reset() to qdev.c. The function declarations were moved to a new qdev-reset.h file, that is included by hw.h to keep compatibility, so we don't need to change all files that use qemu_register_reset(). Signed-off-by: Eduardo Habkost --- hw/hw.h | 6 +----- hw/qdev-reset.h | 11 +++++++++++ hw/qdev.c | 41 +++++++++++++++++++++++++++++++++++++++++ hw/qdev.h | 1 + sysemu.h | 1 - vl.c | 40 ---------------------------------------- 6 files changed, 54 insertions(+), 46 deletions(-) create mode 100644 hw/qdev-reset.h diff --git a/hw/hw.h b/hw/hw.h index f530f6f..622a157 100644 --- a/hw/hw.h +++ b/hw/hw.h @@ -14,6 +14,7 @@ #include "qemu-file.h" #include "vmstate.h" #include "qemu-log.h" +#include "qdev-reset.h" #ifdef NEED_CPU_H #if TARGET_LONG_BITS == 64 @@ -37,11 +38,6 @@ #endif #endif -typedef void QEMUResetHandler(void *opaque); - -void qemu_register_reset(QEMUResetHandler *func, void *opaque); -void qemu_unregister_reset(QEMUResetHandler *func, void *opaque); - /* handler to set the boot_device order for a specific type of QEMUMachine */ /* return 0 if success */ typedef int QEMUBootSetHandler(void *opaque, const char *boot_devices); diff --git a/hw/qdev-reset.h b/hw/qdev-reset.h new file mode 100644 index 0000000..40ae9a5 --- /dev/null +++ b/hw/qdev-reset.h @@ -0,0 +1,11 @@ +/* Device reset handler function registration, used by qdev */ +#ifndef QDEV_RESET_H +#define QDEV_RESET_H + +typedef void QEMUResetHandler(void *opaque); + +void qemu_register_reset(QEMUResetHandler *func, void *opaque); +void qemu_unregister_reset(QEMUResetHandler *func, void *opaque); +void qemu_devices_reset(void); + +#endif /* QDEV_RESET_H */ diff --git a/hw/qdev.c b/hw/qdev.c index 2cc6434..c242097 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -35,6 +35,47 @@ int qdev_hotplug = 0; static bool qdev_hot_added = false; static bool qdev_hot_removed = false; +typedef struct QEMUResetEntry { + QTAILQ_ENTRY(QEMUResetEntry) entry; + QEMUResetHandler *func; + void *opaque; +} QEMUResetEntry; + +static QTAILQ_HEAD(reset_handlers, QEMUResetEntry) reset_handlers = + QTAILQ_HEAD_INITIALIZER(reset_handlers); + +void qemu_register_reset(QEMUResetHandler *func, void *opaque) +{ + QEMUResetEntry *re = g_malloc0(sizeof(QEMUResetEntry)); + + re->func = func; + re->opaque = opaque; + QTAILQ_INSERT_TAIL(&reset_handlers, re, entry); +} + +void qemu_unregister_reset(QEMUResetHandler *func, void *opaque) +{ + QEMUResetEntry *re; + + QTAILQ_FOREACH(re, &reset_handlers, entry) { + if (re->func == func && re->opaque == opaque) { + QTAILQ_REMOVE(&reset_handlers, re, entry); + g_free(re); + return; + } + } +} + +void qemu_devices_reset(void) +{ + QEMUResetEntry *re, *nre; + + /* reset all devices */ + QTAILQ_FOREACH_SAFE(re, &reset_handlers, entry, nre) { + re->func(re->opaque); + } +} + const VMStateDescription *qdev_get_vmsd(DeviceState *dev) { DeviceClass *dc = DEVICE_GET_CLASS(dev); diff --git a/hw/qdev.h b/hw/qdev.h index 365b8d6..2487b3b 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -5,5 +5,6 @@ #include "qdev-core.h" #include "qdev-properties.h" #include "qdev-monitor.h" +#include "qdev-reset.h" #endif diff --git a/sysemu.h b/sysemu.h index ab1ef8b..51f19cc 100644 --- a/sysemu.h +++ b/sysemu.h @@ -57,7 +57,6 @@ void qemu_system_vmstop_request(RunState reason); int qemu_shutdown_requested_get(void); int qemu_reset_requested_get(void); void qemu_system_killed(int signal, pid_t pid); -void qemu_devices_reset(void); void qemu_system_reset(bool report); void qemu_add_exit_notifier(Notifier *notify); diff --git a/vl.c b/vl.c index 4f03a72..c7448a2 100644 --- a/vl.c +++ b/vl.c @@ -1456,14 +1456,6 @@ void vm_start(void) /* reset/shutdown handler */ -typedef struct QEMUResetEntry { - QTAILQ_ENTRY(QEMUResetEntry) entry; - QEMUResetHandler *func; - void *opaque; -} QEMUResetEntry; - -static QTAILQ_HEAD(reset_handlers, QEMUResetEntry) reset_handlers = - QTAILQ_HEAD_INITIALIZER(reset_handlers); static int reset_requested; static int shutdown_requested, shutdown_signal = -1; static pid_t shutdown_pid; @@ -1560,38 +1552,6 @@ static bool qemu_vmstop_requested(RunState *r) return false; } -void qemu_register_reset(QEMUResetHandler *func, void *opaque) -{ - QEMUResetEntry *re = g_malloc0(sizeof(QEMUResetEntry)); - - re->func = func; - re->opaque = opaque; - QTAILQ_INSERT_TAIL(&reset_handlers, re, entry); -} - -void qemu_unregister_reset(QEMUResetHandler *func, void *opaque) -{ - QEMUResetEntry *re; - - QTAILQ_FOREACH(re, &reset_handlers, entry) { - if (re->func == func && re->opaque == opaque) { - QTAILQ_REMOVE(&reset_handlers, re, entry); - g_free(re); - return; - } - } -} - -void qemu_devices_reset(void) -{ - QEMUResetEntry *re, *nre; - - /* reset all devices */ - QTAILQ_FOREACH_SAFE(re, &reset_handlers, entry, nre) { - re->func(re->opaque); - } -} - void qemu_system_reset(bool report) { if (current_machine && current_machine->reset) {