qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH v5 0/6] arm: Make use of DEFINE_PROP_LINK
@ 2017-07-17  2:38 Fam Zheng
  2017-07-17  2:38 ` [Qemu-devel] [PATCH v5 1/6] armv7m: Convert bitband.source-mamory to DEFINE_PROP_LINK Fam Zheng
                   ` (6 more replies)
  0 siblings, 7 replies; 15+ messages in thread
From: Fam Zheng @ 2017-07-17  2:38 UTC (permalink / raw)
  To: qemu-devel; +Cc: Peter Maydell, qemu-arm

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-mamory 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.9.4

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [Qemu-devel] [PATCH v5 1/6] armv7m: Convert bitband.source-mamory to DEFINE_PROP_LINK
  2017-07-17  2:38 [Qemu-devel] [PATCH v5 0/6] arm: Make use of DEFINE_PROP_LINK Fam Zheng
@ 2017-07-17  2:38 ` Fam Zheng
  2017-07-17  4:07   ` [Qemu-devel] [Qemu-arm] " Philippe Mathieu-Daudé
  2017-07-17  2:38 ` [Qemu-devel] [PATCH v5 2/6] armv7m: Convert armv7m.memory " Fam Zheng
                   ` (5 subsequent siblings)
  6 siblings, 1 reply; 15+ messages in thread
From: Fam Zheng @ 2017-07-17  2:38 UTC (permalink / raw)
  To: qemu-devel; +Cc: Peter Maydell, qemu-arm

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 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 c8a11f2..8efc4e8 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.9.4

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [Qemu-devel] [PATCH v5 2/6] armv7m: Convert armv7m.memory to DEFINE_PROP_LINK
  2017-07-17  2:38 [Qemu-devel] [PATCH v5 0/6] arm: Make use of DEFINE_PROP_LINK Fam Zheng
  2017-07-17  2:38 ` [Qemu-devel] [PATCH v5 1/6] armv7m: Convert bitband.source-mamory to DEFINE_PROP_LINK Fam Zheng
@ 2017-07-17  2:38 ` Fam Zheng
  2017-07-17  4:11   ` [Qemu-devel] [Qemu-arm] " Philippe Mathieu-Daudé
  2017-07-17  2:38 ` [Qemu-devel] [PATCH v5 3/6] gicv3: Convert " Fam Zheng
                   ` (4 subsequent siblings)
  6 siblings, 1 reply; 15+ messages in thread
From: Fam Zheng @ 2017-07-17  2:38 UTC (permalink / raw)
  To: qemu-devel; +Cc: Peter Maydell, qemu-arm

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 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 8efc4e8..1c837da 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), "armv7m_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.9.4

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [Qemu-devel] [PATCH v5 3/6] gicv3: Convert to DEFINE_PROP_LINK
  2017-07-17  2:38 [Qemu-devel] [PATCH v5 0/6] arm: Make use of DEFINE_PROP_LINK Fam Zheng
  2017-07-17  2:38 ` [Qemu-devel] [PATCH v5 1/6] armv7m: Convert bitband.source-mamory to DEFINE_PROP_LINK Fam Zheng
  2017-07-17  2:38 ` [Qemu-devel] [PATCH v5 2/6] armv7m: Convert armv7m.memory " Fam Zheng
@ 2017-07-17  2:38 ` Fam Zheng
  2017-07-17  2:38 ` [Qemu-devel] [PATCH v5 4/6] xlnx_zynqmp: " Fam Zheng
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 15+ messages in thread
From: Fam Zheng @ 2017-07-17  2:38 UTC (permalink / raw)
  To: qemu-devel; +Cc: Peter Maydell, qemu-arm

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 1f8991b..39903d5 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.9.4

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [Qemu-devel] [PATCH v5 4/6] xlnx_zynqmp: Convert to DEFINE_PROP_LINK
  2017-07-17  2:38 [Qemu-devel] [PATCH v5 0/6] arm: Make use of DEFINE_PROP_LINK Fam Zheng
                   ` (2 preceding siblings ...)
  2017-07-17  2:38 ` [Qemu-devel] [PATCH v5 3/6] gicv3: Convert " Fam Zheng
@ 2017-07-17  2:38 ` Fam Zheng
  2017-07-17  4:09   ` Philippe Mathieu-Daudé
  2017-07-17  2:38 ` [Qemu-devel] [PATCH v5 5/6] xilinx_axienet: " Fam Zheng
                   ` (2 subsequent siblings)
  6 siblings, 1 reply; 15+ messages in thread
From: Fam Zheng @ 2017-07-17  2:38 UTC (permalink / raw)
  To: qemu-devel; +Cc: Peter Maydell, qemu-arm

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 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 64f52f8..cd8a4aa 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());
 
@@ -434,6 +429,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.9.4

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [Qemu-devel] [PATCH v5 5/6] xilinx_axienet: Convert to DEFINE_PROP_LINK
  2017-07-17  2:38 [Qemu-devel] [PATCH v5 0/6] arm: Make use of DEFINE_PROP_LINK Fam Zheng
                   ` (3 preceding siblings ...)
  2017-07-17  2:38 ` [Qemu-devel] [PATCH v5 4/6] xlnx_zynqmp: " Fam Zheng
@ 2017-07-17  2:38 ` Fam Zheng
  2017-07-17  4:10   ` [Qemu-devel] [Qemu-arm] " Philippe Mathieu-Daudé
  2017-07-17  2:38 ` [Qemu-devel] [PATCH v5 6/6] xilinx_axidma: " Fam Zheng
  2017-09-05  3:35 ` [Qemu-devel] [PATCH v5 0/6] arm: Make use of DEFINE_PROP_LINK Fam Zheng
  6 siblings, 1 reply; 15+ messages in thread
From: Fam Zheng @ 2017-07-17  2:38 UTC (permalink / raw)
  To: qemu-devel; +Cc: Peter Maydell, qemu-arm

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 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 5ffa739..d4c2c89 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.9.4

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [Qemu-devel] [PATCH v5 6/6] xilinx_axidma: Convert to DEFINE_PROP_LINK
  2017-07-17  2:38 [Qemu-devel] [PATCH v5 0/6] arm: Make use of DEFINE_PROP_LINK Fam Zheng
                   ` (4 preceding siblings ...)
  2017-07-17  2:38 ` [Qemu-devel] [PATCH v5 5/6] xilinx_axienet: " Fam Zheng
@ 2017-07-17  2:38 ` Fam Zheng
  2017-07-17  4:11   ` Philippe Mathieu-Daudé
  2017-09-05  3:35 ` [Qemu-devel] [PATCH v5 0/6] arm: Make use of DEFINE_PROP_LINK Fam Zheng
  6 siblings, 1 reply; 15+ messages in thread
From: Fam Zheng @ 2017-07-17  2:38 UTC (permalink / raw)
  To: qemu-devel; +Cc: Peter Maydell, qemu-arm

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 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 3987b5f..9b48103 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.9.4

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* Re: [Qemu-devel] [Qemu-arm] [PATCH v5 1/6] armv7m: Convert bitband.source-mamory to DEFINE_PROP_LINK
  2017-07-17  2:38 ` [Qemu-devel] [PATCH v5 1/6] armv7m: Convert bitband.source-mamory to DEFINE_PROP_LINK Fam Zheng
@ 2017-07-17  4:07   ` Philippe Mathieu-Daudé
  0 siblings, 0 replies; 15+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-07-17  4:07 UTC (permalink / raw)
  To: Fam Zheng, qemu-devel; +Cc: Peter Maydell, qemu-arm

On 07/16/2017 11:38 PM, Fam Zheng wrote:
> 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 c8a11f2..8efc4e8 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(),
>   };
>   
> 

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [Qemu-devel] [PATCH v5 4/6] xlnx_zynqmp: Convert to DEFINE_PROP_LINK
  2017-07-17  2:38 ` [Qemu-devel] [PATCH v5 4/6] xlnx_zynqmp: " Fam Zheng
@ 2017-07-17  4:09   ` Philippe Mathieu-Daudé
  0 siblings, 0 replies; 15+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-07-17  4:09 UTC (permalink / raw)
  To: Fam Zheng, qemu-devel; +Cc: Peter Maydell, qemu-arm

On 07/16/2017 11:38 PM, Fam Zheng wrote:
> 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 64f52f8..cd8a4aa 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());
>   
> @@ -434,6 +429,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()
>   };
>   
> 

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [Qemu-devel] [Qemu-arm] [PATCH v5 5/6] xilinx_axienet: Convert to DEFINE_PROP_LINK
  2017-07-17  2:38 ` [Qemu-devel] [PATCH v5 5/6] xilinx_axienet: " Fam Zheng
@ 2017-07-17  4:10   ` Philippe Mathieu-Daudé
  0 siblings, 0 replies; 15+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-07-17  4:10 UTC (permalink / raw)
  To: Fam Zheng, qemu-devel; +Cc: Peter Maydell, qemu-arm

On 07/16/2017 11:38 PM, Fam Zheng wrote:
> 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 5ffa739..d4c2c89 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(),
>   };
>   
> 

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [Qemu-devel] [PATCH v5 6/6] xilinx_axidma: Convert to DEFINE_PROP_LINK
  2017-07-17  2:38 ` [Qemu-devel] [PATCH v5 6/6] xilinx_axidma: " Fam Zheng
@ 2017-07-17  4:11   ` Philippe Mathieu-Daudé
  0 siblings, 0 replies; 15+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-07-17  4:11 UTC (permalink / raw)
  To: Fam Zheng, qemu-devel; +Cc: Peter Maydell, qemu-arm

On 07/16/2017 11:38 PM, Fam Zheng wrote:
> 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 3987b5f..9b48103 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(),
>   };
>   
> 

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [Qemu-devel] [Qemu-arm] [PATCH v5 2/6] armv7m: Convert armv7m.memory to DEFINE_PROP_LINK
  2017-07-17  2:38 ` [Qemu-devel] [PATCH v5 2/6] armv7m: Convert armv7m.memory " Fam Zheng
@ 2017-07-17  4:11   ` Philippe Mathieu-Daudé
  0 siblings, 0 replies; 15+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-07-17  4:11 UTC (permalink / raw)
  To: Fam Zheng, qemu-devel; +Cc: Peter Maydell, qemu-arm

On 07/16/2017 11:38 PM, Fam Zheng wrote:
> 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 8efc4e8..1c837da 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), "armv7m_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(),
>   };
>   
> 

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [Qemu-devel] [PATCH v5 0/6] arm: Make use of DEFINE_PROP_LINK
  2017-07-17  2:38 [Qemu-devel] [PATCH v5 0/6] arm: Make use of DEFINE_PROP_LINK Fam Zheng
                   ` (5 preceding siblings ...)
  2017-07-17  2:38 ` [Qemu-devel] [PATCH v5 6/6] xilinx_axidma: " Fam Zheng
@ 2017-09-05  3:35 ` Fam Zheng
  2017-09-05 10:43   ` Peter Maydell
  6 siblings, 1 reply; 15+ messages in thread
From: Fam Zheng @ 2017-09-05  3:35 UTC (permalink / raw)
  To: Peter Maydell, qemu-devel; +Cc: qemu-arm

Hi,

Ping for 2.11.

Peter, what do you think?

On Mon, 07/17 10:38, Fam Zheng wrote:
> 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-mamory 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.9.4
> 
> 

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [Qemu-devel] [PATCH v5 0/6] arm: Make use of DEFINE_PROP_LINK
  2017-09-05  3:35 ` [Qemu-devel] [PATCH v5 0/6] arm: Make use of DEFINE_PROP_LINK Fam Zheng
@ 2017-09-05 10:43   ` Peter Maydell
  2017-09-05 13:12     ` Fam Zheng
  0 siblings, 1 reply; 15+ messages in thread
From: Peter Maydell @ 2017-09-05 10:43 UTC (permalink / raw)
  To: Fam Zheng; +Cc: QEMU Developers, qemu-arm

On 5 September 2017 at 04:35, Fam Zheng <famz@redhat.com> wrote:
> Hi,
>
> Ping for 2.11.
>
> Peter, what do you think?
>
> On Mon, 07/17 10:38, Fam Zheng wrote:
>> 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-mamory 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

These look OK, but they've fallen out of the 'patches' cache.
There's a typo in the subject of the bitband one: should
be "memory", not "mamory". Can you fix that, add the reviewed-bys
and resend the series, please, and I'll put it in my queue?

thanks
-- PMM

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [Qemu-devel] [PATCH v5 0/6] arm: Make use of DEFINE_PROP_LINK
  2017-09-05 10:43   ` Peter Maydell
@ 2017-09-05 13:12     ` Fam Zheng
  0 siblings, 0 replies; 15+ messages in thread
From: Fam Zheng @ 2017-09-05 13:12 UTC (permalink / raw)
  To: Peter Maydell; +Cc: QEMU Developers, qemu-arm

On Tue, 09/05 11:43, Peter Maydell wrote:
> On 5 September 2017 at 04:35, Fam Zheng <famz@redhat.com> wrote:
> > Hi,
> >
> > Ping for 2.11.
> >
> > Peter, what do you think?
> >
> > On Mon, 07/17 10:38, Fam Zheng wrote:
> >> 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-mamory 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
> 
> These look OK, but they've fallen out of the 'patches' cache.
> There's a typo in the subject of the bitband one: should
> be "memory", not "mamory". Can you fix that, add the reviewed-bys
> and resend the series, please, and I'll put it in my queue?

Sure, sent v6.

Fam

^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2017-09-05 13:12 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-17  2:38 [Qemu-devel] [PATCH v5 0/6] arm: Make use of DEFINE_PROP_LINK Fam Zheng
2017-07-17  2:38 ` [Qemu-devel] [PATCH v5 1/6] armv7m: Convert bitband.source-mamory to DEFINE_PROP_LINK Fam Zheng
2017-07-17  4:07   ` [Qemu-devel] [Qemu-arm] " Philippe Mathieu-Daudé
2017-07-17  2:38 ` [Qemu-devel] [PATCH v5 2/6] armv7m: Convert armv7m.memory " Fam Zheng
2017-07-17  4:11   ` [Qemu-devel] [Qemu-arm] " Philippe Mathieu-Daudé
2017-07-17  2:38 ` [Qemu-devel] [PATCH v5 3/6] gicv3: Convert " Fam Zheng
2017-07-17  2:38 ` [Qemu-devel] [PATCH v5 4/6] xlnx_zynqmp: " Fam Zheng
2017-07-17  4:09   ` Philippe Mathieu-Daudé
2017-07-17  2:38 ` [Qemu-devel] [PATCH v5 5/6] xilinx_axienet: " Fam Zheng
2017-07-17  4:10   ` [Qemu-devel] [Qemu-arm] " Philippe Mathieu-Daudé
2017-07-17  2:38 ` [Qemu-devel] [PATCH v5 6/6] xilinx_axidma: " Fam Zheng
2017-07-17  4:11   ` Philippe Mathieu-Daudé
2017-09-05  3:35 ` [Qemu-devel] [PATCH v5 0/6] arm: Make use of DEFINE_PROP_LINK Fam Zheng
2017-09-05 10:43   ` Peter Maydell
2017-09-05 13:12     ` Fam Zheng

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).