From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55094) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYofd-0002U0-B6 for qemu-devel@nongnu.org; Wed, 14 Nov 2012 20:55:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TYofa-0002dt-9M for qemu-devel@nongnu.org; Wed, 14 Nov 2012 20:55:09 -0500 Received: from cantor2.suse.de ([195.135.220.15]:48623 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYofZ-0002bD-Sx for qemu-devel@nongnu.org; Wed, 14 Nov 2012 20:55:06 -0500 Message-ID: <50A44B71.50804@suse.de> Date: Thu, 15 Nov 2012 02:54:57 +0100 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1352473012-20500-1-git-send-email-ehabkost@redhat.com> <1352473012-20500-20-git-send-email-ehabkost@redhat.com> In-Reply-To: <1352473012-20500-20-git-send-email-ehabkost@redhat.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 19/24] qdev: move reset handler list from vl.c to qdev.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: peter.maydell@linaro.org, riku.voipio@iki.fi, qemu-devel@nongnu.org, blauwirbel@gmail.com, Anthony Liguori , Igor Mammedov Am 09.11.2012 15:56, schrieb Eduardo Habkost: > 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. >=20 > The function declarations were moved to a new qdev-reset.h file, that i= s > included by hw.h to keep compatibility, so we don't need to change all > files that use qemu_register_reset(). >=20 > 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 >=20 > 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" > =20 > #ifdef NEED_CPU_H > #if TARGET_LONG_BITS =3D=3D 64 > @@ -37,11 +38,6 @@ > #endif > #endif > =20 > -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 QEMUMac= hine */ > /* 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 =3D 0; > static bool qdev_hot_added =3D false; > static bool qdev_hot_removed =3D false; > =20 > +typedef struct QEMUResetEntry { > + QTAILQ_ENTRY(QEMUResetEntry) entry; > + QEMUResetHandler *func; > + void *opaque; > +} QEMUResetEntry; > + > +static QTAILQ_HEAD(reset_handlers, QEMUResetEntry) reset_handlers =3D > + QTAILQ_HEAD_INITIALIZER(reset_handlers); > + > +void qemu_register_reset(QEMUResetHandler *func, void *opaque) > +{ > + QEMUResetEntry *re =3D g_malloc0(sizeof(QEMUResetEntry)); > + > + re->func =3D func; > + re->opaque =3D 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 =3D=3D func && re->opaque =3D=3D opaque) { > + QTAILQ_REMOVE(&reset_handlers, re, entry); > + g_free(re); > + return; > + } > + } > +} My tired mind does not like this move and the naming qdev-reset.h. The reset handling infrastructure is not limited to DeviceState (qdev), it takes an opaque and is limited to softmmu whereas qdev prefers its own DeviceClass::reset hook. Andreas > + > +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 =3D 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" > =20 > #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); > =20 > 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) > =20 > /* reset/shutdown handler */ > =20 > -typedef struct QEMUResetEntry { > - QTAILQ_ENTRY(QEMUResetEntry) entry; > - QEMUResetHandler *func; > - void *opaque; > -} QEMUResetEntry; > - > -static QTAILQ_HEAD(reset_handlers, QEMUResetEntry) reset_handlers =3D > - QTAILQ_HEAD_INITIALIZER(reset_handlers); > static int reset_requested; > static int shutdown_requested, shutdown_signal =3D -1; > static pid_t shutdown_pid; > @@ -1560,38 +1552,6 @@ static bool qemu_vmstop_requested(RunState *r) > return false; > } > =20 > -void qemu_register_reset(QEMUResetHandler *func, void *opaque) > -{ > - QEMUResetEntry *re =3D g_malloc0(sizeof(QEMUResetEntry)); > - > - re->func =3D func; > - re->opaque =3D 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 =3D=3D func && re->opaque =3D=3D 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) { >=20 --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg