From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=37924 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OPC3j-00056X-9t for qemu-devel@nongnu.org; Thu, 17 Jun 2010 06:10:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OPC3h-0007UF-LA for qemu-devel@nongnu.org; Thu, 17 Jun 2010 06:10:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57026) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OPC3h-0007U7-A2 for qemu-devel@nongnu.org; Thu, 17 Jun 2010 06:10:53 -0400 Date: Thu, 17 Jun 2010 13:05:55 +0300 From: "Michael S. Tsirkin" Message-ID: <20100617100555.GG7912@redhat.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Subject: [Qemu-devel] Re: [PATCH 02/10] qdev: export qdev_reset() for later use. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Isaku Yamahata Cc: stefano.stabellini@eu.citrix.com, jan.kiszka@siemens.com, allen.m.kay@intel.com, qemu-devel@nongnu.org, blauwirbel@gmail.com, kraxel@redhat.com, jean.guyader@gmail.com On Thu, Jun 17, 2010 at 03:15:44PM +0900, Isaku Yamahata wrote: > export qdev_reset() for later use. > > Signed-off-by: Isaku Yamahata > --- > hw/qdev.c | 13 +++++++++---- > hw/qdev.h | 1 + > 2 files changed, 10 insertions(+), 4 deletions(-) > > diff --git a/hw/qdev.c b/hw/qdev.c > index 61f999c..378f842 100644 > --- a/hw/qdev.c > +++ b/hw/qdev.c > @@ -256,13 +256,18 @@ DeviceState *qdev_device_add(QemuOpts *opts) > return qdev; > } > > -static void qdev_reset(void *opaque) > +void qdev_reset(DeviceState *dev) What does this API do? Yes, I see that it invokes the reset callback internally. But what does it do that the caller wants? After all, the callback gets invoked on reset directly. > { > - DeviceState *dev = opaque; > if (dev->info->reset) > dev->info->reset(dev); > } > > +static void qdev_reset_fn(void *opaque) > +{ > + DeviceState *dev = opaque; > + qdev_reset(dev); > +} > + > /* 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 +283,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(-1, dev->info->vmsd, dev, > dev->instance_id_alias, > @@ -348,7 +353,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 be5ad67..5fbdebf 100644 > --- a/hw/qdev.h > +++ b/hw/qdev.h > @@ -113,6 +113,7 @@ typedef struct GlobalProperty { > DeviceState *qdev_create(BusState *bus, const char *name); > int qdev_device_help(QemuOpts *opts); > DeviceState *qdev_device_add(QemuOpts *opts); > +void qdev_reset(DeviceState *dev); > int qdev_init(DeviceState *dev) QEMU_WARN_UNUSED_RESULT; > void qdev_init_nofail(DeviceState *dev); > void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id, > -- > 1.6.6.1