From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51329) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alq7a-0008Mi-QY for qemu-devel@nongnu.org; Thu, 31 Mar 2016 23:51:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1alq7W-0002Wp-Jc for qemu-devel@nongnu.org; Thu, 31 Mar 2016 23:51:42 -0400 Date: Fri, 1 Apr 2016 14:30:54 +1100 From: David Gibson Message-ID: <20160401033054.GM416@voom.redhat.com> References: <1459413561-30745-1-git-send-email-bharata@linux.vnet.ibm.com> <1459413561-30745-6-git-send-email-bharata@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="GeONROBiaq1zPAtT" Content-Disposition: inline In-Reply-To: <1459413561-30745-6-git-send-email-bharata@linux.vnet.ibm.com> Subject: Re: [Qemu-devel] [RFC PATCH v2.1 05/12] qdev: hotplug: Introduce HotplugHandler.pre_plug() callback List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Bharata B Rao Cc: mjrosato@linux.vnet.ibm.com, agraf@suse.de, thuth@redhat.com, pkrempa@redhat.com, ehabkost@redhat.com, aik@ozlabs.ru, qemu-devel@nongnu.org, armbru@redhat.com, borntraeger@de.ibm.com, qemu-ppc@nongnu.org, pbonzini@redhat.com, imammedo@redhat.com, afaerber@suse.de, mdroth@linux.vnet.ibm.com --GeONROBiaq1zPAtT Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Mar 31, 2016 at 02:09:14PM +0530, Bharata B Rao wrote: > From: Igor Mammedov >=20 > pre_plug callback is to be called before device.realize() is executed. > This would allow to check/set device's properties from HotplugHandler. >=20 > Signed-off-by: Igor Mammedov > Signed-off-by: Bharata B Rao Reviewed-by: David Gibson It would be really nice to get some opinion on this from Andreas or Paolo. > --- > hw/core/hotplug.c | 11 +++++++++++ > hw/core/qdev.c | 9 ++++++++- > include/hw/hotplug.h | 14 +++++++++++++- > 3 files changed, 32 insertions(+), 2 deletions(-) >=20 > diff --git a/hw/core/hotplug.c b/hw/core/hotplug.c > index 645cfca..17ac986 100644 > --- a/hw/core/hotplug.c > +++ b/hw/core/hotplug.c > @@ -13,6 +13,17 @@ > #include "hw/hotplug.h" > #include "qemu/module.h" > =20 > +void hotplug_handler_pre_plug(HotplugHandler *plug_handler, > + DeviceState *plugged_dev, > + Error **errp) > +{ > + HotplugHandlerClass *hdc =3D HOTPLUG_HANDLER_GET_CLASS(plug_handler); > + > + if (hdc->pre_plug) { > + hdc->pre_plug(plug_handler, plugged_dev, errp); > + } > +} > + > void hotplug_handler_plug(HotplugHandler *plug_handler, > DeviceState *plugged_dev, > Error **errp) > diff --git a/hw/core/qdev.c b/hw/core/qdev.c > index db41aa1..a0b3aad 100644 > --- a/hw/core/qdev.c > +++ b/hw/core/qdev.c > @@ -1062,6 +1062,14 @@ static void device_set_realized(Object *obj, bool = value, Error **errp) > g_free(name); > } > =20 > + hotplug_ctrl =3D qdev_get_hotplug_handler(dev); > + if (hotplug_ctrl) { > + hotplug_handler_pre_plug(hotplug_ctrl, dev, &local_err); > + if (local_err !=3D NULL) { > + goto fail; > + } > + } > + > if (dc->realize) { > dc->realize(dev, &local_err); > } > @@ -1072,7 +1080,6 @@ static void device_set_realized(Object *obj, bool v= alue, Error **errp) > =20 > DEVICE_LISTENER_CALL(realize, Forward, dev); > =20 > - hotplug_ctrl =3D qdev_get_hotplug_handler(dev); > if (hotplug_ctrl) { > hotplug_handler_plug(hotplug_ctrl, dev, &local_err); > } > diff --git a/include/hw/hotplug.h b/include/hw/hotplug.h > index 2db025d..50d84e9 100644 > --- a/include/hw/hotplug.h > +++ b/include/hw/hotplug.h > @@ -46,7 +46,8 @@ typedef void (*hotplug_fn)(HotplugHandler *plug_handler, > * hardware (un)plug functions. > * > * @parent: Opaque parent interface. > - * @plug: plug callback. > + * @pre_plug: pre plug callback called at start of device.realize(true) > + * @plug: plug callback called at end of device.realize(true). > * @unplug_request: unplug request callback. > * Used as a means to initiate device unplug for device= s that > * require asynchronous unplug handling. > @@ -59,6 +60,7 @@ typedef struct HotplugHandlerClass { > InterfaceClass parent; > =20 > /* */ > + hotplug_fn pre_plug; > hotplug_fn plug; > hotplug_fn unplug_request; > hotplug_fn unplug; > @@ -74,6 +76,16 @@ void hotplug_handler_plug(HotplugHandler *plug_handler, > Error **errp); > =20 > /** > + * hotplug_handler_pre_plug: > + * > + * Call #HotplugHandlerClass.pre_plug callback of @plug_handler. > + */ > +void hotplug_handler_pre_plug(HotplugHandler *plug_handler, > + DeviceState *plugged_dev, > + Error **errp); > + > + > +/** > * hotplug_handler_unplug_request: > * > * Calls #HotplugHandlerClass.unplug_request callback of @plug_handler. --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --GeONROBiaq1zPAtT Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJW/etuAAoJEGw4ysog2bOSN9AP/1BbYfeKBZ+/7DtuEb/L6+B8 J9egfzrefjfSTb0S4QJP0b6mW1sGYez/ppulU8S9U55ALroOEhBHmWCSAYYayv+s nWnGJ74qUTL1Z4uZFK5InPoLqmP+Xu4oFHfpKGMcNx+AHGAbKELgBFvVIISWQyrB N4baDB01nfiBi8SgdJILnstqVp/5zoUMb+2nX7m6vKzu+9wUpGCAzCi/xcf0NYuE eONyGgLm8XxeDNuum1OspmBD6E6kFVT8ZpzEuLKYF8GoHTotRDquxRyP+EOObC9J L97z5Z/jiU9gH5ZKJj0hPDWQsL5wC90Cp/t2nv8cqsqZJeaf9ICSxfzjpIR0OWlQ Q20hBZqx0sVryn/ogd0FXU74RGVYONEwJA+kcL2gqghz0Y+qrNfd+jzudd/J5xTX TiQzjEU1b32mUnYa2kAb2pnxfP6eAu+dVyG0imxcWwX8g56FalXq7RVC/goTZSnx 72iBSJe9gDwbyKEZjQwhASDFTkN1UrdjAHlcTkHqtEbztW8MgVT5GZKaN/vI/Pjg B1A/TZjE/RsjSngoZo1/OMK5iuKB2rY7Kiw4xUUgDt5FJKNYzr0ASm4SK6yhPwr2 w57K34k3WTxrS5NNK3xzykk3FxWVQnYQbwODW44dJ1yxSAqFZ9EIMcyoumLIr32+ F8/C/2QEDVmZ4tuHHKet =23GK -----END PGP SIGNATURE----- --GeONROBiaq1zPAtT--