From patchwork Mon Jul 29 14:47:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 262807 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C29592C00C5 for ; Tue, 30 Jul 2013 00:50:44 +1000 (EST) Received: from localhost ([::1]:44203 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3omY-0002Rw-6d for incoming@patchwork.ozlabs.org; Mon, 29 Jul 2013 10:50:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37449) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3ol4-0000Mr-PU for qemu-devel@nongnu.org; Mon, 29 Jul 2013 10:49:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3ol0-0002Lh-De for qemu-devel@nongnu.org; Mon, 29 Jul 2013 10:49:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59149) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3ol0-0002Lc-6Q for qemu-devel@nongnu.org; Mon, 29 Jul 2013 10:49:06 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r6TEn5NU004530 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 29 Jul 2013 10:49:05 -0400 Received: from dell-pet610-01.lab.eng.brq.redhat.com (dell-pet610-01.lab.eng.brq.redhat.com [10.34.42.20]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r6TEmevd028836; Mon, 29 Jul 2013 10:49:02 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Mon, 29 Jul 2013 16:47:56 +0200 Message-Id: <1375109277-25561-7-git-send-email-imammedo@redhat.com> In-Reply-To: <1375109277-25561-1-git-send-email-imammedo@redhat.com> References: <1375109277-25561-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: afaerber@suse.de, mst@redhat.com Subject: [Qemu-devel] [PATCH 6/7] qdev: Add SIZE type to qdev 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 From: Vasilis Liaskovitis This patch adds a 'SIZE' type property to qdev. Signed-off-by: Ian Molton Signed-off-by: Vasilis Liaskovitis Signed-off-by: Hu Tao Signed-off-by: Igor Mammedov --- v2: * ident fixes --- hw/core/qdev-properties.c | 55 ++++++++++++++++++++++++++++++++++++++++++ include/hw/qdev-properties.h | 3 ++ include/qemu/option.h | 2 + util/qemu-option.c | 4 +- 4 files changed, 62 insertions(+), 2 deletions(-) diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 3a324fb..26ad046 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -1134,3 +1134,58 @@ void qdev_prop_set_globals(DeviceState *dev, Error **errp) class = object_class_get_parent(class); } while (class); } + +/* --- 64bit unsigned int 'size' type --- */ + +static void get_size(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + DeviceState *dev = DEVICE(obj); + Property *prop = opaque; + uint64_t *ptr = qdev_get_prop_ptr(dev, prop); + + visit_type_size(v, ptr, name, errp); +} + +static void set_size(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + DeviceState *dev = DEVICE(obj); + Property *prop = opaque; + uint64_t *ptr = qdev_get_prop_ptr(dev, prop); + + visit_type_size(v, ptr, name, errp); +} + +static int parse_size(DeviceState *dev, Property *prop, const char *str) +{ + uint64_t *ptr = qdev_get_prop_ptr(dev, prop); + Error *errp = NULL; + + if (str != NULL) { + parse_option_size(prop->name, str, ptr, &errp); + } + assert_no_error(errp); + return 0; +} + +static int print_size(DeviceState *dev, Property *prop, char *dest, size_t len) +{ + uint64_t *ptr = qdev_get_prop_ptr(dev, prop); + char suffixes[] = {'T', 'G', 'M', 'K', 'B'}; + int i = 0; + uint64_t div; + + for (div = (long int)1 << 40; !(*ptr / div) ; div >>= 10) { + i++; + } + return snprintf(dest, len, "%0.03f%c", (double)*ptr/div, suffixes[i]); +} + +PropertyInfo qdev_prop_size = { + .name = "size", + .parse = parse_size, + .print = print_size, + .get = get_size, + .set = set_size, +}; diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h index 39448b7..692f82e 100644 --- a/include/hw/qdev-properties.h +++ b/include/hw/qdev-properties.h @@ -15,6 +15,7 @@ extern PropertyInfo qdev_prop_uint64; extern PropertyInfo qdev_prop_hex8; extern PropertyInfo qdev_prop_hex32; extern PropertyInfo qdev_prop_hex64; +extern PropertyInfo qdev_prop_size; extern PropertyInfo qdev_prop_string; extern PropertyInfo qdev_prop_chr; extern PropertyInfo qdev_prop_ptr; @@ -116,6 +117,8 @@ extern PropertyInfo qdev_prop_arraylen; DEFINE_PROP_DEFAULT(_n, _s, _f, _d, qdev_prop_hex32, uint32_t) #define DEFINE_PROP_HEX64(_n, _s, _f, _d) \ DEFINE_PROP_DEFAULT(_n, _s, _f, _d, qdev_prop_hex64, uint64_t) +#define DEFINE_PROP_SIZE(_n, _s, _f, _d) \ + DEFINE_PROP_DEFAULT(_n, _s, _f, _d, qdev_prop_size, uint64_t) #define DEFINE_PROP_PCI_DEVFN(_n, _s, _f, _d) \ DEFINE_PROP_DEFAULT(_n, _s, _f, _d, qdev_prop_pci_devfn, int32_t) diff --git a/include/qemu/option.h b/include/qemu/option.h index a83c700..39b8fe0 100644 --- a/include/qemu/option.h +++ b/include/qemu/option.h @@ -73,6 +73,8 @@ QEMUOptionParameter *append_option_parameters(QEMUOptionParameter *dest, QEMUOptionParameter *list); QEMUOptionParameter *parse_option_parameters(const char *param, QEMUOptionParameter *list, QEMUOptionParameter *dest); +void parse_option_size(const char *name, const char *value, + uint64_t *ret, Error **errp); void free_option_parameters(QEMUOptionParameter *list); void print_option_parameters(QEMUOptionParameter *list); void print_option_help(QEMUOptionParameter *list); diff --git a/util/qemu-option.c b/util/qemu-option.c index e0ef426..98c37f0 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -173,8 +173,8 @@ static void parse_option_number(const char *name, const char *value, } } -static void parse_option_size(const char *name, const char *value, - uint64_t *ret, Error **errp) +void parse_option_size(const char *name, const char *value, + uint64_t *ret, Error **errp) { char *postfix; double sizef;