From patchwork Thu Aug 5 02:08:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 60920 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 79FFAB7149 for ; Thu, 5 Aug 2010 12:15:32 +1000 (EST) Received: from localhost ([127.0.0.1]:46200 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OgpzV-0000X5-Nn for incoming@patchwork.ozlabs.org; Wed, 04 Aug 2010 22:15:29 -0400 Received: from [140.186.70.92] (port=38902 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ogpns-0001Ig-KD for qemu-devel@nongnu.org; Wed, 04 Aug 2010 22:03:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Ogpno-0007NK-SU for qemu-devel@nongnu.org; Wed, 04 Aug 2010 22:03:28 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:38266) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ogpno-0007Mh-Df for qemu-devel@nongnu.org; Wed, 04 Aug 2010 22:03:24 -0400 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id 201D2107960; Thu, 5 Aug 2010 11:03:21 +0900 (JST) Received: (nullmailer pid 14299 invoked by uid 1000); Thu, 05 Aug 2010 02:09:05 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org Date: Thu, 5 Aug 2010 11:08:59 +0900 Message-Id: X-Mailer: git-send-email 1.7.1.1 In-Reply-To: References: In-Reply-To: References: X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: blauwirbel@gmail.com, yamahata@valinux.co.jp, kraxel@redhat.com, mst@redhat.com Subject: [Qemu-devel] [PATCH v2 2/8] qdev: export qdev_reset() for later use. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org export qdev_reset() for later use. Signed-off-by: Isaku Yamahata --- hw/qdev.c | 29 +++++++++++++++++++++++++---- hw/qdev.h | 1 + 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index e99c73f..322b315 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -256,13 +256,34 @@ DeviceState *qdev_device_add(QemuOpts *opts) return qdev; } -static void qdev_reset(void *opaque) +/* + * reset the device. + * Bring the device into initial known state (to some extent) + * on warm reset(system reset). + * Typically on system reset(or power-on reset), bus reset occurs on + * each bus which causes devices to reset. + * This reset doesn't include software reset which is triggered by + * issuing reset command. Those device reset would be implemented in a bus + * specific way. + * + * For example + * PCI: reset with RST# signal asserted. Not FLR of advanced feature capability + * PCIe: conventional reset. Not FLR. + * ATA: hardware reset with RESET- signal asserted. Not DEVICE RESET command. + * SCSI: hard reset with SCSI RST signal asserted. + * Not bus device reset message. + */ +void qdev_reset(DeviceState *dev) { - DeviceState *dev = opaque; if (dev->info->reset) dev->info->reset(dev); } +static void qdev_reset_fn(void *opaque) +{ + qdev_reset(opaque); +} + /* Initialize a device. Device properties should be set before calling this function. IRQs and MMIO regions should be connected/mapped after calling this function. @@ -278,7 +299,7 @@ int qdev_init(DeviceState *dev) qdev_free(dev); return rc; } - qemu_register_reset(qdev_reset, dev); + qemu_register_reset(qdev_reset_fn, dev); if (dev->info->vmsd) { vmstate_register_with_alias_id(dev, -1, dev->info->vmsd, dev, dev->instance_id_alias, @@ -350,7 +371,7 @@ void qdev_free(DeviceState *dev) if (dev->opts) qemu_opts_del(dev->opts); } - qemu_unregister_reset(qdev_reset, dev); + qemu_unregister_reset(qdev_reset_fn, dev); QLIST_REMOVE(dev, sibling); for (prop = dev->info->props; prop && prop->name; prop++) { if (prop->info->free) { diff --git a/hw/qdev.h b/hw/qdev.h index 678f8b7..10f6769 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -162,6 +162,7 @@ struct DeviceInfo { extern DeviceInfo *device_info_list; void qdev_register(DeviceInfo *info); +void qdev_reset(DeviceState *dev); /* Register device properties. */ /* GPIO inputs also double as IRQ sinks. */