From patchwork Wed Jun 8 18:55:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 99536 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EE169B6FD9 for ; Thu, 9 Jun 2011 05:09:04 +1000 (EST) Received: from localhost ([::1]:41672 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUO7g-0000WX-IH for incoming@patchwork.ozlabs.org; Wed, 08 Jun 2011 15:09:00 -0400 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 Received: from smtp01.web.de ( [172.20.0.243]) by fmmailgate03.web.de (Postfix) with ESMTP id E9ABB191FD250; Wed, 8 Jun 2011 20:55:22 +0200 (CEST) Received: from [87.173.123.15] (helo=af.local) by smtp01.web.de with asmtp (WEB.DE 4.110 #2) id 1QUNuU-0002zl-00; Wed, 08 Jun 2011 20:55:22 +0200 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Wed, 8 Jun 2011 20:55:09 +0200 Message-Id: <1307559319-16183-3-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.7.5.3 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 X-Sender: Andreas.Faerber@web.de X-Provags-ID: V01U2FsdGVkX1/AktFZ7XnRns2cZqBaFWLuld8BGwQ6IKb/zhH2 rr9tGJxjcHvkXGQwA/17LRpXDbzo48iBC80imeHXNxK+5Sy7yb JdwLICBa+gV86cOcaCiA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 217.72.192.234 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , hpoussin@reactos.org, kraxel@redhat.com Subject: [Qemu-devel] [PATCH v4 02/12] qdev: Add helpers for reading properties X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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ärber --- 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 *name, void *src, enum PropertyT qdev_prop_cpy(dev, prop, src); } +void *qdev_prop_get(DeviceState *dev, const char *name, enum PropertyType type) +{ + Property *prop; + + prop = 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 != 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 char *name, bool value) qdev_prop_set(dev, name, &value, PROP_TYPE_BOOL); } +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 value) { qdev_prop_set(dev, name, &value, PROP_TYPE_UINT8); } +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 value) { qdev_prop_set(dev, name, &value, PROP_TYPE_UINT16); } +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 value) { qdev_prop_set(dev, name, &value, PROP_TYPE_UINT32); } +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 value) { qdev_prop_set(dev, name, &value, PROP_TYPE_INT32); } +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 value) { qdev_prop_set(dev, name, &value, PROP_TYPE_UINT64); } +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 *value) { qdev_prop_set(dev, name, &value, PROP_TYPE_STRING); } +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, BlockDriverState *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 *value); void qdev_prop_set(DeviceState *dev, const char *name, void *src, enum PropertyType type); +void *qdev_prop_get(DeviceState *dev, const char *name, enum PropertyType 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 value); +uint8_t qdev_prop_get_uint8(DeviceState *dev, const char *name); void qdev_prop_set_uint16(DeviceState *dev, const char *name, uint16_t value); +uint16_t qdev_prop_get_uint16(DeviceState *dev, const char *name); void qdev_prop_set_uint32(DeviceState *dev, const char *name, uint32_t value); +uint32_t qdev_prop_get_uint32(DeviceState *dev, const char *name); void qdev_prop_set_int32(DeviceState *dev, const char *name, int32_t value); +int32_t qdev_prop_get_int32(DeviceState *dev, const char *name); void qdev_prop_set_uint64(DeviceState *dev, const char *name, uint64_t value); +uint64_t qdev_prop_get_uint64(DeviceState *dev, const char *name); void qdev_prop_set_string(DeviceState *dev, const char *name, char *value); +char *qdev_prop_get_string(DeviceState *dev, const char *name); void qdev_prop_set_chr(DeviceState *dev, const char *name, CharDriverState *value); void qdev_prop_set_netdev(DeviceState *dev, const char *name, VLANClientState *value); void qdev_prop_set_vlan(DeviceState *dev, const char *name, VLANState *value);