Re: [Qemu-devel] [for-2.7 PATCH v3 05/15] qdev: hotplug: Introduce HotplugHandler.pre_plug() callback

2016-06-03 Thread Igor Mammedov 
On Fri, 3 Jun 2016 15:10:45 +1000
David Gibson  wrote:

> On Thu, Jun 02, 2016 at 11:32:13AM +0200, Igor Mammedov wrote:
> > On Thu, 2 Jun 2016 11:15:44 +1000
> > David Gibson  wrote:
> >   
> > > On Thu, May 12, 2016 at 09:18:15AM +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 
> > > > Reviewed-by: David Gibson   
> > > 
> > > Igor,  do you think we're ready to merge this?  
> > Yes, I think so.
> >   
> > > 
> > > If so, do you want to take it through your tree, or should I take it
> > > through the ppc tree?  
> > Please take it through your tree, along with the rest patches
> > in this series.  
> 
> Ok, I've made a branch to collate these into, see:
>   https://github.com/dgibson/qemu/tree/ppc-cpu-hotplug
Great, thanks!

Looks ok to me.

> 
> For now just patches 5&6 are there (not ppc specific), but I plan to
> merge in the rest as I review them.
>

Re: [Qemu-devel] [for-2.7 PATCH v3 05/15] qdev: hotplug: Introduce HotplugHandler.pre_plug() callback

2016-06-02 Thread David Gibson 
On Thu, Jun 02, 2016 at 11:32:13AM +0200, Igor Mammedov wrote:
> On Thu, 2 Jun 2016 11:15:44 +1000
> David Gibson  wrote:
> 
> > On Thu, May 12, 2016 at 09:18:15AM +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 
> > > Reviewed-by: David Gibson 
> > 
> > Igor,  do you think we're ready to merge this?
> Yes, I think so.
> 
> > 
> > If so, do you want to take it through your tree, or should I take it
> > through the ppc tree?
> Please take it through your tree, along with the rest patches
> in this series.

Ok, I've made a branch to collate these into, see:
  https://github.com/dgibson/qemu/tree/ppc-cpu-hotplug

For now just patches 5&6 are there (not ppc specific), but I plan to
merge in the rest as I review them.

-- 
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


signature.asc
Description: PGP signature

Re: [Qemu-devel] [for-2.7 PATCH v3 05/15] qdev: hotplug: Introduce HotplugHandler.pre_plug() callback

2016-06-02 Thread Igor Mammedov 
On Thu, 2 Jun 2016 11:15:44 +1000
David Gibson  wrote:

> On Thu, May 12, 2016 at 09:18:15AM +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 
> > Reviewed-by: David Gibson 
> 
> Igor,  do you think we're ready to merge this?
Yes, I think so.

> 
> If so, do you want to take it through your tree, or should I take it
> through the ppc tree?
Please take it through your tree, along with the rest patches
in this series.

> 
> > ---
> >  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"
> >  
> > +void hotplug_handler_pre_plug(HotplugHandler *plug_handler,
> > +  DeviceState *plugged_dev,
> > +  Error **errp)
> > +{
> > +HotplugHandlerClass *hdc =
> > 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);
> >  }
> >  
> > +hotplug_ctrl = qdev_get_hotplug_handler(dev);
> > +if (hotplug_ctrl) {
> > +hotplug_handler_pre_plug(hotplug_ctrl, dev,
> > _err);
> > +if (local_err != NULL) {
> > +goto fail;
> > +}
> > +}
> > +
> >  if (dc->realize) {
> >  dc->realize(dev, _err);
> >  }
> > @@ -1072,7 +1080,6 @@ static void device_set_realized(Object *obj,
> > bool value, Error **errp) 
> >  DEVICE_LISTENER_CALL(realize, Forward, dev);
> >  
> > -hotplug_ctrl = qdev_get_hotplug_handler(dev);
> >  if (hotplug_ctrl) {
> >  hotplug_handler_plug(hotplug_ctrl, dev, _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
> > devices that
> >   *  require asynchronous unplug handling.
> > @@ -58,6 +59,7 @@ typedef struct HotplugHandlerClass {
> >  InterfaceClass parent;
> >  
> >  /*  */
> > +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);
> >  
> >  /**
> > + * 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.
>

Re: [Qemu-devel] [for-2.7 PATCH v3 05/15] qdev: hotplug: Introduce HotplugHandler.pre_plug() callback

2016-06-01 Thread David Gibson 
On Thu, May 12, 2016 at 09:18:15AM +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 
> 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(-)
> 
> 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"
>  
> +void hotplug_handler_pre_plug(HotplugHandler *plug_handler,
> +  DeviceState *plugged_dev,
> +  Error **errp)
> +{
> +HotplugHandlerClass *hdc = 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);
>  }
>  
> +hotplug_ctrl = qdev_get_hotplug_handler(dev);
> +if (hotplug_ctrl) {
> +hotplug_handler_pre_plug(hotplug_ctrl, dev, _err);
> +if (local_err != NULL) {
> +goto fail;
> +}
> +}
> +
>  if (dc->realize) {
>  dc->realize(dev, _err);
>  }
> @@ -1072,7 +1080,6 @@ static void device_set_realized(Object *obj, bool 
> value, Error **errp)
>  
>  DEVICE_LISTENER_CALL(realize, Forward, dev);
>  
> -hotplug_ctrl = qdev_get_hotplug_handler(dev);
>  if (hotplug_ctrl) {
>  hotplug_handler_plug(hotplug_ctrl, dev, _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 devices 
> that
>   *  require asynchronous unplug handling.
> @@ -58,6 +59,7 @@ typedef struct HotplugHandlerClass {
>  InterfaceClass parent;
>  
>  /*  */
> +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);
>  
>  /**
> + * 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.

-- 
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


signature.asc
Description: PGP signature

[Qemu-devel] [for-2.7 PATCH v3 05/15] qdev: hotplug: Introduce HotplugHandler.pre_plug() callback

2016-05-11 Thread Bharata B Rao 
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 
Reviewed-by: David Gibson 
---
 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"
 
+void hotplug_handler_pre_plug(HotplugHandler *plug_handler,
+  DeviceState *plugged_dev,
+  Error **errp)
+{
+HotplugHandlerClass *hdc = 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);
 }
 
+hotplug_ctrl = qdev_get_hotplug_handler(dev);
+if (hotplug_ctrl) {
+hotplug_handler_pre_plug(hotplug_ctrl, dev, _err);
+if (local_err != NULL) {
+goto fail;
+}
+}
+
 if (dc->realize) {
 dc->realize(dev, _err);
 }
@@ -1072,7 +1080,6 @@ static void device_set_realized(Object *obj, bool value, 
Error **errp)
 
 DEVICE_LISTENER_CALL(realize, Forward, dev);
 
-hotplug_ctrl = qdev_get_hotplug_handler(dev);
 if (hotplug_ctrl) {
 hotplug_handler_plug(hotplug_ctrl, dev, _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 devices that
  *  require asynchronous unplug handling.
@@ -58,6 +59,7 @@ typedef struct HotplugHandlerClass {
 InterfaceClass parent;
 
 /*  */
+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);
 
 /**
+ * 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.
-- 
2.1.0