From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MQHxK-0004eo-PP for qemu-devel@nongnu.org; Mon, 13 Jul 2009 05:36:18 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MQHxG-0004dX-O5 for qemu-devel@nongnu.org; Mon, 13 Jul 2009 05:36:18 -0400 Received: from [199.232.76.173] (port=38630 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MQHxG-0004dT-Fm for qemu-devel@nongnu.org; Mon, 13 Jul 2009 05:36:14 -0400 Received: from mx2.redhat.com ([66.187.237.31]:45835) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MQHxF-0003rB-WB for qemu-devel@nongnu.org; Mon, 13 Jul 2009 05:36:14 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n6D9aDRU005087 for ; Mon, 13 Jul 2009 05:36:13 -0400 From: Gerd Hoffmann Date: Mon, 13 Jul 2009 11:36:02 +0200 Message-Id: <1247477765-17026-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1247477765-17026-1-git-send-email-kraxel@redhat.com> References: <1247477765-17026-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 3/6] qdev/prop: unstatic and rename prop_ptr() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Signed-off-by: Gerd Hoffmann --- hw/qdev-properties.c | 24 ++++++++++++------------ hw/qdev.h | 1 + 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index abd4b57..3c31e31 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -1,6 +1,6 @@ #include "qdev.h" -static void *prop_ptr(DeviceState *dev, Property *prop) +void *qdev_get_prop_ptr(DeviceState *dev, Property *prop) { void *ptr = dev; ptr += prop->offset; @@ -11,7 +11,7 @@ static void *prop_ptr(DeviceState *dev, Property *prop) static int parse_uint16(DeviceState *dev, Property *prop, const char *str) { - uint16_t *ptr = prop_ptr(dev, prop); + uint16_t *ptr = qdev_get_prop_ptr(dev, prop); const char *fmt; /* accept both hex and decimal */ @@ -23,7 +23,7 @@ static int parse_uint16(DeviceState *dev, Property *prop, const char *str) static int print_uint16(DeviceState *dev, Property *prop, char *dest, size_t len) { - uint16_t *ptr = prop_ptr(dev, prop); + uint16_t *ptr = qdev_get_prop_ptr(dev, prop); return snprintf(dest, len, "%" PRIu16, *ptr); } @@ -38,7 +38,7 @@ PropertyInfo qdev_prop_uint16 = { static int parse_uint32(DeviceState *dev, Property *prop, const char *str) { - uint32_t *ptr = prop_ptr(dev, prop); + uint32_t *ptr = qdev_get_prop_ptr(dev, prop); const char *fmt; /* accept both hex and decimal */ @@ -50,7 +50,7 @@ static int parse_uint32(DeviceState *dev, Property *prop, const char *str) static int print_uint32(DeviceState *dev, Property *prop, char *dest, size_t len) { - uint32_t *ptr = prop_ptr(dev, prop); + uint32_t *ptr = qdev_get_prop_ptr(dev, prop); return snprintf(dest, len, "%" PRIu32, *ptr); } @@ -65,7 +65,7 @@ PropertyInfo qdev_prop_uint32 = { static int parse_hex32(DeviceState *dev, Property *prop, const char *str) { - uint32_t *ptr = prop_ptr(dev, prop); + uint32_t *ptr = qdev_get_prop_ptr(dev, prop); if (sscanf(str, "%" PRIx32, ptr) != 1) return -1; @@ -74,7 +74,7 @@ static int parse_hex32(DeviceState *dev, Property *prop, const char *str) static int print_hex32(DeviceState *dev, Property *prop, char *dest, size_t len) { - uint32_t *ptr = prop_ptr(dev, prop); + uint32_t *ptr = qdev_get_prop_ptr(dev, prop); return snprintf(dest, len, "0x%" PRIx32, *ptr); } @@ -89,7 +89,7 @@ PropertyInfo qdev_prop_hex32 = { static int print_ptr(DeviceState *dev, Property *prop, char *dest, size_t len) { - void **ptr = prop_ptr(dev, prop); + void **ptr = qdev_get_prop_ptr(dev, prop); return snprintf(dest, len, "<%p>", *ptr); } @@ -108,7 +108,7 @@ PropertyInfo qdev_prop_ptr = { */ static int parse_mac(DeviceState *dev, Property *prop, const char *str) { - uint8_t *mac = prop_ptr(dev, prop); + uint8_t *mac = qdev_get_prop_ptr(dev, prop); int i, pos; char *p; @@ -128,7 +128,7 @@ static int parse_mac(DeviceState *dev, Property *prop, const char *str) static int print_mac(DeviceState *dev, Property *prop, char *dest, size_t len) { - uint8_t *mac = prop_ptr(dev, prop); + uint8_t *mac = qdev_get_prop_ptr(dev, prop); return snprintf(dest, len, "%02x:%02x:%02x:%02x:%02x:%02x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); } @@ -205,7 +205,7 @@ int qdev_prop_set(DeviceState *dev, const char *name, void *src, size_t size) dev->info->name, name, prop->info->size, size); return -1; } - dst = prop_ptr(dev, prop); + dst = qdev_get_prop_ptr(dev, prop); memcpy(dst, src, size); return 0; } @@ -233,7 +233,7 @@ void qdev_prop_set_defaults(DeviceState *dev, Property *props) return; while (props->name) { if (props->defval) { - dst = prop_ptr(dev, props); + dst = qdev_get_prop_ptr(dev, props); memcpy(dst, props->defval, props->info->size); } props++; diff --git a/hw/qdev.h b/hw/qdev.h index d7f51fb..6b35961 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -135,6 +135,7 @@ extern PropertyInfo qdev_prop_ptr; extern PropertyInfo qdev_prop_mac; /* Set properties between creation and init. */ +void *qdev_get_prop_ptr(DeviceState *dev, Property *prop); int qdev_prop_parse(DeviceState *dev, const char *name, const char *value); int qdev_prop_set(DeviceState *dev, const char *name, void *src, size_t size); int qdev_prop_set_uint16(DeviceState *dev, const char *name, uint16_t value); -- 1.6.2.5