[Qemu-devel] [PATCH v2 0/5] Common unplug and unplug request cb for memory and CPU hot-unplug

[Qemu-devel] [PATCH v2 0/5] Common unplug and unplug request cb for memory and CPU hot-unplug

[Zhu Guihua]

Memory and CPU hot unplug are both asynchronous procedures.
When the unplug operation happens, unplug request cb is called first.
And when guest OS finished handling unplug, unplug cb will be called
to do the real removal of device.

They both need pc-machine, piix4 and ich9 unplug and unplug request cb.
So this patchset introduces these commom functions as part1, and memory
and CPU hot-unplug will come soon as part 2 and 3.

This patch-set is based on QEmu 2.2

v2:
- Commit messages changes

Tang Chen (5):
  acpi, pc: Add hotunplug request cb for pc machine.
  acpi, ich9: Add hotunplug request cb for ich9.
  acpi, pc: Add unplug cb for pc machine.
  acpi, ich9: Add unplug cb for ich9.
  acpi, piix4: Add unplug cb for piix4.

 hw/acpi/ich9.c         | 14 ++++++++++++++
 hw/acpi/piix4.c        |  8 ++++++++
 hw/i386/pc.c           | 16 ++++++++++++++++
 hw/isa/lpc_ich9.c      | 14 ++++++++++++--
 include/hw/acpi/ich9.h |  4 ++++
 5 files changed, 54 insertions(+), 2 deletions(-)

-- 
1.9.3

[Qemu-devel] [PATCH v2 1/5] acpi, pc: Add hotunplug request cb for pc machine.

[Zhu Guihua]

From: Tang Chen <tangchen@cn.fujitsu.com>

Memory and CPU hot unplug are both asynchronous procedures.
They both need unplug request callback to initiate unplug operation.

Add unplug handler to pc machine that will be used by following
CPU and memory unplug patches.

Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
---
 hw/i386/pc.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index c7af6aa..15ee10a 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1680,6 +1680,13 @@ static void pc_machine_device_plug_cb(HotplugHandler *hotplug_dev,
     }
 }
 
+static void pc_machine_device_unplug_request_cb(HotplugHandler *hotplug_dev,
+                                                DeviceState *dev, Error **errp)
+{
+    error_setg(errp, "acpi: device unplug request for not supported device"
+               " type: %s", object_get_typename(OBJECT(dev)));
+}
+
 static HotplugHandler *pc_get_hotpug_handler(MachineState *machine,
                                              DeviceState *dev)
 {
@@ -1809,6 +1816,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
     pcmc->get_hotplug_handler = mc->get_hotplug_handler;
     mc->get_hotplug_handler = pc_get_hotpug_handler;
     hc->plug = pc_machine_device_plug_cb;
+    hc->unplug_request = pc_machine_device_unplug_request_cb;
 }
 
 static const TypeInfo pc_machine_info = {
-- 
1.9.3

Re: [Qemu-devel] [PATCH v2 1/5] acpi, pc: Add hotunplug request cb for pc machine.

[Michael S. Tsirkin]

On Wed, Jan 28, 2015 at 03:45:37PM +0800, Zhu Guihua wrote:
> From: Tang Chen <tangchen@cn.fujitsu.com>
> 
> Memory and CPU hot unplug are both asynchronous procedures.
> They both need unplug request callback to initiate unplug operation.
> 
> Add unplug handler to pc machine that will be used by following
> CPU and memory unplug patches.
> 
> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
> Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
> ---
>  hw/i386/pc.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index c7af6aa..15ee10a 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -1680,6 +1680,13 @@ static void pc_machine_device_plug_cb(HotplugHandler *hotplug_dev,
>      }
>  }
>  
> +static void pc_machine_device_unplug_request_cb(HotplugHandler *hotplug_dev,
> +                                                DeviceState *dev, Error **errp)
> +{
> +    error_setg(errp, "acpi: device unplug request for not supported device"
> +               " type: %s", object_get_typename(OBJECT(dev)));
> +}
> +
>  static HotplugHandler *pc_get_hotpug_handler(MachineState *machine,
>                                               DeviceState *dev)
>  {


So this is just a stub, your follow-up patches replace it with
something more useful?

Why do we need the stub stage though?
Why not just add whatever's going to be there eventually?


> @@ -1809,6 +1816,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
>      pcmc->get_hotplug_handler = mc->get_hotplug_handler;
>      mc->get_hotplug_handler = pc_get_hotpug_handler;
>      hc->plug = pc_machine_device_plug_cb;
> +    hc->unplug_request = pc_machine_device_unplug_request_cb;
>  }
>  
>  static const TypeInfo pc_machine_info = {
> -- 
> 1.9.3

Re: [Qemu-devel] [PATCH v2 1/5] acpi, pc: Add hotunplug request cb for pc machine.

[Zhu Guihua]

On Wed, 2015-01-28 at 10:02 +0200, Michael S. Tsirkin wrote:
> On Wed, Jan 28, 2015 at 03:45:37PM +0800, Zhu Guihua wrote:
> > From: Tang Chen <tangchen@cn.fujitsu.com>
> > 
> > Memory and CPU hot unplug are both asynchronous procedures.
> > They both need unplug request callback to initiate unplug operation.
> > 
> > Add unplug handler to pc machine that will be used by following
> > CPU and memory unplug patches.
> > 
> > Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> > Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
> > Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
> > ---
> >  hw/i386/pc.c | 8 ++++++++
> >  1 file changed, 8 insertions(+)
> > 
> > diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> > index c7af6aa..15ee10a 100644
> > --- a/hw/i386/pc.c
> > +++ b/hw/i386/pc.c
> > @@ -1680,6 +1680,13 @@ static void pc_machine_device_plug_cb(HotplugHandler *hotplug_dev,
> >      }
> >  }
> >  
> > +static void pc_machine_device_unplug_request_cb(HotplugHandler *hotplug_dev,
> > +                                                DeviceState *dev, Error **errp)
> > +{
> > +    error_setg(errp, "acpi: device unplug request for not supported device"
> > +               " type: %s", object_get_typename(OBJECT(dev)));
> > +}
> > +
> >  static HotplugHandler *pc_get_hotpug_handler(MachineState *machine,
> >                                               DeviceState *dev)
> >  {
> 
> 
> So this is just a stub, your follow-up patches replace it with
> something more useful?
> 
> Why do we need the stub stage though?
> Why not just add whatever's going to be there eventually?
> 

This function will be used in memory hot-unplug
[RESEND PATCH v1 07/13] pc-dimm: Add memory hot unplug request support
for pc-dimm.
https://lists.nongnu.org/archive/html/qemu-devel/2015-01/msg00592.html

and cpu hot-unplug
[PATCH v2 05/11] pc: add cpu hot unplug request callback support
https://lists.nongnu.org/archive/html/qemu-devel/2015-01/msg01562.html

Regards,
Zhu

> 
> > @@ -1809,6 +1816,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
> >      pcmc->get_hotplug_handler = mc->get_hotplug_handler;
> >      mc->get_hotplug_handler = pc_get_hotpug_handler;
> >      hc->plug = pc_machine_device_plug_cb;
> > +    hc->unplug_request = pc_machine_device_unplug_request_cb;
> >  }
> >  
> >  static const TypeInfo pc_machine_info = {
> > -- 
> > 1.9.3

Re: [Qemu-devel] [PATCH v2 1/5] acpi, pc: Add hotunplug request cb for pc machine.

[Michael S. Tsirkin]

On Wed, Jan 28, 2015 at 04:33:02PM +0800, Zhu Guihua wrote:
> On Wed, 2015-01-28 at 10:02 +0200, Michael S. Tsirkin wrote:
> > On Wed, Jan 28, 2015 at 03:45:37PM +0800, Zhu Guihua wrote:
> > > From: Tang Chen <tangchen@cn.fujitsu.com>
> > > 
> > > Memory and CPU hot unplug are both asynchronous procedures.
> > > They both need unplug request callback to initiate unplug operation.
> > > 
> > > Add unplug handler to pc machine that will be used by following
> > > CPU and memory unplug patches.
> > > 
> > > Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> > > Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
> > > Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
> > > ---
> > >  hw/i386/pc.c | 8 ++++++++
> > >  1 file changed, 8 insertions(+)
> > > 
> > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> > > index c7af6aa..15ee10a 100644
> > > --- a/hw/i386/pc.c
> > > +++ b/hw/i386/pc.c
> > > @@ -1680,6 +1680,13 @@ static void pc_machine_device_plug_cb(HotplugHandler *hotplug_dev,
> > >      }
> > >  }
> > >  
> > > +static void pc_machine_device_unplug_request_cb(HotplugHandler *hotplug_dev,
> > > +                                                DeviceState *dev, Error **errp)
> > > +{
> > > +    error_setg(errp, "acpi: device unplug request for not supported device"
> > > +               " type: %s", object_get_typename(OBJECT(dev)));
> > > +}
> > > +
> > >  static HotplugHandler *pc_get_hotpug_handler(MachineState *machine,
> > >                                               DeviceState *dev)
> > >  {
> > 
> > 
> > So this is just a stub, your follow-up patches replace it with
> > something more useful?
> > 
> > Why do we need the stub stage though?
> > Why not just add whatever's going to be there eventually?
> > 
> 
> This function will be used in memory hot-unplug
> [RESEND PATCH v1 07/13] pc-dimm: Add memory hot unplug request support
> for pc-dimm.
> https://lists.nongnu.org/archive/html/qemu-devel/2015-01/msg00592.html
> 
> and cpu hot-unplug
> [PATCH v2 05/11] pc: add cpu hot unplug request callback support
> https://lists.nongnu.org/archive/html/qemu-devel/2015-01/msg01562.html
> 
> Regards,
> Zhu

OK, so the point is to make it easier to resolve conflicts between the two series?

> > 
> > > @@ -1809,6 +1816,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
> > >      pcmc->get_hotplug_handler = mc->get_hotplug_handler;
> > >      mc->get_hotplug_handler = pc_get_hotpug_handler;
> > >      hc->plug = pc_machine_device_plug_cb;
> > > +    hc->unplug_request = pc_machine_device_unplug_request_cb;
> > >  }
> > >  
> > >  static const TypeInfo pc_machine_info = {
> > > -- 
> > > 1.9.3
> 

Re: [Qemu-devel] [PATCH v2 1/5] acpi, pc: Add hotunplug request cb for pc machine.

[Zhu Guihua]

On Wed, 2015-01-28 at 10:39 +0200, Michael S. Tsirkin wrote:
> On Wed, Jan 28, 2015 at 04:33:02PM +0800, Zhu Guihua wrote:
> > On Wed, 2015-01-28 at 10:02 +0200, Michael S. Tsirkin wrote:
> > > On Wed, Jan 28, 2015 at 03:45:37PM +0800, Zhu Guihua wrote:
> > > > From: Tang Chen <tangchen@cn.fujitsu.com>
> > > > 
> > > > Memory and CPU hot unplug are both asynchronous procedures.
> > > > They both need unplug request callback to initiate unplug operation.
> > > > 
> > > > Add unplug handler to pc machine that will be used by following
> > > > CPU and memory unplug patches.
> > > > 
> > > > Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> > > > Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
> > > > Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
> > > > ---
> > > >  hw/i386/pc.c | 8 ++++++++
> > > >  1 file changed, 8 insertions(+)
> > > > 
> > > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> > > > index c7af6aa..15ee10a 100644
> > > > --- a/hw/i386/pc.c
> > > > +++ b/hw/i386/pc.c
> > > > @@ -1680,6 +1680,13 @@ static void pc_machine_device_plug_cb(HotplugHandler *hotplug_dev,
> > > >      }
> > > >  }
> > > >  
> > > > +static void pc_machine_device_unplug_request_cb(HotplugHandler *hotplug_dev,
> > > > +                                                DeviceState *dev, Error **errp)
> > > > +{
> > > > +    error_setg(errp, "acpi: device unplug request for not supported device"
> > > > +               " type: %s", object_get_typename(OBJECT(dev)));
> > > > +}
> > > > +
> > > >  static HotplugHandler *pc_get_hotpug_handler(MachineState *machine,
> > > >                                               DeviceState *dev)
> > > >  {
> > > 
> > > 
> > > So this is just a stub, your follow-up patches replace it with
> > > something more useful?
> > > 
> > > Why do we need the stub stage though?
> > > Why not just add whatever's going to be there eventually?
> > > 
> > 
> > This function will be used in memory hot-unplug
> > [RESEND PATCH v1 07/13] pc-dimm: Add memory hot unplug request support
> > for pc-dimm.
> > https://lists.nongnu.org/archive/html/qemu-devel/2015-01/msg00592.html
> > 
> > and cpu hot-unplug
> > [PATCH v2 05/11] pc: add cpu hot unplug request callback support
> > https://lists.nongnu.org/archive/html/qemu-devel/2015-01/msg01562.html
> > 
> > Regards,
> > Zhu
> 
> OK, so the point is to make it easier to resolve conflicts between the two series?
> 

Yes, it is.

Regards,
Zhu

> > > 
> > > > @@ -1809,6 +1816,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
> > > >      pcmc->get_hotplug_handler = mc->get_hotplug_handler;
> > > >      mc->get_hotplug_handler = pc_get_hotpug_handler;
> > > >      hc->plug = pc_machine_device_plug_cb;
> > > > +    hc->unplug_request = pc_machine_device_unplug_request_cb;
> > > >  }
> > > >  
> > > >  static const TypeInfo pc_machine_info = {
> > > > -- 
> > > > 1.9.3
> > 

[Qemu-devel] [PATCH v2 2/5] acpi, ich9: Add hotunplug request cb for ich9.

[Zhu Guihua]

From: Tang Chen <tangchen@cn.fujitsu.com>

Memory and CPU hot unplug are both asynchronous procedures.
They both need unplug request cb when the unplug operation happens.

This patch adds hotunplug request cb for ich9, and memory and CPU
hot unplug will share it.

Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
---
 hw/acpi/ich9.c         | 7 +++++++
 hw/isa/lpc_ich9.c      | 5 +++--
 include/hw/acpi/ich9.h | 2 ++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index 884dab3..5fe1eb8 100644
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -397,6 +397,13 @@ void ich9_pm_device_plug_cb(ICH9LPCPMRegs *pm, DeviceState *dev, Error **errp)
     }
 }
 
+void ich9_pm_device_unplug_request_cb(ICH9LPCPMRegs *pm, DeviceState *dev,
+                                      Error **errp)
+{
+    error_setg(errp, "acpi: device unplug request for not supported device"
+               " type: %s", object_get_typename(OBJECT(dev)));
+}
+
 void ich9_pm_ospm_status(AcpiDeviceIf *adev, ACPIOSTInfoList ***list)
 {
     ICH9LPCState *s = ICH9_LPC_DEVICE(adev);
diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
index 530b074..d00b223 100644
--- a/hw/isa/lpc_ich9.c
+++ b/hw/isa/lpc_ich9.c
@@ -610,8 +610,9 @@ static void ich9_device_plug_cb(HotplugHandler *hotplug_dev,
 static void ich9_device_unplug_request_cb(HotplugHandler *hotplug_dev,
                                           DeviceState *dev, Error **errp)
 {
-    error_setg(errp, "acpi: device unplug request for not supported device"
-               " type: %s", object_get_typename(OBJECT(dev)));
+    ICH9LPCState *lpc = ICH9_LPC_DEVICE(hotplug_dev);
+
+    ich9_pm_device_unplug_request_cb(&lpc->pm, dev, errp);
 }
 
 static bool ich9_rst_cnt_needed(void *opaque)
diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h
index 12d7a7a..eaef0c3 100644
--- a/include/hw/acpi/ich9.h
+++ b/include/hw/acpi/ich9.h
@@ -63,6 +63,8 @@ extern const VMStateDescription vmstate_ich9_pm;
 void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp);
 
 void ich9_pm_device_plug_cb(ICH9LPCPMRegs *pm, DeviceState *dev, Error **errp);
+void ich9_pm_device_unplug_request_cb(ICH9LPCPMRegs *pm, DeviceState *dev,
+                                      Error **errp);
 
 void ich9_pm_ospm_status(AcpiDeviceIf *adev, ACPIOSTInfoList ***list);
 #endif /* HW_ACPI_ICH9_H */
-- 
1.9.3

Re: [Qemu-devel] [PATCH v2 2/5] acpi, ich9: Add hotunplug request cb for ich9.

[Michael S. Tsirkin]

On Wed, Jan 28, 2015 at 03:45:38PM +0800, Zhu Guihua wrote:
> From: Tang Chen <tangchen@cn.fujitsu.com>
> 
> Memory and CPU hot unplug are both asynchronous procedures.
> They both need unplug request cb when the unplug operation happens.
> 
> This patch adds hotunplug request cb for ich9, and memory and CPU
> hot unplug will share it.
> 
> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
> Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
> ---
>  hw/acpi/ich9.c         | 7 +++++++
>  hw/isa/lpc_ich9.c      | 5 +++--
>  include/hw/acpi/ich9.h | 2 ++
>  3 files changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
> index 884dab3..5fe1eb8 100644
> --- a/hw/acpi/ich9.c
> +++ b/hw/acpi/ich9.c
> @@ -397,6 +397,13 @@ void ich9_pm_device_plug_cb(ICH9LPCPMRegs *pm, DeviceState *dev, Error **errp)
>      }
>  }
>  
> +void ich9_pm_device_unplug_request_cb(ICH9LPCPMRegs *pm, DeviceState *dev,
> +                                      Error **errp)
> +{
> +    error_setg(errp, "acpi: device unplug request for not supported device"

s/not supported/unsupported/

don't respin just for this.

> +               " type: %s", object_get_typename(OBJECT(dev)));
> +}
> +
>  void ich9_pm_ospm_status(AcpiDeviceIf *adev, ACPIOSTInfoList ***list)
>  {
>      ICH9LPCState *s = ICH9_LPC_DEVICE(adev);
> diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
> index 530b074..d00b223 100644
> --- a/hw/isa/lpc_ich9.c
> +++ b/hw/isa/lpc_ich9.c
> @@ -610,8 +610,9 @@ static void ich9_device_plug_cb(HotplugHandler *hotplug_dev,
>  static void ich9_device_unplug_request_cb(HotplugHandler *hotplug_dev,
>                                            DeviceState *dev, Error **errp)
>  {
> -    error_setg(errp, "acpi: device unplug request for not supported device"
> -               " type: %s", object_get_typename(OBJECT(dev)));
> +    ICH9LPCState *lpc = ICH9_LPC_DEVICE(hotplug_dev);
> +
> +    ich9_pm_device_unplug_request_cb(&lpc->pm, dev, errp);
>  }
>  
>  static bool ich9_rst_cnt_needed(void *opaque)
> diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h
> index 12d7a7a..eaef0c3 100644
> --- a/include/hw/acpi/ich9.h
> +++ b/include/hw/acpi/ich9.h
> @@ -63,6 +63,8 @@ extern const VMStateDescription vmstate_ich9_pm;
>  void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp);
>  
>  void ich9_pm_device_plug_cb(ICH9LPCPMRegs *pm, DeviceState *dev, Error **errp);
> +void ich9_pm_device_unplug_request_cb(ICH9LPCPMRegs *pm, DeviceState *dev,
> +                                      Error **errp);
>  
>  void ich9_pm_ospm_status(AcpiDeviceIf *adev, ACPIOSTInfoList ***list);
>  #endif /* HW_ACPI_ICH9_H */
> -- 
> 1.9.3

[Qemu-devel] [PATCH v2 3/5] acpi, pc: Add unplug cb for pc machine.

[Zhu Guihua]

From: Tang Chen <tangchen@cn.fujitsu.com>

Memory and CPU hot unplug are both asynchronous procedures.
When the unplug operation happens, unplug request cb is called first.
And when guest OS finished handling unplug, unplug cb will be called
to do the real removal of device.

This patch adds hotunplug cb to pc machine, which memory and CPU
hot unplug will use it.

Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
---
 hw/i386/pc.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 15ee10a..850b6b5 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1687,6 +1687,13 @@ static void pc_machine_device_unplug_request_cb(HotplugHandler *hotplug_dev,
                " type: %s", object_get_typename(OBJECT(dev)));
 }
 
+static void pc_machine_device_unplug_cb(HotplugHandler *hotplug_dev,
+                                        DeviceState *dev, Error **errp)
+{
+    error_setg(errp, "acpi: device unplug for not supported device"
+               " type: %s", object_get_typename(OBJECT(dev)));
+}
+
 static HotplugHandler *pc_get_hotpug_handler(MachineState *machine,
                                              DeviceState *dev)
 {
@@ -1817,6 +1824,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
     mc->get_hotplug_handler = pc_get_hotpug_handler;
     hc->plug = pc_machine_device_plug_cb;
     hc->unplug_request = pc_machine_device_unplug_request_cb;
+    hc->unplug = pc_machine_device_unplug_cb;
 }
 
 static const TypeInfo pc_machine_info = {
-- 
1.9.3

[Qemu-devel] [PATCH v2 4/5] acpi, ich9: Add unplug cb for ich9.

[Zhu Guihua]

From: Tang Chen <tangchen@cn.fujitsu.com>

Memory and CPU hot unplug are both asynchronous procedures.
When the unplug operation happens, unplug request cb is called first.
And when guest OS finished handling unplug, unplug cb will be called
to do the real removal of device.

This patch adds hotunplug cb to ich9, which memory and CPU
hot unplug will use it.

Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
---
 hw/acpi/ich9.c         | 7 +++++++
 hw/isa/lpc_ich9.c      | 9 +++++++++
 include/hw/acpi/ich9.h | 2 ++
 3 files changed, 18 insertions(+)

diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index 5fe1eb8..5352e19 100644
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -404,6 +404,13 @@ void ich9_pm_device_unplug_request_cb(ICH9LPCPMRegs *pm, DeviceState *dev,
                " type: %s", object_get_typename(OBJECT(dev)));
 }
 
+void ich9_pm_device_unplug_cb(ICH9LPCPMRegs *pm, DeviceState *dev,
+                              Error **errp)
+{
+    error_setg(errp, "acpi: device unplug for not supported device"
+               " type: %s", object_get_typename(OBJECT(dev)));
+}
+
 void ich9_pm_ospm_status(AcpiDeviceIf *adev, ACPIOSTInfoList ***list)
 {
     ICH9LPCState *s = ICH9_LPC_DEVICE(adev);
diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
index d00b223..16f5a0d 100644
--- a/hw/isa/lpc_ich9.c
+++ b/hw/isa/lpc_ich9.c
@@ -615,6 +615,14 @@ static void ich9_device_unplug_request_cb(HotplugHandler *hotplug_dev,
     ich9_pm_device_unplug_request_cb(&lpc->pm, dev, errp);
 }
 
+static void ich9_device_unplug_cb(HotplugHandler *hotplug_dev,
+                                  DeviceState *dev, Error **errp)
+{
+    ICH9LPCState *lpc = ICH9_LPC_DEVICE(hotplug_dev);
+
+    ich9_pm_device_unplug_cb(&lpc->pm, dev, errp);
+}
+
 static bool ich9_rst_cnt_needed(void *opaque)
 {
     ICH9LPCState *lpc = opaque;
@@ -678,6 +686,7 @@ static void ich9_lpc_class_init(ObjectClass *klass, void *data)
     dc->cannot_instantiate_with_device_add_yet = true;
     hc->plug = ich9_device_plug_cb;
     hc->unplug_request = ich9_device_unplug_request_cb;
+    hc->unplug = ich9_device_unplug_cb;
     adevc->ospm_status = ich9_pm_ospm_status;
 }
 
diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h
index eaef0c3..c2d3dba 100644
--- a/include/hw/acpi/ich9.h
+++ b/include/hw/acpi/ich9.h
@@ -65,6 +65,8 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp);
 void ich9_pm_device_plug_cb(ICH9LPCPMRegs *pm, DeviceState *dev, Error **errp);
 void ich9_pm_device_unplug_request_cb(ICH9LPCPMRegs *pm, DeviceState *dev,
                                       Error **errp);
+void ich9_pm_device_unplug_cb(ICH9LPCPMRegs *pm, DeviceState *dev,
+                              Error **errp);
 
 void ich9_pm_ospm_status(AcpiDeviceIf *adev, ACPIOSTInfoList ***list);
 #endif /* HW_ACPI_ICH9_H */
-- 
1.9.3

[Qemu-devel] [PATCH v2 5/5] acpi, piix4: Add unplug cb for piix4.

[Zhu Guihua]

From: Tang Chen <tangchen@cn.fujitsu.com>

Memory and CPU hot unplug are both asynchronous procedures.
When the unplug operation happens, unplug request cb is called first.
And when guest OS finished handling unplug, unplug cb will be called
to do the real removal of device.

This patch adds hotunplug cb to piix4, which memory and CPU
hot unplug will use it.

Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
---
 hw/acpi/piix4.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index 184e7e4..14d40a0 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -370,6 +370,13 @@ static void piix4_device_unplug_request_cb(HotplugHandler *hotplug_dev,
     }
 }
 
+static void piix4_device_unplug_cb(HotplugHandler *hotplug_dev,
+                                   DeviceState *dev, Error **errp)
+{
+    error_setg(errp, "acpi: device unplug for not supported device"
+               " type: %s", object_get_typename(OBJECT(dev)));
+}
+
 static void piix4_update_bus_hotplug(PCIBus *pci_bus, void *opaque)
 {
     PIIX4PMState *s = opaque;
@@ -610,6 +617,7 @@ static void piix4_pm_class_init(ObjectClass *klass, void *data)
     dc->hotpluggable = false;
     hc->plug = piix4_device_plug_cb;
     hc->unplug_request = piix4_device_unplug_request_cb;
+    hc->unplug = piix4_device_unplug_cb;
     adevc->ospm_status = piix4_ospm_status;
 }
 
-- 
1.9.3

Re: [Qemu-devel] [PATCH v2 0/5] Common unplug and unplug request cb for memory and CPU hot-unplug

[Michael S. Tsirkin]

On Wed, Jan 28, 2015 at 03:45:36PM +0800, Zhu Guihua wrote:
> Memory and CPU hot unplug are both asynchronous procedures.
> When the unplug operation happens, unplug request cb is called first.
> And when guest OS finished handling unplug, unplug cb will be called
> to do the real removal of device.
> 
> They both need pc-machine, piix4 and ich9 unplug and unplug request cb.
> So this patchset introduces these commom functions as part1, and memory
> and CPU hot-unplug will come soon as part 2 and 3.
> 
> This patch-set is based on QEmu 2.2

Really? Why not on master?

> v2:
> - Commit messages changes
> 
> Tang Chen (5):
>   acpi, pc: Add hotunplug request cb for pc machine.
>   acpi, ich9: Add hotunplug request cb for ich9.
>   acpi, pc: Add unplug cb for pc machine.
>   acpi, ich9: Add unplug cb for ich9.
>   acpi, piix4: Add unplug cb for piix4.
> 
>  hw/acpi/ich9.c         | 14 ++++++++++++++
>  hw/acpi/piix4.c        |  8 ++++++++
>  hw/i386/pc.c           | 16 ++++++++++++++++
>  hw/isa/lpc_ich9.c      | 14 ++++++++++++--
>  include/hw/acpi/ich9.h |  4 ++++
>  5 files changed, 54 insertions(+), 2 deletions(-)
> 
> -- 
> 1.9.3

Re: [Qemu-devel] [PATCH v2 0/5] Common unplug and unplug request cb for memory and CPU hot-unplug

[Zhu Guihua]

On Wed, 2015-01-28 at 10:00 +0200, Michael S. Tsirkin wrote:
> On Wed, Jan 28, 2015 at 03:45:36PM +0800, Zhu Guihua wrote:
> > Memory and CPU hot unplug are both asynchronous procedures.
> > When the unplug operation happens, unplug request cb is called first.
> > And when guest OS finished handling unplug, unplug cb will be called
> > to do the real removal of device.
> > 
> > They both need pc-machine, piix4 and ich9 unplug and unplug request cb.
> > So this patchset introduces these commom functions as part1, and memory
> > and CPU hot-unplug will come soon as part 2 and 3.
> > 
> > This patch-set is based on QEmu 2.2
> 
> Really? Why not on master?

Oh, it was just written wrong.
Indeed, it is based on master.

Regards,
Zhu

> 
> > v2:
> > - Commit messages changes
> > 
> > Tang Chen (5):
> >   acpi, pc: Add hotunplug request cb for pc machine.
> >   acpi, ich9: Add hotunplug request cb for ich9.
> >   acpi, pc: Add unplug cb for pc machine.
> >   acpi, ich9: Add unplug cb for ich9.
> >   acpi, piix4: Add unplug cb for piix4.
> > 
> >  hw/acpi/ich9.c         | 14 ++++++++++++++
> >  hw/acpi/piix4.c        |  8 ++++++++
> >  hw/i386/pc.c           | 16 ++++++++++++++++
> >  hw/isa/lpc_ich9.c      | 14 ++++++++++++--
> >  include/hw/acpi/ich9.h |  4 ++++
> >  5 files changed, 54 insertions(+), 2 deletions(-)
> > 
> > -- 
> > 1.9.3

Re: [Qemu-devel] [PATCH v2 0/5] Common unplug and unplug request cb for memory and CPU hot-unplug

[Zhu Guihua]

Any comments about this series?
If no, could anyone help to merge this?
Thanks.

Regards,
Zhu

On Wed, 2015-01-28 at 15:45 +0800, Zhu Guihua wrote:
> Memory and CPU hot unplug are both asynchronous procedures.
> When the unplug operation happens, unplug request cb is called first.
> And when guest OS finished handling unplug, unplug cb will be called
> to do the real removal of device.
> 
> They both need pc-machine, piix4 and ich9 unplug and unplug request cb.
> So this patchset introduces these commom functions as part1, and memory
> and CPU hot-unplug will come soon as part 2 and 3.
> 
> This patch-set is based on QEmu 2.2
> 
> v2:
> - Commit messages changes
> 
> Tang Chen (5):
>   acpi, pc: Add hotunplug request cb for pc machine.
>   acpi, ich9: Add hotunplug request cb for ich9.
>   acpi, pc: Add unplug cb for pc machine.
>   acpi, ich9: Add unplug cb for ich9.
>   acpi, piix4: Add unplug cb for piix4.
> 
>  hw/acpi/ich9.c         | 14 ++++++++++++++
>  hw/acpi/piix4.c        |  8 ++++++++
>  hw/i386/pc.c           | 16 ++++++++++++++++
>  hw/isa/lpc_ich9.c      | 14 ++++++++++++--
>  include/hw/acpi/ich9.h |  4 ++++
>  5 files changed, 54 insertions(+), 2 deletions(-)
> 

Re: [Qemu-devel] [PATCH v2 0/5] Common unplug and unplug request cb for memory and CPU hot-unplug

[Zhi Yong Wu]

HI,

If you can push the patchset to a branch on github, it will be
convenient for other guys to do some tests.

On Wed, Jan 28, 2015 at 3:45 PM, Zhu Guihua <zhugh.fnst@cn.fujitsu.com> wrote:
> Memory and CPU hot unplug are both asynchronous procedures.
> When the unplug operation happens, unplug request cb is called first.
> And when guest OS finished handling unplug, unplug cb will be called
> to do the real removal of device.
>
> They both need pc-machine, piix4 and ich9 unplug and unplug request cb.
> So this patchset introduces these commom functions as part1, and memory
> and CPU hot-unplug will come soon as part 2 and 3.
>
> This patch-set is based on QEmu 2.2
>
> v2:
> - Commit messages changes
>
> Tang Chen (5):
>   acpi, pc: Add hotunplug request cb for pc machine.
>   acpi, ich9: Add hotunplug request cb for ich9.
>   acpi, pc: Add unplug cb for pc machine.
>   acpi, ich9: Add unplug cb for ich9.
>   acpi, piix4: Add unplug cb for piix4.
>
>  hw/acpi/ich9.c         | 14 ++++++++++++++
>  hw/acpi/piix4.c        |  8 ++++++++
>  hw/i386/pc.c           | 16 ++++++++++++++++
>  hw/isa/lpc_ich9.c      | 14 ++++++++++++--
>  include/hw/acpi/ich9.h |  4 ++++
>  5 files changed, 54 insertions(+), 2 deletions(-)
>
> --
> 1.9.3
>
>



-- 
Regards,

Zhi Yong Wu