qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 3/6] block-helpers: rename check_logical_block_size() to check_bl


From: Stefan Hajnoczi
Subject: [PATCH 3/6] block-helpers: rename check_logical_block_size() to check_block_size()
Date: Fri, 19 Jun 2020 13:01:54 +0100

Block size checking is the same whether it's a physical, logical, or
other block size value. Use a more general name to show this function
can be used in other cases too (just like the qdev property that this
code originally comes from).

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 util/block-helpers.h      | 4 ++--
 hw/core/qdev-properties.c | 2 +-
 util/block-helpers.c      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/util/block-helpers.h b/util/block-helpers.h
index ec6421560c..b53295a529 100644
--- a/util/block-helpers.h
+++ b/util/block-helpers.h
@@ -13,7 +13,7 @@
 #define MAX_BLOCK_SIZE          (2 * MiB)
 #define MAX_BLOCK_SIZE_STR      "2 MiB"
 
-void check_logical_block_size(const char *id, const char *name, int64_t value,
-                     Error **errp);
+void check_block_size(const char *id, const char *name, int64_t value,
+                      Error **errp);
 
 #endif /* BLOCK_HELPERS_H */
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index 03981feb02..28a6d8b2ee 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -800,7 +800,7 @@ static void set_blocksize(Object *obj, Visitor *v, const 
char *name,
         error_propagate(errp, local_err);
         return;
     }
-    check_logical_block_size(dev->id ? : "", name, value, errp);
+    check_block_size(dev->id ? : "", name, value, errp);
     if (errp) {
         return;
     }
diff --git a/util/block-helpers.c b/util/block-helpers.c
index 9e68954c46..51d9d02c43 100644
--- a/util/block-helpers.c
+++ b/util/block-helpers.c
@@ -22,8 +22,8 @@
  *
  *  Moved from hw/core/qdev-properties.c:set_blocksize()
  */
-void check_logical_block_size(const char *id, const char *name, int64_t value,
-                     Error **errp)
+void check_block_size(const char *id, const char *name, int64_t value,
+                      Error **errp)
 {
     /* value of 0 means "unset" */
     if (value && (value < MIN_BLOCK_SIZE || value > MAX_BLOCK_SIZE)) {
-- 
2.26.2


reply via email to

[Prev in Thread] Current Thread [Next in Thread]