diff mbox

[v1,6/6] Convert error_report*_err() to warn_report*_err()

Message ID 9d26b170ca9768d20b4e7b70ce5d93d8063818c3.1499381754.git.alistair.francis@xilinx.com
State New
Headers show

Commit Message

Alistair Francis July 6, 2017, 11:49 p.m. UTC 
Convert all uses of error_report*_err("[Ww]arning:"... to use
warn_report*_err() instead. This helps standardise on a single
method of printing warnings to the user.

Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
---

 hw/core/qdev-properties.c | 2 +-
 hw/i386/pc.c              | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

Comments

Philippe Mathieu-Daudé July 7, 2017, 11:41 a.m. UTC | #1 
Hi Francis,

On 07/06/2017 08:49 PM, Alistair Francis wrote:
> Convert all uses of error_report*_err("[Ww]arning:"... to use

this is not the regex you used, maybe just use "Warning:"...

> warn_report*_err() instead. This helps standardise on a single

standardize? "Enforce single method ..."?

> method of printing warnings to the user.
> 
> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Richard Henderson <rth@twiddle.net>
> Cc: Eduardo Habkost <ehabkost@redhat.com>
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> ---
> 
>   hw/core/qdev-properties.c | 2 +-
>   hw/i386/pc.c              | 3 +--
>   2 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
> index f5983c83da..3d0bba21a2 100644
> --- a/hw/core/qdev-properties.c
> +++ b/hw/core/qdev-properties.c
> @@ -1169,7 +1169,7 @@ static void qdev_prop_set_globals_for_type(DeviceState *dev,
>                   error_propagate(prop->errp, err);
>               } else {
>                   assert(prop->user_provided);
> -                error_reportf_err(err, "Warning: ");
> +                warn_report_err(err);
>               }
>           }
>       }
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 58f8a4f4a5..5c2cc3f836 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -1320,8 +1320,7 @@ void pc_acpi_init(const char *default_dsdt)
>   
>           acpi_table_add_builtin(opts, &err);
>           if (err) {
> -            error_reportf_err(err, "WARNING: failed to load %s: ",
> -                              filename);
> +            warn_reportf_err(err, "failed to load %s: ", filename);
>           }
>           g_free(filename);
>       }
>
Eduardo Habkost July 7, 2017, 12:07 p.m. UTC | #2 
On Thu, Jul 06, 2017 at 04:49:54PM -0700, Alistair Francis wrote:
> Convert all uses of error_report*_err("[Ww]arning:"... to use
> warn_report*_err() instead. This helps standardise on a single
> method of printing warnings to the user.
> 
> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Richard Henderson <rth@twiddle.net>
> Cc: Eduardo Habkost <ehabkost@redhat.com>
> Cc: "Michael S. Tsirkin" <mst@redhat.com>

Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>

> ---
> 
>  hw/core/qdev-properties.c | 2 +-
>  hw/i386/pc.c              | 3 +--
>  2 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
> index f5983c83da..3d0bba21a2 100644
> --- a/hw/core/qdev-properties.c
> +++ b/hw/core/qdev-properties.c
> @@ -1169,7 +1169,7 @@ static void qdev_prop_set_globals_for_type(DeviceState *dev,
>                  error_propagate(prop->errp, err);
>              } else {
>                  assert(prop->user_provided);
> -                error_reportf_err(err, "Warning: ");
> +                warn_report_err(err);
>              }
>          }
>      }
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 58f8a4f4a5..5c2cc3f836 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -1320,8 +1320,7 @@ void pc_acpi_init(const char *default_dsdt)
>  
>          acpi_table_add_builtin(opts, &err);
>          if (err) {
> -            error_reportf_err(err, "WARNING: failed to load %s: ",
> -                              filename);
> +            warn_reportf_err(err, "failed to load %s: ", filename);
>          }
>          g_free(filename);
>      }
> -- 
> 2.11.0
>
diff mbox

Patch

diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index f5983c83da..3d0bba21a2 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -1169,7 +1169,7 @@  static void qdev_prop_set_globals_for_type(DeviceState *dev,
                 error_propagate(prop->errp, err);
             } else {
                 assert(prop->user_provided);
-                error_reportf_err(err, "Warning: ");
+                warn_report_err(err);
             }
         }
     }
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 58f8a4f4a5..5c2cc3f836 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1320,8 +1320,7 @@  void pc_acpi_init(const char *default_dsdt)
 
         acpi_table_add_builtin(opts, &err);
         if (err) {
-            error_reportf_err(err, "WARNING: failed to load %s: ",
-                              filename);
+            warn_reportf_err(err, "failed to load %s: ", filename);
         }
         g_free(filename);
     }