[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v8 3/8] qdev-properties: blocksize: use same limits in code and d
From: |
Roman Kagan |
Subject: |
[PATCH v8 3/8] qdev-properties: blocksize: use same limits in code and description |
Date: |
Fri, 29 May 2020 01:55:11 +0300 |
Make it easier (more visible) to maintain the limits on the blocksize
properties in sync with the respective description, by using macros both
in the code and in the description.
Signed-off-by: Roman Kagan <rvkagan@yandex-team.ru>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
hw/core/qdev-properties.c | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index cc924815da..249dc69bd8 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -729,6 +729,13 @@ const PropertyInfo qdev_prop_pci_devfn = {
/* --- blocksize --- */
+/* lower limit is sector size */
+#define MIN_BLOCK_SIZE 512
+#define MIN_BLOCK_SIZE_STR stringify(MIN_BLOCK_SIZE)
+/* upper limit is the max power of 2 that fits in uint16_t */
+#define MAX_BLOCK_SIZE 32768
+#define MAX_BLOCK_SIZE_STR stringify(MAX_BLOCK_SIZE)
+
static void set_blocksize(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
@@ -736,8 +743,6 @@ static void set_blocksize(Object *obj, Visitor *v, const
char *name,
Property *prop = opaque;
uint16_t value, *ptr = qdev_get_prop_ptr(dev, prop);
Error *local_err = NULL;
- const int64_t min = 512;
- const int64_t max = 32768;
if (dev->realized) {
qdev_prop_set_after_realize(dev, name, errp);
@@ -750,9 +755,12 @@ static void set_blocksize(Object *obj, Visitor *v, const
char *name,
return;
}
/* value of 0 means "unset" */
- if (value && (value < min || value > max)) {
- error_setg(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE,
- dev->id ? : "", name, (int64_t)value, min, max);
+ if (value && (value < MIN_BLOCK_SIZE || value > MAX_BLOCK_SIZE)) {
+ error_setg(errp,
+ "Property %s.%s doesn't take value %" PRIu16
+ " (minimum: " MIN_BLOCK_SIZE_STR
+ ", maximum: " MAX_BLOCK_SIZE_STR ")",
+ dev->id ? : "", name, value);
return;
}
@@ -769,7 +777,8 @@ static void set_blocksize(Object *obj, Visitor *v, const
char *name,
const PropertyInfo qdev_prop_blocksize = {
.name = "uint16",
- .description = "A power of two between 512 and 32768",
+ .description = "A power of two between " MIN_BLOCK_SIZE_STR
+ " and " MAX_BLOCK_SIZE_STR,
.get = get_uint16,
.set = set_blocksize,
.set_default_value = set_default_value_uint,
--
2.26.2
- [PATCH v8 0/8] block: enhance handling of size-related BlockConf properties, Roman Kagan, 2020/05/28
- [PATCH v8 1/8] virtio-blk: store opt_io_size with correct size, Roman Kagan, 2020/05/28
- [PATCH v8 2/8] block: consolidate blocksize properties consistency checks, Roman Kagan, 2020/05/28
- [PATCH v8 3/8] qdev-properties: blocksize: use same limits in code and description,
Roman Kagan <=
- [PATCH v8 4/8] qdev-properties: add size32 property type, Roman Kagan, 2020/05/28
- [PATCH v8 5/8] qdev-properties: make blocksize accept size suffixes, Roman Kagan, 2020/05/28
- [PATCH v8 6/8] block: make BlockConf size props 32bit and accept size suffixes, Roman Kagan, 2020/05/28
- [PATCH v8 7/8] qdev-properties: add getter for size32 and blocksize, Roman Kagan, 2020/05/28
- [PATCH v8 8/8] block: lift blocksize property limit to 2 MiB, Roman Kagan, 2020/05/28