|
|
0a122b |
From 6f520cfdd487bc2c8032b61ff48706a65345bad5 Mon Sep 17 00:00:00 2001
|
|
|
0a122b |
Message-Id: <6f520cfdd487bc2c8032b61ff48706a65345bad5.1387298827.git.minovotn@redhat.com>
|
|
|
0a122b |
In-Reply-To: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com>
|
|
|
0a122b |
References: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com>
|
|
|
0a122b |
From: "Michael S. Tsirkin" <mst@redhat.com>
|
|
|
0a122b |
Date: Tue, 17 Dec 2013 15:16:58 +0100
|
|
|
0a122b |
Subject: [PATCH 04/56] qdev: Add SIZE type to qdev properties
|
|
|
0a122b |
MIME-Version: 1.0
|
|
|
0a122b |
Content-Type: text/plain; charset=UTF-8
|
|
|
0a122b |
Content-Transfer-Encoding: 8bit
|
|
|
0a122b |
|
|
|
0a122b |
RH-Author: Michael S. Tsirkin <mst@redhat.com>
|
|
|
0a122b |
Message-id: <1387293161-4085-5-git-send-email-mst@redhat.com>
|
|
|
0a122b |
Patchwork-id: 56309
|
|
|
0a122b |
O-Subject: [PATCH qemu-kvm RHEL7.0 v2 04/57] qdev: Add SIZE type to qdev properties
|
|
|
0a122b |
Bugzilla: 1034876
|
|
|
0a122b |
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
0a122b |
RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com>
|
|
|
0a122b |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
0a122b |
|
|
|
0a122b |
From: Vasilis Liaskovitis <vasilis.liaskovitis@profitbricks.com>
|
|
|
0a122b |
|
|
|
0a122b |
This patch adds a 'SIZE' type property to qdev.
|
|
|
0a122b |
|
|
|
0a122b |
Signed-off-by: Ian Molton <ian.molton@collabora.co.uk>
|
|
|
0a122b |
Signed-off-by: Vasilis Liaskovitis <vasilis.liaskovitis@profitbricks.com>
|
|
|
0a122b |
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
|
|
|
0a122b |
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
0a122b |
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
0a122b |
Reviewed-by: Andreas Färber <afaerber@suse.de>
|
|
|
0a122b |
Message-id: 1375109277-25561-7-git-send-email-imammedo@redhat.com
|
|
|
0a122b |
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
|
|
|
0a122b |
(cherry picked from commit e8cd45c78f53501e75bd455140da63d1b7ed3685)
|
|
|
0a122b |
---
|
|
|
0a122b |
include/hw/qdev-properties.h | 3 +++
|
|
|
0a122b |
include/qemu/option.h | 2 ++
|
|
|
0a122b |
hw/core/qdev-properties.c | 55 ++++++++++++++++++++++++++++++++++++++++++++
|
|
|
0a122b |
util/qemu-option.c | 4 ++--
|
|
|
0a122b |
4 files changed, 62 insertions(+), 2 deletions(-)
|
|
|
0a122b |
|
|
|
0a122b |
Signed-off-by: Michal Novotny <minovotn@redhat.com>
|
|
|
0a122b |
---
|
|
|
0a122b |
hw/core/qdev-properties.c | 55 ++++++++++++++++++++++++++++++++++++++++++++
|
|
|
0a122b |
include/hw/qdev-properties.h | 3 +++
|
|
|
0a122b |
include/qemu/option.h | 2 ++
|
|
|
0a122b |
util/qemu-option.c | 4 ++--
|
|
|
0a122b |
4 files changed, 62 insertions(+), 2 deletions(-)
|
|
|
0a122b |
|
|
|
0a122b |
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
|
|
|
0a122b |
index 6e1ed1e..8d43a8d 100644
|
|
|
0a122b |
--- a/hw/core/qdev-properties.c
|
|
|
0a122b |
+++ b/hw/core/qdev-properties.c
|
|
|
0a122b |
@@ -1135,3 +1135,58 @@ void qdev_prop_set_globals(DeviceState *dev, Error **errp)
|
|
|
0a122b |
class = object_class_get_parent(class);
|
|
|
0a122b |
} while (class);
|
|
|
0a122b |
}
|
|
|
0a122b |
+
|
|
|
0a122b |
+/* --- 64bit unsigned int 'size' type --- */
|
|
|
0a122b |
+
|
|
|
0a122b |
+static void get_size(Object *obj, Visitor *v, void *opaque,
|
|
|
0a122b |
+ const char *name, Error **errp)
|
|
|
0a122b |
+{
|
|
|
0a122b |
+ DeviceState *dev = DEVICE(obj);
|
|
|
0a122b |
+ Property *prop = opaque;
|
|
|
0a122b |
+ uint64_t *ptr = qdev_get_prop_ptr(dev, prop);
|
|
|
0a122b |
+
|
|
|
0a122b |
+ visit_type_size(v, ptr, name, errp);
|
|
|
0a122b |
+}
|
|
|
0a122b |
+
|
|
|
0a122b |
+static void set_size(Object *obj, Visitor *v, void *opaque,
|
|
|
0a122b |
+ const char *name, Error **errp)
|
|
|
0a122b |
+{
|
|
|
0a122b |
+ DeviceState *dev = DEVICE(obj);
|
|
|
0a122b |
+ Property *prop = opaque;
|
|
|
0a122b |
+ uint64_t *ptr = qdev_get_prop_ptr(dev, prop);
|
|
|
0a122b |
+
|
|
|
0a122b |
+ visit_type_size(v, ptr, name, errp);
|
|
|
0a122b |
+}
|
|
|
0a122b |
+
|
|
|
0a122b |
+static int parse_size(DeviceState *dev, Property *prop, const char *str)
|
|
|
0a122b |
+{
|
|
|
0a122b |
+ uint64_t *ptr = qdev_get_prop_ptr(dev, prop);
|
|
|
0a122b |
+ Error *errp = NULL;
|
|
|
0a122b |
+
|
|
|
0a122b |
+ if (str != NULL) {
|
|
|
0a122b |
+ parse_option_size(prop->name, str, ptr, &errp);
|
|
|
0a122b |
+ }
|
|
|
0a122b |
+ assert_no_error(errp);
|
|
|
0a122b |
+ return 0;
|
|
|
0a122b |
+}
|
|
|
0a122b |
+
|
|
|
0a122b |
+static int print_size(DeviceState *dev, Property *prop, char *dest, size_t len)
|
|
|
0a122b |
+{
|
|
|
0a122b |
+ uint64_t *ptr = qdev_get_prop_ptr(dev, prop);
|
|
|
0a122b |
+ char suffixes[] = {'T', 'G', 'M', 'K', 'B'};
|
|
|
0a122b |
+ int i = 0;
|
|
|
0a122b |
+ uint64_t div;
|
|
|
0a122b |
+
|
|
|
0a122b |
+ for (div = (long int)1 << 40; !(*ptr / div) ; div >>= 10) {
|
|
|
0a122b |
+ i++;
|
|
|
0a122b |
+ }
|
|
|
0a122b |
+ return snprintf(dest, len, "%0.03f%c", (double)*ptr/div, suffixes[i]);
|
|
|
0a122b |
+}
|
|
|
0a122b |
+
|
|
|
0a122b |
+PropertyInfo qdev_prop_size = {
|
|
|
0a122b |
+ .name = "size",
|
|
|
0a122b |
+ .parse = parse_size,
|
|
|
0a122b |
+ .print = print_size,
|
|
|
0a122b |
+ .get = get_size,
|
|
|
0a122b |
+ .set = set_size,
|
|
|
0a122b |
+};
|
|
|
0a122b |
diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h
|
|
|
0a122b |
index 39448b7..692f82e 100644
|
|
|
0a122b |
--- a/include/hw/qdev-properties.h
|
|
|
0a122b |
+++ b/include/hw/qdev-properties.h
|
|
|
0a122b |
@@ -15,6 +15,7 @@ extern PropertyInfo qdev_prop_uint64;
|
|
|
0a122b |
extern PropertyInfo qdev_prop_hex8;
|
|
|
0a122b |
extern PropertyInfo qdev_prop_hex32;
|
|
|
0a122b |
extern PropertyInfo qdev_prop_hex64;
|
|
|
0a122b |
+extern PropertyInfo qdev_prop_size;
|
|
|
0a122b |
extern PropertyInfo qdev_prop_string;
|
|
|
0a122b |
extern PropertyInfo qdev_prop_chr;
|
|
|
0a122b |
extern PropertyInfo qdev_prop_ptr;
|
|
|
0a122b |
@@ -116,6 +117,8 @@ extern PropertyInfo qdev_prop_arraylen;
|
|
|
0a122b |
DEFINE_PROP_DEFAULT(_n, _s, _f, _d, qdev_prop_hex32, uint32_t)
|
|
|
0a122b |
#define DEFINE_PROP_HEX64(_n, _s, _f, _d) \
|
|
|
0a122b |
DEFINE_PROP_DEFAULT(_n, _s, _f, _d, qdev_prop_hex64, uint64_t)
|
|
|
0a122b |
+#define DEFINE_PROP_SIZE(_n, _s, _f, _d) \
|
|
|
0a122b |
+ DEFINE_PROP_DEFAULT(_n, _s, _f, _d, qdev_prop_size, uint64_t)
|
|
|
0a122b |
#define DEFINE_PROP_PCI_DEVFN(_n, _s, _f, _d) \
|
|
|
0a122b |
DEFINE_PROP_DEFAULT(_n, _s, _f, _d, qdev_prop_pci_devfn, int32_t)
|
|
|
0a122b |
|
|
|
0a122b |
diff --git a/include/qemu/option.h b/include/qemu/option.h
|
|
|
0a122b |
index f5ebb05..96f70b6 100644
|
|
|
0a122b |
--- a/include/qemu/option.h
|
|
|
0a122b |
+++ b/include/qemu/option.h
|
|
|
0a122b |
@@ -73,6 +73,8 @@ QEMUOptionParameter *append_option_parameters(QEMUOptionParameter *dest,
|
|
|
0a122b |
QEMUOptionParameter *list);
|
|
|
0a122b |
QEMUOptionParameter *parse_option_parameters(const char *param,
|
|
|
0a122b |
QEMUOptionParameter *list, QEMUOptionParameter *dest);
|
|
|
0a122b |
+void parse_option_size(const char *name, const char *value,
|
|
|
0a122b |
+ uint64_t *ret, Error **errp);
|
|
|
0a122b |
void free_option_parameters(QEMUOptionParameter *list);
|
|
|
0a122b |
void print_option_parameters(QEMUOptionParameter *list);
|
|
|
0a122b |
void print_option_help(QEMUOptionParameter *list);
|
|
|
0a122b |
diff --git a/util/qemu-option.c b/util/qemu-option.c
|
|
|
0a122b |
index fcbd1b8..1cefbfe 100644
|
|
|
0a122b |
--- a/util/qemu-option.c
|
|
|
0a122b |
+++ b/util/qemu-option.c
|
|
|
0a122b |
@@ -173,8 +173,8 @@ static void parse_option_number(const char *name, const char *value,
|
|
|
0a122b |
}
|
|
|
0a122b |
}
|
|
|
0a122b |
|
|
|
0a122b |
-static void parse_option_size(const char *name, const char *value,
|
|
|
0a122b |
- uint64_t *ret, Error **errp)
|
|
|
0a122b |
+void parse_option_size(const char *name, const char *value,
|
|
|
0a122b |
+ uint64_t *ret, Error **errp)
|
|
|
0a122b |
{
|
|
|
0a122b |
char *postfix;
|
|
|
0a122b |
double sizef;
|
|
|
0a122b |
--
|
|
|
0a122b |
1.7.11.7
|
|
|
0a122b |
|