From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:43614) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTce7-0003xr-PS for qemu-devel@nongnu.org; Mon, 06 Jun 2011 12:27:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QTce5-0003uw-Um for qemu-devel@nongnu.org; Mon, 06 Jun 2011 12:27:19 -0400 Received: from mail-pw0-f45.google.com ([209.85.160.45]:43273) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTce5-0003ug-H4 for qemu-devel@nongnu.org; Mon, 06 Jun 2011 12:27:17 -0400 Received: by pwi6 with SMTP id 6so2348707pwi.4 for ; Mon, 06 Jun 2011 09:27:16 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 6 Jun 2011 18:26:52 +0200 Message-Id: <1307377620-7538-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1307377620-7538-1-git-send-email-pbonzini@redhat.com> References: <1307377620-7538-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [RFC PATCH 1/9] make qbus_reset_all public List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- hw/qdev.c | 7 +++---- hw/qdev.h | 2 +- vl.c | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index 9519f5d..ccfe68d 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -344,9 +344,8 @@ void qdev_reset_all(DeviceState *dev) qdev_walk_children(dev, qdev_reset_one, qbus_reset_one, NULL); } -void qbus_reset_all_fn(void *opaque) +void qbus_reset_all(BusState *bus) { - BusState *bus = opaque; qbus_walk_children(bus, qdev_reset_one, qbus_reset_one, NULL); } @@ -766,7 +765,7 @@ void qbus_create_inplace(BusState *bus, BusInfo *info, } else if (bus != main_system_bus) { /* TODO: once all bus devices are qdevified, only reset handler for main_system_bus should be registered here. */ - qemu_register_reset(qbus_reset_all_fn, bus); + qemu_register_reset((void (*)(void *))qbus_reset_all, bus); } } @@ -792,7 +791,7 @@ void qbus_free(BusState *bus) bus->parent->num_child_bus--; } else { assert(bus != main_system_bus); /* main_system_bus is never freed */ - qemu_unregister_reset(qbus_reset_all_fn, bus); + qemu_unregister_reset((void (*)(void *))qbus_reset_all, bus); } qemu_free((void*)bus->name); if (bus->qdev_allocated) { diff --git a/hw/qdev.h b/hw/qdev.h index 8a13ec9..0ecd31a 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -200,7 +200,7 @@ int qbus_walk_children(BusState *bus, qdev_walkerfn *devfn, int qdev_walk_children(DeviceState *dev, qdev_walkerfn *devfn, qbus_walkerfn *busfn, void *opaque); void qdev_reset_all(DeviceState *dev); -void qbus_reset_all_fn(void *opaque); +void qbus_reset_all(BusState *bus); void qbus_free(BusState *bus); diff --git a/vl.c b/vl.c index b362871..d359917 100644 --- a/vl.c +++ b/vl.c @@ -3266,7 +3266,7 @@ int main(int argc, char **argv, char **envp) /* TODO: once all bus devices are qdevified, this should be done * when bus is created by qdev.c */ - qemu_register_reset(qbus_reset_all_fn, sysbus_get_default()); + qemu_register_reset((void (*)(void *))qbus_reset_all, sysbus_get_default()); qemu_run_machine_init_done_notifiers(); qemu_system_reset(); -- 1.7.4.4