From patchwork Tue Jun 14 02:37:43 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: 100254 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 59A1AB6F8F for ; Tue, 14 Jun 2011 13:48:34 +1000 (EST) Received: from localhost ([::1]:44767 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWKcA-0007Iv-Gx for incoming@patchwork.ozlabs.org; Mon, 13 Jun 2011 23:48:30 -0400 Received: from eggs.gnu.org ([140.186.70.92]:57291) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWJW6-0006tv-6X for qemu-devel@nongnu.org; Mon, 13 Jun 2011 22:38:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QWJW1-0006hR-Hh for qemu-devel@nongnu.org; Mon, 13 Jun 2011 22:38:09 -0400 Received: from fmmailgate01.web.de ([217.72.192.221]:51359) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWJW0-0006gl-Ng for qemu-devel@nongnu.org; Mon, 13 Jun 2011 22:38:05 -0400 Received: from smtp03.web.de ( [172.20.0.65]) by fmmailgate01.web.de (Postfix) with ESMTP id DDDB919186870 for ; Tue, 14 Jun 2011 04:38:03 +0200 (CEST) Received: from [87.173.124.240] (helo=af.local) by smtp03.web.de with asmtp (WEB.DE 4.110 #2) id 1QWJVz-0000Aw-01; Tue, 14 Jun 2011 04:38:03 +0200 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Tue, 14 Jun 2011 04:37:43 +0200 Message-Id: <1308019077-61957-10-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.7.5.3 In-Reply-To: <1308019077-61957-9-git-send-email-andreas.faerber@web.de> References: <1308019077-61957-1-git-send-email-andreas.faerber@web.de> <1308019077-61957-2-git-send-email-andreas.faerber@web.de> <1308019077-61957-3-git-send-email-andreas.faerber@web.de> <1308019077-61957-4-git-send-email-andreas.faerber@web.de> <1308019077-61957-5-git-send-email-andreas.faerber@web.de> <1308019077-61957-6-git-send-email-andreas.faerber@web.de> <1308019077-61957-7-git-send-email-andreas.faerber@web.de> <1308019077-61957-8-git-send-email-andreas.faerber@web.de> <1308019077-61957-9-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 X-Sender: Andreas.Faerber@web.de X-Provags-ID: V01U2FsdGVkX19yZqtERrrW4zgSKadv+/o9VEj5datVgOBC6UCI N33xP8ml96SVaEHUN/5Wu1jvX6fId8SGsa7BSZWL60QY1IfCqE sm9hALMmh/Ob5wj2hx+w== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 217.72.192.221 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH v5 09/23] 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 3ad6f93..92bc095 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -673,6 +673,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); @@ -683,36 +701,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);