[Qemu-devel] [PATCH v6 0/6] arm: Make use of DEFINE_PROP_LINK

[Qemu-devel] [PATCH v6 0/6] arm: Make use of DEFINE_PROP_LINK

[Fam Zheng]

v6: Rebase and resend v5: Add Philippe's rev-bys and fix one typo in bitband
    patch.

This is the arm part that was left out from:

https://lists.gnu.org/archive/html/qemu-devel/2017-07/msg04006.html

Make use of the new DEFINE_PROP_LINK, in favor of open coded the
object_property_add_link. The advantage of it is the property now get reflected
in the info qtree output, for a bit more introspectability.

Fam Zheng (6):
  armv7m: Convert bitband.source-memory to DEFINE_PROP_LINK
  armv7m: Convert armv7m.memory to DEFINE_PROP_LINK
  gicv3: Convert to DEFINE_PROP_LINK
  xlnx_zynqmp: Convert to DEFINE_PROP_LINK
  xilinx_axienet: Convert to DEFINE_PROP_LINK
  xilinx_axidma: Convert to DEFINE_PROP_LINK

 hw/arm/armv7m.c             | 16 ++++------------
 hw/arm/xlnx-zynqmp.c        |  7 ++-----
 hw/dma/xilinx_axidma.c      | 16 ++++------------
 hw/intc/arm_gicv3_its_kvm.c | 19 +++++++------------
 hw/net/xilinx_axienet.c     | 16 ++++------------
 5 files changed, 21 insertions(+), 53 deletions(-)

-- 
2.13.5

[Qemu-devel] [PATCH v6 1/6] armv7m: Convert bitband.source-memory to DEFINE_PROP_LINK

[Fam Zheng]

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/arm/armv7m.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index d2477e84e4..4c560dde56 100644
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -97,12 +97,6 @@ static void bitband_init(Object *obj)
     BitBandState *s = BITBAND(obj);
     SysBusDevice *dev = SYS_BUS_DEVICE(obj);
 
-    object_property_add_link(obj, "source-memory",
-                             TYPE_MEMORY_REGION,
-                             (Object **)&s->source_memory,
-                             qdev_prop_allow_set_link_before_realize,
-                             OBJ_PROP_LINK_UNREF_ON_RELEASE,
-                             &error_abort);
     memory_region_init_io(&s->iomem, obj, &bitband_ops, s,
                           "bitband", 0x02000000);
     sysbus_init_mmio(dev, &s->iomem);
@@ -349,6 +343,8 @@ void armv7m_load_kernel(ARMCPU *cpu, const char *kernel_filename, int mem_size)
 
 static Property bitband_properties[] = {
     DEFINE_PROP_UINT32("base", BitBandState, base, 0),
+    DEFINE_PROP_LINK("source-memory", BitBandState, source_memory,
+                     TYPE_MEMORY_REGION, MemoryRegion *),
     DEFINE_PROP_END_OF_LIST(),
 };
 
-- 
2.13.5

[Qemu-devel] [PATCH v6 2/6] armv7m: Convert armv7m.memory to DEFINE_PROP_LINK

[Fam Zheng]

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/arm/armv7m.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index 4c560dde56..b64a409b40 100644
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -132,12 +132,6 @@ static void armv7m_instance_init(Object *obj)
 
     /* Can't init the cpu here, we don't yet know which model to use */
 
-    object_property_add_link(obj, "memory",
-                             TYPE_MEMORY_REGION,
-                             (Object **)&s->board_memory,
-                             qdev_prop_allow_set_link_before_realize,
-                             OBJ_PROP_LINK_UNREF_ON_RELEASE,
-                             &error_abort);
     memory_region_init(&s->container, obj, "armv7m-container", UINT64_MAX);
 
     object_initialize(&s->nvic, sizeof(s->nvic), TYPE_NVIC);
@@ -248,6 +242,8 @@ static void armv7m_realize(DeviceState *dev, Error **errp)
 
 static Property armv7m_properties[] = {
     DEFINE_PROP_STRING("cpu-model", ARMv7MState, cpu_model),
+    DEFINE_PROP_LINK("memory", ARMv7MState, board_memory, TYPE_MEMORY_REGION,
+                     MemoryRegion *),
     DEFINE_PROP_END_OF_LIST(),
 };
 
-- 
2.13.5

[Qemu-devel] [PATCH v6 3/6] gicv3: Convert to DEFINE_PROP_LINK

[Fam Zheng]

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 hw/intc/arm_gicv3_its_kvm.c | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/hw/intc/arm_gicv3_its_kvm.c b/hw/intc/arm_gicv3_its_kvm.c
index 1f8991b8a6..39903d5eab 100644
--- a/hw/intc/arm_gicv3_its_kvm.c
+++ b/hw/intc/arm_gicv3_its_kvm.c
@@ -120,17 +120,6 @@ static void kvm_arm_its_realize(DeviceState *dev, Error **errp)
     qemu_add_vm_change_state_handler(vm_change_state_handler, s);
 }
 
-static void kvm_arm_its_init(Object *obj)
-{
-    GICv3ITSState *s = KVM_ARM_ITS(obj);
-
-    object_property_add_link(obj, "parent-gicv3",
-                             "kvm-arm-gicv3", (Object **)&s->gicv3,
-                             object_property_allow_set_link,
-                             OBJ_PROP_LINK_UNREF_ON_RELEASE,
-                             &error_abort);
-}
-
 /**
  * kvm_arm_its_pre_save - handles the saving of ITS registers.
  * ITS tables are flushed into guest RAM separately and earlier,
@@ -205,12 +194,19 @@ static void kvm_arm_its_post_load(GICv3ITSState *s)
                       GITS_CTLR, &s->ctlr, true, &error_abort);
 }
 
+static Property kvm_arm_its_props[] = {
+    DEFINE_PROP_LINK("parent-gicv3", GICv3ITSState, gicv3, "kvm-arm-gicv3",
+                     GICv3State *),
+    DEFINE_PROP_END_OF_LIST(),
+};
+
 static void kvm_arm_its_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
     GICv3ITSCommonClass *icc = ARM_GICV3_ITS_COMMON_CLASS(klass);
 
     dc->realize = kvm_arm_its_realize;
+    dc->props   = kvm_arm_its_props;
     icc->send_msi = kvm_its_send_msi;
     icc->pre_save = kvm_arm_its_pre_save;
     icc->post_load = kvm_arm_its_post_load;
@@ -220,7 +216,6 @@ static const TypeInfo kvm_arm_its_info = {
     .name = TYPE_KVM_ARM_ITS,
     .parent = TYPE_ARM_GICV3_ITS_COMMON,
     .instance_size = sizeof(GICv3ITSState),
-    .instance_init = kvm_arm_its_init,
     .class_init = kvm_arm_its_class_init,
 };
 
-- 
2.13.5

Re: [Qemu-devel] [PATCH v6 3/6] gicv3: Convert to DEFINE_PROP_LINK

[Philippe Mathieu-Daudé]

Hi Fam,

On 09/05/2017 10:11 AM, Fam Zheng wrote:
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>   hw/intc/arm_gicv3_its_kvm.c | 19 +++++++------------
>   1 file changed, 7 insertions(+), 12 deletions(-)
> 
> diff --git a/hw/intc/arm_gicv3_its_kvm.c b/hw/intc/arm_gicv3_its_kvm.c
> index 1f8991b8a6..39903d5eab 100644
> --- a/hw/intc/arm_gicv3_its_kvm.c
> +++ b/hw/intc/arm_gicv3_its_kvm.c
> @@ -120,17 +120,6 @@ static void kvm_arm_its_realize(DeviceState *dev, Error **errp)
>       qemu_add_vm_change_state_handler(vm_change_state_handler, s);
>   }
>   
> -static void kvm_arm_its_init(Object *obj)
> -{
> -    GICv3ITSState *s = KVM_ARM_ITS(obj);
> -
> -    object_property_add_link(obj, "parent-gicv3",
> -                             "kvm-arm-gicv3", (Object **)&s->gicv3,
> -                             object_property_allow_set_link,
> -                             OBJ_PROP_LINK_UNREF_ON_RELEASE,
> -                             &error_abort);
> -}
> -
>   /**
>    * kvm_arm_its_pre_save - handles the saving of ITS registers.
>    * ITS tables are flushed into guest RAM separately and earlier,
> @@ -205,12 +194,19 @@ static void kvm_arm_its_post_load(GICv3ITSState *s)
>                         GITS_CTLR, &s->ctlr, true, &error_abort);
>   }
>   
> +static Property kvm_arm_its_props[] = {
> +    DEFINE_PROP_LINK("parent-gicv3", GICv3ITSState, gicv3, "kvm-arm-gicv3",

moving TYPE_KVM_ARM_GICV3 to kvm_arm.h and using it here:
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> +                     GICv3State *),
> +    DEFINE_PROP_END_OF_LIST(),
> +};
> +
>   static void kvm_arm_its_class_init(ObjectClass *klass, void *data)
>   {
>       DeviceClass *dc = DEVICE_CLASS(klass);
>       GICv3ITSCommonClass *icc = ARM_GICV3_ITS_COMMON_CLASS(klass);
>   
>       dc->realize = kvm_arm_its_realize;
> +    dc->props   = kvm_arm_its_props;
>       icc->send_msi = kvm_its_send_msi;
>       icc->pre_save = kvm_arm_its_pre_save;
>       icc->post_load = kvm_arm_its_post_load;
> @@ -220,7 +216,6 @@ static const TypeInfo kvm_arm_its_info = {
>       .name = TYPE_KVM_ARM_ITS,
>       .parent = TYPE_ARM_GICV3_ITS_COMMON,
>       .instance_size = sizeof(GICv3ITSState),
> -    .instance_init = kvm_arm_its_init,
>       .class_init = kvm_arm_its_class_init,
>   };
>   
> 

Re: [Qemu-devel] [PATCH v6 3/6] gicv3: Convert to DEFINE_PROP_LINK

[Fam Zheng]

On Tue, 09/05 10:44, Philippe Mathieu-Daudé wrote:
> Hi Fam,
> 
> On 09/05/2017 10:11 AM, Fam Zheng wrote:
> > Signed-off-by: Fam Zheng <famz@redhat.com>
> > ---
> >   hw/intc/arm_gicv3_its_kvm.c | 19 +++++++------------
> >   1 file changed, 7 insertions(+), 12 deletions(-)
> > 
> > diff --git a/hw/intc/arm_gicv3_its_kvm.c b/hw/intc/arm_gicv3_its_kvm.c
> > index 1f8991b8a6..39903d5eab 100644
> > --- a/hw/intc/arm_gicv3_its_kvm.c
> > +++ b/hw/intc/arm_gicv3_its_kvm.c
> > @@ -120,17 +120,6 @@ static void kvm_arm_its_realize(DeviceState *dev, Error **errp)
> >       qemu_add_vm_change_state_handler(vm_change_state_handler, s);
> >   }
> > -static void kvm_arm_its_init(Object *obj)
> > -{
> > -    GICv3ITSState *s = KVM_ARM_ITS(obj);
> > -
> > -    object_property_add_link(obj, "parent-gicv3",
> > -                             "kvm-arm-gicv3", (Object **)&s->gicv3,
> > -                             object_property_allow_set_link,
> > -                             OBJ_PROP_LINK_UNREF_ON_RELEASE,
> > -                             &error_abort);
> > -}
> > -
> >   /**
> >    * kvm_arm_its_pre_save - handles the saving of ITS registers.
> >    * ITS tables are flushed into guest RAM separately and earlier,
> > @@ -205,12 +194,19 @@ static void kvm_arm_its_post_load(GICv3ITSState *s)
> >                         GITS_CTLR, &s->ctlr, true, &error_abort);
> >   }
> > +static Property kvm_arm_its_props[] = {
> > +    DEFINE_PROP_LINK("parent-gicv3", GICv3ITSState, gicv3, "kvm-arm-gicv3",
> 
> moving TYPE_KVM_ARM_GICV3 to kvm_arm.h and using it here:
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

This file is only compiled natively on arm, so I'm not comfortable to make a
more complex change than this patch which may break build due to the #ifdef's in
the headers, or add your rev-by without a compile test.  :(

The open coded type name has already been used here so the change you requested
can be done separately, I think.

Fam

Re: [Qemu-devel] [PATCH v6 3/6] gicv3: Convert to DEFINE_PROP_LINK

[Philippe Mathieu-Daudé]

On 09/05/2017 12:35 PM, Fam Zheng wrote:
> On Tue, 09/05 10:44, Philippe Mathieu-Daudé wrote:
>> Hi Fam,
>>
>> On 09/05/2017 10:11 AM, Fam Zheng wrote:
>>> Signed-off-by: Fam Zheng <famz@redhat.com>
>>> ---
>>>    hw/intc/arm_gicv3_its_kvm.c | 19 +++++++------------
>>>    1 file changed, 7 insertions(+), 12 deletions(-)
>>>
>>> diff --git a/hw/intc/arm_gicv3_its_kvm.c b/hw/intc/arm_gicv3_its_kvm.c
>>> index 1f8991b8a6..39903d5eab 100644
>>> --- a/hw/intc/arm_gicv3_its_kvm.c
>>> +++ b/hw/intc/arm_gicv3_its_kvm.c
>>> @@ -120,17 +120,6 @@ static void kvm_arm_its_realize(DeviceState *dev, Error **errp)
>>>        qemu_add_vm_change_state_handler(vm_change_state_handler, s);
>>>    }
>>> -static void kvm_arm_its_init(Object *obj)
>>> -{
>>> -    GICv3ITSState *s = KVM_ARM_ITS(obj);
>>> -
>>> -    object_property_add_link(obj, "parent-gicv3",
>>> -                             "kvm-arm-gicv3", (Object **)&s->gicv3,
>>> -                             object_property_allow_set_link,
>>> -                             OBJ_PROP_LINK_UNREF_ON_RELEASE,
>>> -                             &error_abort);
>>> -}
>>> -
>>>    /**
>>>     * kvm_arm_its_pre_save - handles the saving of ITS registers.
>>>     * ITS tables are flushed into guest RAM separately and earlier,
>>> @@ -205,12 +194,19 @@ static void kvm_arm_its_post_load(GICv3ITSState *s)
>>>                          GITS_CTLR, &s->ctlr, true, &error_abort);
>>>    }
>>> +static Property kvm_arm_its_props[] = {
>>> +    DEFINE_PROP_LINK("parent-gicv3", GICv3ITSState, gicv3, "kvm-arm-gicv3",
>>
>> moving TYPE_KVM_ARM_GICV3 to kvm_arm.h and using it here:
>> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> 
> This file is only compiled natively on arm, so I'm not comfortable to make a
> more complex change than this patch which may break build due to the #ifdef's in
> the headers, or add your rev-by without a compile test.  :(

Fine, no problem :)

> 
> The open coded type name has already been used here so the change you requested
> can be done separately, I think.
> 
> Fam
> 

[Qemu-devel] [PATCH v6 4/6] xlnx_zynqmp: Convert to DEFINE_PROP_LINK

[Fam Zheng]

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/arm/xlnx-zynqmp.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c
index 9eceadbdc8..22c2a33719 100644
--- a/hw/arm/xlnx-zynqmp.c
+++ b/hw/arm/xlnx-zynqmp.c
@@ -140,11 +140,6 @@ static void xlnx_zynqmp_init(Object *obj)
                                   &error_abort);
     }
 
-    object_property_add_link(obj, "ddr-ram", TYPE_MEMORY_REGION,
-                             (Object **)&s->ddr_ram,
-                             qdev_prop_allow_set_link_before_realize,
-                             OBJ_PROP_LINK_UNREF_ON_RELEASE, &error_abort);
-
     object_initialize(&s->gic, sizeof(s->gic), gic_class_name());
     qdev_set_parent_bus(DEVICE(&s->gic), sysbus_get_default());
 
@@ -433,6 +428,8 @@ static Property xlnx_zynqmp_props[] = {
     DEFINE_PROP_STRING("boot-cpu", XlnxZynqMPState, boot_cpu),
     DEFINE_PROP_BOOL("secure", XlnxZynqMPState, secure, false),
     DEFINE_PROP_BOOL("has_rpu", XlnxZynqMPState, has_rpu, false),
+    DEFINE_PROP_LINK("ddr-ram", XlnxZynqMPState, ddr_ram, TYPE_MEMORY_REGION,
+                     MemoryRegion *),
     DEFINE_PROP_END_OF_LIST()
 };
 
-- 
2.13.5

[Qemu-devel] [PATCH v6 5/6] xilinx_axienet: Convert to DEFINE_PROP_LINK

[Fam Zheng]

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/net/xilinx_axienet.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c
index 5ffa739f68..d4c2c89dc1 100644
--- a/hw/net/xilinx_axienet.c
+++ b/hw/net/xilinx_axienet.c
@@ -989,18 +989,6 @@ static void xilinx_enet_init(Object *obj)
     XilinxAXIEnet *s = XILINX_AXI_ENET(obj);
     SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
 
-    object_property_add_link(obj, "axistream-connected", TYPE_STREAM_SLAVE,
-                             (Object **) &s->tx_data_dev,
-                             qdev_prop_allow_set_link_before_realize,
-                             OBJ_PROP_LINK_UNREF_ON_RELEASE,
-                             &error_abort);
-    object_property_add_link(obj, "axistream-control-connected",
-                             TYPE_STREAM_SLAVE,
-                             (Object **) &s->tx_control_dev,
-                             qdev_prop_allow_set_link_before_realize,
-                             OBJ_PROP_LINK_UNREF_ON_RELEASE,
-                             &error_abort);
-
     object_initialize(&s->rx_data_dev, sizeof(s->rx_data_dev),
                       TYPE_XILINX_AXI_ENET_DATA_STREAM);
     object_initialize(&s->rx_control_dev, sizeof(s->rx_control_dev),
@@ -1021,6 +1009,10 @@ static Property xilinx_enet_properties[] = {
     DEFINE_PROP_UINT32("rxmem", XilinxAXIEnet, c_rxmem, 0x1000),
     DEFINE_PROP_UINT32("txmem", XilinxAXIEnet, c_txmem, 0x1000),
     DEFINE_NIC_PROPERTIES(XilinxAXIEnet, conf),
+    DEFINE_PROP_LINK("axistream-connected", XilinxAXIEnet,
+                     tx_data_dev, TYPE_STREAM_SLAVE, StreamSlave *),
+    DEFINE_PROP_LINK("axistream-control-connected", XilinxAXIEnet,
+                     tx_control_dev, TYPE_STREAM_SLAVE, StreamSlave *),
     DEFINE_PROP_END_OF_LIST(),
 };
 
-- 
2.13.5

[Qemu-devel] [PATCH v6 6/6] xilinx_axidma: Convert to DEFINE_PROP_LINK

[Fam Zheng]

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/dma/xilinx_axidma.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c
index 3987b5ff96..9b48103574 100644
--- a/hw/dma/xilinx_axidma.c
+++ b/hw/dma/xilinx_axidma.c
@@ -562,18 +562,6 @@ static void xilinx_axidma_init(Object *obj)
     XilinxAXIDMA *s = XILINX_AXI_DMA(obj);
     SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
 
-    object_property_add_link(obj, "axistream-connected", TYPE_STREAM_SLAVE,
-                             (Object **)&s->tx_data_dev,
-                             qdev_prop_allow_set_link_before_realize,
-                             OBJ_PROP_LINK_UNREF_ON_RELEASE,
-                             &error_abort);
-    object_property_add_link(obj, "axistream-control-connected",
-                             TYPE_STREAM_SLAVE,
-                             (Object **)&s->tx_control_dev,
-                             qdev_prop_allow_set_link_before_realize,
-                             OBJ_PROP_LINK_UNREF_ON_RELEASE,
-                             &error_abort);
-
     object_initialize(&s->rx_data_dev, sizeof(s->rx_data_dev),
                       TYPE_XILINX_AXI_DMA_DATA_STREAM);
     object_initialize(&s->rx_control_dev, sizeof(s->rx_control_dev),
@@ -593,6 +581,10 @@ static void xilinx_axidma_init(Object *obj)
 
 static Property axidma_properties[] = {
     DEFINE_PROP_UINT32("freqhz", XilinxAXIDMA, freqhz, 50000000),
+    DEFINE_PROP_LINK("axistream-connected", XilinxAXIDMA,
+                     tx_data_dev, TYPE_STREAM_SLAVE, StreamSlave *),
+    DEFINE_PROP_LINK("axistream-control-connected", XilinxAXIDMA,
+                     tx_control_dev, TYPE_STREAM_SLAVE, StreamSlave *),
     DEFINE_PROP_END_OF_LIST(),
 };
 
-- 
2.13.5

Re: [Qemu-devel] [PATCH v6 0/6] arm: Make use of DEFINE_PROP_LINK

[Peter Maydell]

On 5 September 2017 at 14:11, Fam Zheng <famz@redhat.com> wrote:
> v6: Rebase and resend v5: Add Philippe's rev-bys and fix one typo in bitband
>     patch.
>
> This is the arm part that was left out from:
>
> https://lists.gnu.org/archive/html/qemu-devel/2017-07/msg04006.html
>
> Make use of the new DEFINE_PROP_LINK, in favor of open coded the
> object_property_add_link. The advantage of it is the property now get reflected
> in the info qtree output, for a bit more introspectability.
>

Applied to target-arm.next, thanks.

-- PMM