[Qemu-devel] [PATCH] hw/i2c/core.c: add the id property of i2c_slaver when created in the QEMUMachine's initialization

[Qemu-devel] [PATCH] hw/i2c/core.c: add the id property of i2c_slaver when created in the QEMUMachine's initialization

[Zhou Yuan]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="gb2312", Size: 2223 bytes --]

From: zhouy <zhouyuan.fnst@cn.fujitsu.com>
Date: Fri, 15 Nov 2013 15:50:52 -0500
Subject: [PATCH] add the id property of i2c_slaver when created in the
 QEMUMachine's initialization

Signed-off-by: zhouy <zhouyuan.fnst@cn.fujitsu.com>
---
 qemu-master/hw/i2c/core.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/qemu-master/hw/i2c/core.c b/qemu-master/hw/i2c/core.c
index c97e7f7..ea3e59d 100644
--- a/qemu-master/hw/i2c/core.c
+++ b/qemu-master/hw/i2c/core.c
@@ -213,10 +213,16 @@ static int i2c_slave_qdev_init(DeviceState *dev)
 DeviceState *i2c_create_slave(i2c_bus *bus, const char *name, uint8_t addr)
 {
     DeviceState *dev;
-
+    static unsigned int seq_num;
+    char *id = g_malloc0(20);
+    snprintf(id, 20, "%s-%d", name, seq_num);
     dev = qdev_create(&bus->qbus, name);
     qdev_prop_set_uint8(dev, "address", addr);
+    dev->id = id;
+    object_property_add_child(container_get(qdev_get_machine(), "/peripheral"),
+                              dev->id, OBJECT(dev), NULL);
     qdev_init_nofail(dev);
+    seq_num++;
     return dev;
 }
 
-- 
1.7.6

ÒÔÉÏ¡¢¤è¤í¤·¤¯¤ªîŠ¤¤¤¤¤¿¤·¤Þ¤¹¡£    
--------------
A new email address of FJWAN is launched from Apr.1 2007.
The updated address is: zhouyuan.fnst@cn.fujitsu.com 
--------------------------------------------------
Zhou Yuan
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST)
No. 6 Wenzhu Road, Nanjing, 210012, China
TEL£º+86+25-86630566-9555
FUJITSU INTERNAL£º7998-9555
FAX£º+86+25-83317685
EMail£ºzhouyuan.fnst@cn.fujitsu.com
--------------------------------------------------
This communication is for use by the intended recipient(s) only and may contain information that is privileged, confidential and exempt from disclosure under applicable law. If you are not an intended recipient of this communication, you are hereby notified that any dissemination, distribution or copying hereof is strictly prohibited.  If you have received this communication in error, please notify me by reply e-mail, permanently delete this communication from your system, and destroy any hard copies you may have printed.
 
zhouyuan.fnst@cn.fujitsu.com
16:54:53
qemu-devel

Re: [Qemu-devel] [PATCH] hw/i2c/core.c: add the id property of i2c_slaver when created in the QEMUMachine's initialization

[Markus Armbruster]

"Zhou Yuan" <zhouyuan.fnst@cn.fujitsu.com> writes:

> From: zhouy <zhouyuan.fnst@cn.fujitsu.com>
> Date: Fri, 15 Nov 2013 15:50:52 -0500
> Subject: [PATCH] add the id property of i2c_slaver when created in the
>  QEMUMachine's initialization
>
> Signed-off-by: zhouy <zhouyuan.fnst@cn.fujitsu.com>
> ---
>  qemu-master/hw/i2c/core.c |    8 +++++++-
>  1 files changed, 7 insertions(+), 1 deletions(-)
>
> diff --git a/qemu-master/hw/i2c/core.c b/qemu-master/hw/i2c/core.c
> index c97e7f7..ea3e59d 100644
> --- a/qemu-master/hw/i2c/core.c
> +++ b/qemu-master/hw/i2c/core.c
> @@ -213,10 +213,16 @@ static int i2c_slave_qdev_init(DeviceState *dev)
>  DeviceState *i2c_create_slave(i2c_bus *bus, const char *name, uint8_t addr)
>  {
>      DeviceState *dev;
> -
> +    static unsigned int seq_num;
> +    char *id = g_malloc0(20);
> +    snprintf(id, 20, "%s-%d", name, seq_num);
>      dev = qdev_create(&bus->qbus, name);
>      qdev_prop_set_uint8(dev, "address", addr);
> +    dev->id = id;
> +    object_property_add_child(container_get(qdev_get_machine(), "/peripheral"),
> +                              dev->id, OBJECT(dev), NULL);
>      qdev_init_nofail(dev);
> +    seq_num++;
>      return dev;
>  }

Why is this needed?

In general, property "id" / DeviceState member id is strictly for the
user, and should never be set automatically.  Exceptions exist in
convenience options, mostly for historical reasons.