diff mbox series

[v2,19/22] qapi: Inline and remove QERR_PROPERTY_VALUE_OUT_OF_RANGE definition

Message ID 20231005045041.52649-20-philmd@linaro.org
State New
Headers show
Series qapi: Kill 'qapi/qmp/qerror.h' for good | expand

Commit Message

Philippe Mathieu-Daudé Oct. 5, 2023, 4:50 a.m. UTC 
Address the comment added in commit 4629ed1e98
("qerror: Finally unused, clean up"), from 2015:

  /*
   * These macros will go away, please don't use
   * in new code, and do not add new ones!
   */

Mechanical transformation using sed, manually
removing the definition in include/qapi/qmp/qerror.h.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 include/qapi/qmp/qerror.h |  3 ---
 hw/intc/openpic.c         |  3 ++-
 target/i386/cpu.c         | 12 ++++++++----
 util/block-helpers.c      |  3 ++-
 4 files changed, 12 insertions(+), 9 deletions(-)

Comments

Markus Armbruster Oct. 20, 2023, 1:08 p.m. UTC | #1 
Philippe Mathieu-Daudé <philmd@linaro.org> writes:

> Address the comment added in commit 4629ed1e98
> ("qerror: Finally unused, clean up"), from 2015:
>
>   /*
>    * These macros will go away, please don't use
>    * in new code, and do not add new ones!
>    */
>
> Mechanical transformation using sed, manually
> removing the definition in include/qapi/qmp/qerror.h.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>  include/qapi/qmp/qerror.h |  3 ---
>  hw/intc/openpic.c         |  3 ++-
>  target/i386/cpu.c         | 12 ++++++++----
>  util/block-helpers.c      |  3 ++-
>  4 files changed, 12 insertions(+), 9 deletions(-)
>
> diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h
> index 7862ac55a1..e094f13114 100644
> --- a/include/qapi/qmp/qerror.h
> +++ b/include/qapi/qmp/qerror.h
> @@ -17,9 +17,6 @@
>   * add new ones!
>   */
>  
> -#define QERR_PROPERTY_VALUE_OUT_OF_RANGE \
> -    "Property %s.%s doesn't take value %" PRId64 " (minimum: %" PRId64 ", maximum: %" PRId64 ")"
> -
>  #define QERR_QGA_COMMAND_FAILED \
>      "Guest agent command failed, error was '%s'"
>  
> diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c
> index a6f91d4bcd..4f6ee930e2 100644
> --- a/hw/intc/openpic.c
> +++ b/hw/intc/openpic.c
> @@ -1535,7 +1535,8 @@ static void openpic_realize(DeviceState *dev, Error **errp)
>      };
>  
>      if (opp->nb_cpus > MAX_CPU) {
> -        error_setg(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE,
> +        error_setg(errp, "Property %s.%s doesn't take value %" PRId64
> +                         " (minimum: %" PRId64 ", maximum: %" PRId64 ")",
>                     TYPE_OPENPIC, "nb_cpus", (uint64_t)opp->nb_cpus,
>                     (uint64_t)0, (uint64_t)MAX_CPU);
>          return;
> diff --git a/target/i386/cpu.c b/target/i386/cpu.c
> index e5a14885ed..273f865228 100644
> --- a/target/i386/cpu.c
> +++ b/target/i386/cpu.c
> @@ -5086,7 +5086,8 @@ static void x86_cpuid_version_set_family(Object *obj, Visitor *v,
>          return;
>      }
>      if (value < min || value > max) {
> -        error_setg(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE, "",
> +        error_setg(errp, "Property %s doesn't take value %" PRId64
> +                         " (minimum: %" PRId64 ", maximum: %" PRId64 ")",
>                     name ? name : "null", value, min, max);
>          return;
>      }
> @@ -5126,7 +5127,8 @@ static void x86_cpuid_version_set_model(Object *obj, Visitor *v,
>          return;
>      }
>      if (value < min || value > max) {
> -        error_setg(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE, "",
> +        error_setg(errp, "Property %s doesn't take value %" PRId64
> +                         " (minimum: %" PRId64 ", maximum: %" PRId64 ")",
>                     name ? name : "null", value, min, max);
>          return;
>      }
> @@ -5161,7 +5163,8 @@ static void x86_cpuid_version_set_stepping(Object *obj, Visitor *v,
>          return;
>      }
>      if (value < min || value > max) {
> -        error_setg(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE, "",
> +        error_setg(errp, "Property %s doesn't take value %" PRId64
> +                         " (minimum: %" PRId64 ", maximum: %" PRId64 ")",
>                     name ? name : "null", value, min, max);
>          return;
>      }
> @@ -5263,7 +5266,8 @@ static void x86_cpuid_set_tsc_freq(Object *obj, Visitor *v, const char *name,
>          return;
>      }
>      if (value < min || value > max) {
> -        error_setg(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE, "",
> +        error_setg(errp, "Property %s doesn't take value %" PRId64
> +                         " (minimum: %" PRId64 ", maximum: %" PRId64 ")",
>                     name ? name : "null", value, min, max);
>          return;
>      }
> diff --git a/util/block-helpers.c b/util/block-helpers.c
> index c4851432f5..de94909bc4 100644
> --- a/util/block-helpers.c
> +++ b/util/block-helpers.c
> @@ -30,7 +30,8 @@ void check_block_size(const char *id, const char *name, int64_t value,
>  {
>      /* value of 0 means "unset" */
>      if (value && (value < MIN_BLOCK_SIZE || value > MAX_BLOCK_SIZE)) {
> -        error_setg(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE,

Three callers:

* set_blocksize()

  Property setter.  Good.

* vu_blk_exp_create() and vduse_blk_exp_create()

  These check QMP arguments, i.e. *not* porperties.  Misuse of
  QERR_PROPERTY_VALUE_OUT_OF_RANGE.

> +        error_setg(errp, "Property %s.%s doesn't take value %" PRId64
> +                         " (minimum: %" PRId64 ", maximum: %" PRId64 ")",
>                     id, name, value, MIN_BLOCK_SIZE, MAX_BLOCK_SIZE);
>          return;
>      }
diff mbox series

Patch

diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h
index 7862ac55a1..e094f13114 100644
--- a/include/qapi/qmp/qerror.h
+++ b/include/qapi/qmp/qerror.h
@@ -17,9 +17,6 @@ 
  * add new ones!
  */
 
-#define QERR_PROPERTY_VALUE_OUT_OF_RANGE \
-    "Property %s.%s doesn't take value %" PRId64 " (minimum: %" PRId64 ", maximum: %" PRId64 ")"
-
 #define QERR_QGA_COMMAND_FAILED \
     "Guest agent command failed, error was '%s'"
 
diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c
index a6f91d4bcd..4f6ee930e2 100644
--- a/hw/intc/openpic.c
+++ b/hw/intc/openpic.c
@@ -1535,7 +1535,8 @@  static void openpic_realize(DeviceState *dev, Error **errp)
     };
 
     if (opp->nb_cpus > MAX_CPU) {
-        error_setg(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE,
+        error_setg(errp, "Property %s.%s doesn't take value %" PRId64
+                         " (minimum: %" PRId64 ", maximum: %" PRId64 ")",
                    TYPE_OPENPIC, "nb_cpus", (uint64_t)opp->nb_cpus,
                    (uint64_t)0, (uint64_t)MAX_CPU);
         return;
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index e5a14885ed..273f865228 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -5086,7 +5086,8 @@  static void x86_cpuid_version_set_family(Object *obj, Visitor *v,
         return;
     }
     if (value < min || value > max) {
-        error_setg(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE, "",
+        error_setg(errp, "Property %s doesn't take value %" PRId64
+                         " (minimum: %" PRId64 ", maximum: %" PRId64 ")",
                    name ? name : "null", value, min, max);
         return;
     }
@@ -5126,7 +5127,8 @@  static void x86_cpuid_version_set_model(Object *obj, Visitor *v,
         return;
     }
     if (value < min || value > max) {
-        error_setg(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE, "",
+        error_setg(errp, "Property %s doesn't take value %" PRId64
+                         " (minimum: %" PRId64 ", maximum: %" PRId64 ")",
                    name ? name : "null", value, min, max);
         return;
     }
@@ -5161,7 +5163,8 @@  static void x86_cpuid_version_set_stepping(Object *obj, Visitor *v,
         return;
     }
     if (value < min || value > max) {
-        error_setg(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE, "",
+        error_setg(errp, "Property %s doesn't take value %" PRId64
+                         " (minimum: %" PRId64 ", maximum: %" PRId64 ")",
                    name ? name : "null", value, min, max);
         return;
     }
@@ -5263,7 +5266,8 @@  static void x86_cpuid_set_tsc_freq(Object *obj, Visitor *v, const char *name,
         return;
     }
     if (value < min || value > max) {
-        error_setg(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE, "",
+        error_setg(errp, "Property %s doesn't take value %" PRId64
+                         " (minimum: %" PRId64 ", maximum: %" PRId64 ")",
                    name ? name : "null", value, min, max);
         return;
     }
diff --git a/util/block-helpers.c b/util/block-helpers.c
index c4851432f5..de94909bc4 100644
--- a/util/block-helpers.c
+++ b/util/block-helpers.c
@@ -30,7 +30,8 @@  void check_block_size(const char *id, const char *name, int64_t value,
 {
     /* value of 0 means "unset" */
     if (value && (value < MIN_BLOCK_SIZE || value > MAX_BLOCK_SIZE)) {
-        error_setg(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE,
+        error_setg(errp, "Property %s.%s doesn't take value %" PRId64
+                         " (minimum: %" PRId64 ", maximum: %" PRId64 ")",
                    id, name, value, MIN_BLOCK_SIZE, MAX_BLOCK_SIZE);
         return;
     }