From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35048) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8I5J-0007z3-0k for qemu-devel@nongnu.org; Wed, 01 Jun 2016 22:10:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b8I5G-0007EC-KL for qemu-devel@nongnu.org; Wed, 01 Jun 2016 22:10:07 -0400 Date: Thu, 2 Jun 2016 11:15:44 +1000 From: David Gibson Message-ID: <20160602011544.GH15455@voom.fritz.box> References: <1463024905-28401-1-git-send-email-bharata@linux.vnet.ibm.com> <1463024905-28401-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="0OWHXb1mYLuhj1Ox" Content-Disposition: inline In-Reply-To: <1463024905-28401-6-git-send-email-bharata@linux.vnet.ibm.com> Subject: Re: [Qemu-devel] [for-2.7 PATCH v3 05/15] qdev: hotplug: Introduce HotplugHandler.pre_plug() callback List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Bharata B Rao Cc: qemu-devel@nongnu.org, qemu-ppc@nongnu.org, afaerber@suse.de, imammedo@redhat.com, armbru@redhat.com, thuth@redhat.com, aik@ozlabs.ru, agraf@suse.de, pbonzini@redhat.com, ehabkost@redhat.com, pkrempa@redhat.com, mdroth@linux.vnet.ibm.com, eblake@redhat.com, mjrosato@linux.vnet.ibm.com, borntraeger@de.ibm.com --0OWHXb1mYLuhj1Ox Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, May 12, 2016 at 09:18:15AM +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 Igor, do you think we're ready to merge this? If so, do you want to take it through your tree, or should I take it through the ppc tree? > --- > 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 da1d0e4..c0db869 100644 > --- a/include/hw/hotplug.h > +++ b/include/hw/hotplug.h > @@ -45,7 +45,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. > @@ -58,6 +59,7 @@ typedef struct HotplugHandlerClass { > InterfaceClass parent; > =20 > /* */ > + hotplug_fn pre_plug; > hotplug_fn plug; > hotplug_fn unplug_request; > hotplug_fn unplug; > @@ -73,6 +75,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 --0OWHXb1mYLuhj1Ox Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJXT4jAAAoJEGw4ysog2bOSeRAQALr/TKR2CYjCouI9kD2kubUU rKzafXNYtU1DPY7WInevH5vZiZw+tSAKaT8QcTn1UtZesUkpQxsYVsYxkZFuEDjb BOY4lyoSerkm7wZMS7GtVSqGwM0r6kx90dQ+67FQPlZInp119SUTIy9hOu3cgXwO HlzKZwGjtOhPPC78MOW8zjwIIjBC36Vk2tpqsH1s5gB2bpr4/L0q5dFp0eBxCUsL dgDzUPVtHuLzLXExT4ISA+UU684/9HIm8LALKXD/FnO4VaonNsWd/TxfI8mW3pKm nqvQEY7tP80uxwWnhhvuITkyufNxLBtCCYXE0D+R3NCtJs86bobOe0eJX2fkfG/w 254NktY7j6l/5NXKUe1n2z7iAke8w1FZ9Q6c4yf8ZlU3yFlUKzeO1BNJmci9PZ8D 0NYB79ezTRzgCNWHDUEtQb3Zz7SlkUFydO8Rtx8ZpxZDtwrGJmClXSYxSauT/EY6 d89K+7cNfGoZMgJnwUGr7OwWtsjrX/U4hA+0F9H6zYxbpzK3fTKk96BBLxZJeUC3 cRDUt6n8twhD9TQQkMO0J5juSxk4YR9SvSUC3djd5HuWj1Hh1a+Mcd+9V+hrQcxb Zuk823G8HUm9gowN5xzTRMPkTMVRUkvH1WmuQPPFlRiHdrlhKUV38CdRLWCzWpRe dHTwemzOfz4atwF8jP0Z =id8R -----END PGP SIGNATURE----- --0OWHXb1mYLuhj1Ox--