From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51040) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amsvR-0005oY-8Y for qemu-devel@nongnu.org; Sun, 03 Apr 2016 21:03:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1amsvP-0004jl-3J for qemu-devel@nongnu.org; Sun, 03 Apr 2016 21:03:29 -0400 Date: Mon, 4 Apr 2016 10:09:53 +1000 From: David Gibson Message-ID: <20160404000953.GA16485@voom.fritz.box> References: <1459413561-30745-1-git-send-email-bharata@linux.vnet.ibm.com> <1459413561-30745-6-git-send-email-bharata@linux.vnet.ibm.com> <20160401033054.GM416@voom.redhat.com> <56FE4FA4.8090702@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="7JfCtLOvnd9MIVvH" Content-Disposition: inline In-Reply-To: <56FE4FA4.8090702@redhat.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: Paolo Bonzini Cc: mjrosato@linux.vnet.ibm.com, agraf@suse.de, thuth@redhat.com, pkrempa@redhat.com, ehabkost@redhat.com, aik@ozlabs.ru, armbru@redhat.com, qemu-devel@nongnu.org, borntraeger@de.ibm.com, qemu-ppc@nongnu.org, Bharata B Rao , imammedo@redhat.com, afaerber@suse.de, mdroth@linux.vnet.ibm.com --7JfCtLOvnd9MIVvH Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Apr 01, 2016 at 12:38:28PM +0200, Paolo Bonzini wrote: >=20 >=20 > On 01/04/2016 05:30, David Gibson wrote: > > On Thu, Mar 31, 2016 at 02:09:14PM +0530, Bharata B Rao wrote: > >> From: Igor Mammedov > >> > >> pre_plug callback is to be called before device.realize() is executed. > >> This would allow to check/set device's properties from HotplugHandler. > >> > >> Signed-off-by: Igor Mammedov > >> Signed-off-by: Bharata B Rao > >=20 > > Reviewed-by: David Gibson > >=20 > > It would be really nice to get some opinion on this from Andreas or > > Paolo. >=20 > Certainly okay for me, Igor did all of the HotplugHandler design and > work. Ok, good to hear. Thanks. >=20 > Paolo >=20 > >> --- > >> hw/core/hotplug.c | 11 +++++++++++ > >> hw/core/qdev.c | 9 ++++++++- > >> include/hw/hotplug.h | 14 +++++++++++++- > >> 3 files changed, 32 insertions(+), 2 deletions(-) > >> > >> 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_handl= er); > >> + > >> + 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, bo= ol 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, boo= l value, 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_hand= ler, > >> * hardware (un)plug functions. > >> * > >> * @parent: Opaque parent interface. > >> - * @plug: plug callback. > >> + * @pre_plug: pre plug callback called at start of device.realize(tru= e) > >> + * @plug: plug callback called at end of device.realize(true). > >> * @unplug_request: unplug request callback. > >> * Used as a means to initiate device unplug for dev= ices 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_hand= ler, > >> 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_handle= r. > >=20 >=20 --=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 --7JfCtLOvnd9MIVvH Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJXAbDRAAoJEGw4ysog2bOSf6sP/jyJkTgQyFxfsvUo8t0AtpjW qGs7/NImc023/ACk6fQfi+1EvmIxqIA+/WNofAqN0Eqf6RXziBa6n1UAWu7DlMx3 FMqXQrDrfpWQNe2rkuuh5G8Ec9wzHcEvtO0aC9IxXlJM3uhSR0DNie8zXb96TJlM M3cshG/09jz71b7DohjpqAhEpVKCcnAFRecTVmAitbFCr3x4pQJxqG4SftX9qjva ApuGqRgdM1oF7wi4KvFj9qWrLcAXCWhVV+Ow48Hbt3kq0bXcRI+JyGheuhqWZhai Xo8hp9iTaEt4Tqv34LG3Q5hi5XGzPuom312CxpNvMwsClLGO6cLkihmigkbGEWDF trFqHmN2J1x9nO2pihcjM5LCgyPUSLpNbaT0X2ofqUXL9VxXYXWr0rOKfPVvvPN8 FG005kXpX66LhwxuzVHx2MHdWgdraffkcy/MTsD5y0jSYMzkFKo0z6M0avSJAWb8 Pe0oZQt2+uvRyZGA+2uMuu/uoKOSrfjRmDvw/mCIDLlMerXbqGGT+uVzHNrz3EuF J6Jpj68yDmh/eI49volt5si93wkBISI0ix/WS9N2P2yJzc2kYYg+eAZ6M03EKr9O EigD9Bzlt36pqJ8qzPK65uWbdxYhEBNaVaOVqPAsa/xQoA2gy1zJbLZfcx2y7gJ3 vZ24qN/W0GCJE5kNh1i1 =gXDq -----END PGP SIGNATURE----- --7JfCtLOvnd9MIVvH--