From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:52878) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkdVd-00013Y-NX for qemu-devel@nongnu.org; Mon, 17 Dec 2012 11:25:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TkdVc-0008Lz-DB for qemu-devel@nongnu.org; Mon, 17 Dec 2012 11:25:41 -0500 Received: from mail-ie0-f173.google.com ([209.85.223.173]:46953) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkdVc-0008LA-3U for qemu-devel@nongnu.org; Mon, 17 Dec 2012 11:25:40 -0500 Received: by mail-ie0-f173.google.com with SMTP id e13so9604328iej.4 for ; Mon, 17 Dec 2012 08:25:39 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 17 Dec 2012 17:24:46 +0100 Message-Id: <1355761490-10073-12-git-send-email-pbonzini@redhat.com> In-Reply-To: <1355761490-10073-1-git-send-email-pbonzini@redhat.com> References: <1355761490-10073-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 11/15] qdev: remove device_reset List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, mst@redhat.com The right thing to do is always to use qdev_reset_all (or qbus_reset_all). Call the reset method straight from qdev_reset_one. Signed-off-by: Paolo Bonzini --- hw/qdev-core.h | 7 ------- hw/qdev.c | 15 +++++---------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/hw/qdev-core.h b/hw/qdev-core.h index 7c2598e..28f12a4 100644 --- a/hw/qdev-core.h +++ b/hw/qdev-core.h @@ -218,13 +218,6 @@ char *qdev_get_fw_dev_path(DeviceState *dev); */ void qdev_machine_init(void); -/** - * @device_reset - * - * Reset a single device (by calling the reset method). - */ -void device_reset(DeviceState *dev); - const struct VMStateDescription *qdev_get_vmsd(DeviceState *dev); const char *qdev_fw_name(DeviceState *dev); diff --git a/hw/qdev.c b/hw/qdev.c index 833d571..1736d6f 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -211,7 +211,11 @@ void qdev_unplug(DeviceState *dev, Error **errp) static int qdev_reset_one(DeviceState *dev, void *opaque) { - device_reset(dev); + DeviceClass *klass = DEVICE_GET_CLASS(dev); + + if (klass->reset) { + klass->reset(dev); + } return 0; } @@ -750,15 +754,6 @@ static void device_class_init(ObjectClass *class, void *data) class->unparent = qdev_remove_from_bus; } -void device_reset(DeviceState *dev) -{ - DeviceClass *klass = DEVICE_GET_CLASS(dev); - - if (klass->reset) { - klass->reset(dev); - } -} - Object *qdev_get_machine(void) { static Object *dev; -- 1.8.0.2