[PATCH 0/4] Consolidate the use of device_class_set_parent_realize()

[PATCH 0/4] Consolidate the use of device_class_set_parent_realize()

[Zhao Liu]

From: Zhao Liu <zhao1.liu@intel.com>

Hi list,

Now we already have the device_class_set_parent_realize() to set
parent realize(), thus clean up the places where that helper was
forgotten.

Regards,
Zhao
---
Zhao Liu (4):
  hw/isa/vt82c686: Consolidate the use of
    device_class_set_parent_realize()
  hw/isa/pc87312: Consolidate the use of
    device_class_set_parent_realize()
  hw/intc/s390_flic: Consolidate the use of
    device_class_set_parent_realize()
  hw/arm/smmuv3: Consolidate the use of
    device_class_set_parent_realize()

 hw/arm/smmuv3.c         | 4 ++--
 hw/intc/s390_flic_kvm.c | 5 +++--
 hw/isa/pc87312.c        | 4 ++--
 hw/isa/vt82c686.c       | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

-- 
2.34.1

[PATCH 1/4] hw/isa/vt82c686: Consolidate the use of device_class_set_parent_realize()

[Zhao Liu]

From: Zhao Liu <zhao1.liu@intel.com>

Use device_class_set_parent_realize() to set parent realize() directly.

Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
 hw/isa/vt82c686.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index d3e0f6d01fb6..a99eae4f6333 100644
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -328,8 +328,8 @@ static void via_superio_class_init(ObjectClass *klass, void *data)
     DeviceClass *dc = DEVICE_CLASS(klass);
     ISASuperIOClass *sc = ISA_SUPERIO_CLASS(klass);
 
-    sc->parent_realize = dc->realize;
-    dc->realize = via_superio_realize;
+    device_class_set_parent_realize(dc, via_superio_realize,
+                                    &sc->parent_realize);
 }
 
 static const TypeInfo via_superio_info = {
-- 
2.34.1

Re: [PATCH 1/4] hw/isa/vt82c686: Consolidate the use of device_class_set_parent_realize()

[Thomas Huth]

On 01/02/2024 09.40, Zhao Liu wrote:
> From: Zhao Liu <zhao1.liu@intel.com>
> 
> Use device_class_set_parent_realize() to set parent realize() directly.
> 
> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> ---
>   hw/isa/vt82c686.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
> index d3e0f6d01fb6..a99eae4f6333 100644
> --- a/hw/isa/vt82c686.c
> +++ b/hw/isa/vt82c686.c
> @@ -328,8 +328,8 @@ static void via_superio_class_init(ObjectClass *klass, void *data)
>       DeviceClass *dc = DEVICE_CLASS(klass);
>       ISASuperIOClass *sc = ISA_SUPERIO_CLASS(klass);
>   
> -    sc->parent_realize = dc->realize;
> -    dc->realize = via_superio_realize;
> +    device_class_set_parent_realize(dc, via_superio_realize,
> +                                    &sc->parent_realize);
>   }
>   
>   static const TypeInfo via_superio_info = {

Reviewed-by: Thomas Huth <thuth@redhat.com>

[PATCH 2/4] hw/isa/pc87312: Consolidate the use of device_class_set_parent_realize()

[Zhao Liu]

From: Zhao Liu <zhao1.liu@intel.com>

Use device_class_set_parent_realize() to set parent realize() directly.

Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
 hw/isa/pc87312.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c
index ee23f3e164df..64dd17b537f2 100644
--- a/hw/isa/pc87312.c
+++ b/hw/isa/pc87312.c
@@ -338,10 +338,10 @@ static void pc87312_class_init(ObjectClass *klass, void *data)
     DeviceClass *dc = DEVICE_CLASS(klass);
     ISASuperIOClass *sc = ISA_SUPERIO_CLASS(klass);
 
-    sc->parent_realize = dc->realize;
-    dc->realize = pc87312_realize;
     dc->reset = pc87312_reset;
     dc->vmsd = &vmstate_pc87312;
+    device_class_set_parent_realize(dc, pc87312_realize,
+                                    &sc->parent_realize);
     device_class_set_props(dc, pc87312_properties);
 
     sc->parallel = (ISASuperIOFuncs){
-- 
2.34.1

Re: [PATCH 2/4] hw/isa/pc87312: Consolidate the use of device_class_set_parent_realize()

[Thomas Huth]

On 01/02/2024 09.40, Zhao Liu wrote:
> From: Zhao Liu <zhao1.liu@intel.com>
> 
> Use device_class_set_parent_realize() to set parent realize() directly.
> 
> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> ---
>   hw/isa/pc87312.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c
> index ee23f3e164df..64dd17b537f2 100644
> --- a/hw/isa/pc87312.c
> +++ b/hw/isa/pc87312.c
> @@ -338,10 +338,10 @@ static void pc87312_class_init(ObjectClass *klass, void *data)
>       DeviceClass *dc = DEVICE_CLASS(klass);
>       ISASuperIOClass *sc = ISA_SUPERIO_CLASS(klass);
>   
> -    sc->parent_realize = dc->realize;
> -    dc->realize = pc87312_realize;
>       dc->reset = pc87312_reset;
>       dc->vmsd = &vmstate_pc87312;
> +    device_class_set_parent_realize(dc, pc87312_realize,
> +                                    &sc->parent_realize);
>       device_class_set_props(dc, pc87312_properties);
>   
>       sc->parallel = (ISASuperIOFuncs){

Reviewed-by: Thomas Huth <thuth@redhat.com>

[PATCH 3/4] hw/intc/s390_flic: Consolidate the use of device_class_set_parent_realize()

[Zhao Liu]

From: Zhao Liu <zhao1.liu@intel.com>

Use device_class_set_parent_realize() to set parent realize() directly.

Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
 hw/intc/s390_flic_kvm.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c
index 4d5cbb2a2fb6..baaa30dcb734 100644
--- a/hw/intc/s390_flic_kvm.c
+++ b/hw/intc/s390_flic_kvm.c
@@ -646,9 +646,10 @@ static void kvm_s390_flic_class_init(ObjectClass *oc, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(oc);
     S390FLICStateClass *fsc = S390_FLIC_COMMON_CLASS(oc);
+    KVMS390FLICStateClass *kfsc = KVM_S390_FLIC_CLASS(oc);
 
-    KVM_S390_FLIC_CLASS(oc)->parent_realize = dc->realize;
-    dc->realize = kvm_s390_flic_realize;
+    device_class_set_parent_realize(dc, kvm_s390_flic_realize,
+                                    &kfsc->parent_realize);
     dc->vmsd = &kvm_s390_flic_vmstate;
     dc->reset = kvm_s390_flic_reset;
     fsc->register_io_adapter = kvm_s390_register_io_adapter;
-- 
2.34.1

Re: [PATCH 3/4] hw/intc/s390_flic: Consolidate the use of device_class_set_parent_realize()

[Thomas Huth]

On 01/02/2024 09.40, Zhao Liu wrote:
> From: Zhao Liu <zhao1.liu@intel.com>
> 
> Use device_class_set_parent_realize() to set parent realize() directly.
> 
> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> ---
>   hw/intc/s390_flic_kvm.c | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c
> index 4d5cbb2a2fb6..baaa30dcb734 100644
> --- a/hw/intc/s390_flic_kvm.c
> +++ b/hw/intc/s390_flic_kvm.c
> @@ -646,9 +646,10 @@ static void kvm_s390_flic_class_init(ObjectClass *oc, void *data)
>   {
>       DeviceClass *dc = DEVICE_CLASS(oc);
>       S390FLICStateClass *fsc = S390_FLIC_COMMON_CLASS(oc);
> +    KVMS390FLICStateClass *kfsc = KVM_S390_FLIC_CLASS(oc);
>   
> -    KVM_S390_FLIC_CLASS(oc)->parent_realize = dc->realize;
> -    dc->realize = kvm_s390_flic_realize;
> +    device_class_set_parent_realize(dc, kvm_s390_flic_realize,
> +                                    &kfsc->parent_realize);
>       dc->vmsd = &kvm_s390_flic_vmstate;
>       dc->reset = kvm_s390_flic_reset;
>       fsc->register_io_adapter = kvm_s390_register_io_adapter;

Reviewed-by: Thomas Huth <thuth@redhat.com>

[PATCH 4/4] hw/arm/smmuv3: Consolidate the use of device_class_set_parent_realize()

[Zhao Liu]

From: Zhao Liu <zhao1.liu@intel.com>

Use device_class_set_parent_realize() to set parent realize() directly.

Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
 hw/arm/smmuv3.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c
index 68eeef3e1d4c..b3d8642a4990 100644
--- a/hw/arm/smmuv3.c
+++ b/hw/arm/smmuv3.c
@@ -1857,8 +1857,8 @@ static void smmuv3_class_init(ObjectClass *klass, void *data)
     dc->vmsd = &vmstate_smmuv3;
     resettable_class_set_parent_phases(rc, NULL, smmu_reset_hold, NULL,
                                        &c->parent_phases);
-    c->parent_realize = dc->realize;
-    dc->realize = smmu_realize;
+    device_class_set_parent_realize(dc, smmu_realize,
+                                    &c->parent_realize);
     device_class_set_props(dc, smmuv3_properties);
 }
 
-- 
2.34.1

Re: [PATCH 4/4] hw/arm/smmuv3: Consolidate the use of device_class_set_parent_realize()

[Thomas Huth]

On 01/02/2024 09.40, Zhao Liu wrote:
> From: Zhao Liu <zhao1.liu@intel.com>
> 
> Use device_class_set_parent_realize() to set parent realize() directly.
> 
> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> ---
>   hw/arm/smmuv3.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c
> index 68eeef3e1d4c..b3d8642a4990 100644
> --- a/hw/arm/smmuv3.c
> +++ b/hw/arm/smmuv3.c
> @@ -1857,8 +1857,8 @@ static void smmuv3_class_init(ObjectClass *klass, void *data)
>       dc->vmsd = &vmstate_smmuv3;
>       resettable_class_set_parent_phases(rc, NULL, smmu_reset_hold, NULL,
>                                          &c->parent_phases);
> -    c->parent_realize = dc->realize;
> -    dc->realize = smmu_realize;
> +    device_class_set_parent_realize(dc, smmu_realize,
> +                                    &c->parent_realize);
>       device_class_set_props(dc, smmuv3_properties);
>   }
>   

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH 0/4] Consolidate the use of device_class_set_parent_realize()

[Michael Tokarev]

[Trimming list of addresses]

01.02.2024 11:40, Zhao Liu :
> From: Zhao Liu <zhao1.liu@intel.com>
> 
> Hi list,
> 
> Now we already have the device_class_set_parent_realize() to set
> parent realize(), thus clean up the places where that helper was
> forgotten.

Applied to trivial-patches tree, thanks!

/mjt