From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:41937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUNuZ-0006LM-1K for qemu-devel@nongnu.org; Wed, 08 Jun 2011 14:55:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QUNuW-000686-Sj for qemu-devel@nongnu.org; Wed, 08 Jun 2011 14:55:26 -0400 Received: from fmmailgate03.web.de ([217.72.192.234]:36056) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUNuV-00067b-Su for qemu-devel@nongnu.org; Wed, 08 Jun 2011 14:55:24 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 8 Jun 2011 20:55:09 +0200 Message-Id: <1307559319-16183-3-git-send-email-andreas.faerber@web.de> In-Reply-To: <1307559319-16183-2-git-send-email-andreas.faerber@web.de> References: <4DEF2F25.5070104@redhat.com> <1307559319-16183-1-git-send-email-andreas.faerber@web.de> <1307559319-16183-2-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: andreas.faerber@web.de Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v4 02/12] qdev: Add helpers for reading properties List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , hpoussin@reactos.org, kraxel@redhat.com Add helpers qdev_prop_get_*() to access all integer qdev properties as well as string properties. This effectively turns qdev properties from write-only to read/write, allowing to inspect a private DeviceState. Signed-off-by: Andreas F=C3=A4rber --- hw/qdev-properties.c | 53 ++++++++++++++++++++++++++++++++++++++++++++= ++++++ hw/qdev.h | 8 +++++++ 2 files changed, 61 insertions(+), 0 deletions(-) diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index e262f9a..0be4130 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -669,6 +669,24 @@ void qdev_prop_set(DeviceState *dev, const char *nam= e, void *src, enum PropertyT qdev_prop_cpy(dev, prop, src); } =20 +void *qdev_prop_get(DeviceState *dev, const char *name, enum PropertyTyp= e type) +{ + Property *prop; + + prop =3D qdev_prop_find(dev, name); + if (!prop) { + fprintf(stderr, "%s: property \"%s.%s\" not found\n", + __FUNCTION__, dev->info->name, name); + abort(); + } + if (prop->info->type !=3D type) { + fprintf(stderr, "%s: property \"%s.%s\" type mismatch\n", + __FUNCTION__, dev->info->name, name); + abort(); + } + return qdev_get_prop_ptr(dev, prop); +} + void qdev_prop_set_bit(DeviceState *dev, const char *name, bool value) { qdev_prop_set(dev, name, &value, PROP_TYPE_BIT); @@ -679,36 +697,71 @@ void qdev_prop_set_bool(DeviceState *dev, const cha= r *name, bool value) qdev_prop_set(dev, name, &value, PROP_TYPE_BOOL); } =20 +bool qdev_prop_get_bool(DeviceState *dev, const char *name) +{ + return *(bool *)qdev_prop_get(dev, name, PROP_TYPE_BOOL); +} + void qdev_prop_set_uint8(DeviceState *dev, const char *name, uint8_t val= ue) { qdev_prop_set(dev, name, &value, PROP_TYPE_UINT8); } =20 +uint8_t qdev_prop_get_uint8(DeviceState *dev, const char *name) +{ + return *(uint8_t *)qdev_prop_get(dev, name, PROP_TYPE_UINT8); +} + void qdev_prop_set_uint16(DeviceState *dev, const char *name, uint16_t v= alue) { qdev_prop_set(dev, name, &value, PROP_TYPE_UINT16); } =20 +uint16_t qdev_prop_get_uint16(DeviceState *dev, const char *name) +{ + return *(uint16_t *)qdev_prop_get(dev, name, PROP_TYPE_UINT16); +} + void qdev_prop_set_uint32(DeviceState *dev, const char *name, uint32_t v= alue) { qdev_prop_set(dev, name, &value, PROP_TYPE_UINT32); } =20 +uint32_t qdev_prop_get_uint32(DeviceState *dev, const char *name) +{ + return *(uint32_t *)qdev_prop_get(dev, name, PROP_TYPE_UINT32); +} + void qdev_prop_set_int32(DeviceState *dev, const char *name, int32_t val= ue) { qdev_prop_set(dev, name, &value, PROP_TYPE_INT32); } =20 +int32_t qdev_prop_get_int32(DeviceState *dev, const char *name) +{ + return *(int32_t *)qdev_prop_get(dev, name, PROP_TYPE_INT32); +} + void qdev_prop_set_uint64(DeviceState *dev, const char *name, uint64_t v= alue) { qdev_prop_set(dev, name, &value, PROP_TYPE_UINT64); } =20 +uint64_t qdev_prop_get_uint64(DeviceState *dev, const char *name) +{ + return *(uint64_t *)qdev_prop_get(dev, name, PROP_TYPE_UINT64); +} + void qdev_prop_set_string(DeviceState *dev, const char *name, char *valu= e) { qdev_prop_set(dev, name, &value, PROP_TYPE_STRING); } =20 +char *qdev_prop_get_string(DeviceState *dev, const char *name) +{ + return (char *)qdev_prop_get(dev, name, PROP_TYPE_STRING); +} + int qdev_prop_set_drive(DeviceState *dev, const char *name, BlockDriverS= tate *value) { int res; diff --git a/hw/qdev.h b/hw/qdev.h index f05166d..71bd230 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -301,14 +301,22 @@ void *qdev_get_prop_ptr(DeviceState *dev, Property = *prop); int qdev_prop_exists(DeviceState *dev, const char *name); int qdev_prop_parse(DeviceState *dev, const char *name, const char *valu= e); void qdev_prop_set(DeviceState *dev, const char *name, void *src, enum P= ropertyType type); +void *qdev_prop_get(DeviceState *dev, const char *name, enum PropertyTyp= e type); void qdev_prop_set_bit(DeviceState *dev, const char *name, bool value); void qdev_prop_set_bool(DeviceState *dev, const char *name, bool value); +bool qdev_prop_get_bool(DeviceState *dev, const char *name); void qdev_prop_set_uint8(DeviceState *dev, const char *name, uint8_t val= ue); +uint8_t qdev_prop_get_uint8(DeviceState *dev, const char *name); void qdev_prop_set_uint16(DeviceState *dev, const char *name, uint16_t v= alue); +uint16_t qdev_prop_get_uint16(DeviceState *dev, const char *name); void qdev_prop_set_uint32(DeviceState *dev, const char *name, uint32_t v= alue); +uint32_t qdev_prop_get_uint32(DeviceState *dev, const char *name); void qdev_prop_set_int32(DeviceState *dev, const char *name, int32_t val= ue); +int32_t qdev_prop_get_int32(DeviceState *dev, const char *name); void qdev_prop_set_uint64(DeviceState *dev, const char *name, uint64_t v= alue); +uint64_t qdev_prop_get_uint64(DeviceState *dev, const char *name); void qdev_prop_set_string(DeviceState *dev, const char *name, char *valu= e); +char *qdev_prop_get_string(DeviceState *dev, const char *name); void qdev_prop_set_chr(DeviceState *dev, const char *name, CharDriverSta= te *value); void qdev_prop_set_netdev(DeviceState *dev, const char *name, VLANClient= State *value); void qdev_prop_set_vlan(DeviceState *dev, const char *name, VLANState *v= alue); --=20 1.7.5.3