spapr: add support for PHB hotplug

[Qemu-devel] [for-2.11 PATCH 05/26] spapr_iommu: convert TCE table object to realize()

Posted by Greg Kurz 8 years, 3 months ago

Signed-off-by: Greg Kurz <groug@kaod.org>
---
 hw/ppc/spapr_iommu.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c
index 740d42608b61..d4eca2a77225 100644
--- a/hw/ppc/spapr_iommu.c
+++ b/hw/ppc/spapr_iommu.c
@@ -248,7 +248,7 @@ static const VMStateDescription vmstate_spapr_tce_table = {
     }
 };
 
-static int spapr_tce_table_realize(DeviceState *dev)
+static void spapr_tce_table_realize(DeviceState *dev, Error **errp)
 {
     sPAPRTCETable *tcet = SPAPR_TCE_TABLE(dev);
     Object *tcetobj = OBJECT(tcet);
@@ -270,8 +270,6 @@ static int spapr_tce_table_realize(DeviceState *dev)
 
     vmstate_register(DEVICE(tcet), tcet->liobn, &vmstate_spapr_tce_table,
                      tcet);
-
-    return 0;
 }
 
 void spapr_tce_set_need_vfio(sPAPRTCETable *tcet, bool need_vfio)
@@ -618,7 +616,7 @@ int spapr_tcet_dma_dt(void *fdt, int node_off, const char *propname,
 static void spapr_tce_table_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
-    dc->init = spapr_tce_table_realize;
+    dc->realize = spapr_tce_table_realize;
     dc->reset = spapr_tce_reset;
     dc->unrealize = spapr_tce_table_unrealize;

Re: [Qemu-devel] [for-2.11 PATCH 05/26] spapr_iommu: convert TCE table object to realize()

Posted by David Gibson 8 years, 3 months ago

On Tue, Jul 25, 2017 at 07:59:06PM +0200, Greg Kurz wrote:
> Signed-off-by: Greg Kurz <groug@kaod.org>

Oh, wow, that was pretty messed up.

Applied to ppc-for-2.11.

> ---
>  hw/ppc/spapr_iommu.c |    6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c
> index 740d42608b61..d4eca2a77225 100644
> --- a/hw/ppc/spapr_iommu.c
> +++ b/hw/ppc/spapr_iommu.c
> @@ -248,7 +248,7 @@ static const VMStateDescription vmstate_spapr_tce_table = {
>      }
>  };
>  
> -static int spapr_tce_table_realize(DeviceState *dev)
> +static void spapr_tce_table_realize(DeviceState *dev, Error **errp)
>  {
>      sPAPRTCETable *tcet = SPAPR_TCE_TABLE(dev);
>      Object *tcetobj = OBJECT(tcet);
> @@ -270,8 +270,6 @@ static int spapr_tce_table_realize(DeviceState *dev)
>  
>      vmstate_register(DEVICE(tcet), tcet->liobn, &vmstate_spapr_tce_table,
>                       tcet);
> -
> -    return 0;
>  }
>  
>  void spapr_tce_set_need_vfio(sPAPRTCETable *tcet, bool need_vfio)
> @@ -618,7 +616,7 @@ int spapr_tcet_dma_dt(void *fdt, int node_off, const char *propname,
>  static void spapr_tce_table_class_init(ObjectClass *klass, void *data)
>  {
>      DeviceClass *dc = DEVICE_CLASS(klass);
> -    dc->init = spapr_tce_table_realize;
> +    dc->realize = spapr_tce_table_realize;
>      dc->reset = spapr_tce_reset;
>      dc->unrealize = spapr_tce_table_unrealize;
>  
> 

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

Re: [Qemu-devel] [Qemu-ppc] [for-2.11 PATCH 05/26] spapr_iommu: convert TCE table object to realize()

Posted by Alexey Kardashevskiy 8 years, 3 months ago

On 26/07/17 03:59, Greg Kurz wrote:
> Signed-off-by: Greg Kurz <groug@kaod.org>

Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>

> ---
>  hw/ppc/spapr_iommu.c |    6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c
> index 740d42608b61..d4eca2a77225 100644
> --- a/hw/ppc/spapr_iommu.c
> +++ b/hw/ppc/spapr_iommu.c
> @@ -248,7 +248,7 @@ static const VMStateDescription vmstate_spapr_tce_table = {
>      }
>  };
>  
> -static int spapr_tce_table_realize(DeviceState *dev)
> +static void spapr_tce_table_realize(DeviceState *dev, Error **errp)
>  {
>      sPAPRTCETable *tcet = SPAPR_TCE_TABLE(dev);
>      Object *tcetobj = OBJECT(tcet);
> @@ -270,8 +270,6 @@ static int spapr_tce_table_realize(DeviceState *dev)
>  
>      vmstate_register(DEVICE(tcet), tcet->liobn, &vmstate_spapr_tce_table,
>                       tcet);
> -
> -    return 0;
>  }
>  
>  void spapr_tce_set_need_vfio(sPAPRTCETable *tcet, bool need_vfio)
> @@ -618,7 +616,7 @@ int spapr_tcet_dma_dt(void *fdt, int node_off, const char *propname,
>  static void spapr_tce_table_class_init(ObjectClass *klass, void *data)
>  {
>      DeviceClass *dc = DEVICE_CLASS(klass);
> -    dc->init = spapr_tce_table_realize;
> +    dc->realize = spapr_tce_table_realize;
>      dc->reset = spapr_tce_reset;
>      dc->unrealize = spapr_tce_table_unrealize;
>  
> 
> 


-- 
Alexey