[Qemu-devel] [PATCH] hw/ppc/pnv: Remove superfluous "qemu" prefix from error strings

[Qemu-devel] [PATCH] hw/ppc/pnv: Remove superfluous "qemu" prefix from error strings

[Thomas Huth]

error_report() already puts a prefix with the program name in front
of the error strings, so the "qemu:" prefix is not necessary here
anymore.

Reported-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 hw/ppc/pnv.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index 4fab5c0..09f0d22 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -381,7 +381,7 @@ static void ppc_powernv_init(MachineState *machine)
 
     fw_size = load_image_targphys(fw_filename, FW_LOAD_ADDR, FW_MAX_SIZE);
     if (fw_size < 0) {
-        error_report("qemu: could not load OPAL '%s'", fw_filename);
+        error_report("Could not load OPAL '%s'", fw_filename);
         exit(1);
     }
     g_free(fw_filename);
@@ -393,7 +393,7 @@ static void ppc_powernv_init(MachineState *machine)
         kernel_size = load_image_targphys(machine->kernel_filename,
                                           KERNEL_LOAD_ADDR, 0x2000000);
         if (kernel_size < 0) {
-            error_report("qemu: could not load kernel'%s'",
+            error_report("Could not load kernel '%s'",
                          machine->kernel_filename);
             exit(1);
         }
@@ -405,7 +405,7 @@ static void ppc_powernv_init(MachineState *machine)
         pnv->initrd_size = load_image_targphys(machine->initrd_filename,
                                   pnv->initrd_base, 0x10000000); /* 128MB max */
         if (pnv->initrd_size < 0) {
-            error_report("qemu: could not load initial ram disk '%s'",
+            error_report("Could not load initial ram disk '%s'",
                          machine->initrd_filename);
             exit(1);
         }
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH] hw/ppc/pnv: Remove superfluous "qemu" prefix from error strings

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 2144 bytes --]

On Wed, Feb 08, 2017 at 07:31:57PM +0100, Thomas Huth wrote:
> error_report() already puts a prefix with the program name in front
> of the error strings, so the "qemu:" prefix is not necessary here
> anymore.
> 
> Reported-by: Markus Armbruster <armbru@redhat.com>
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Applied to ppc-for-2.9, thanks.

> ---
>  hw/ppc/pnv.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
> index 4fab5c0..09f0d22 100644
> --- a/hw/ppc/pnv.c
> +++ b/hw/ppc/pnv.c
> @@ -381,7 +381,7 @@ static void ppc_powernv_init(MachineState *machine)
>  
>      fw_size = load_image_targphys(fw_filename, FW_LOAD_ADDR, FW_MAX_SIZE);
>      if (fw_size < 0) {
> -        error_report("qemu: could not load OPAL '%s'", fw_filename);
> +        error_report("Could not load OPAL '%s'", fw_filename);
>          exit(1);
>      }
>      g_free(fw_filename);
> @@ -393,7 +393,7 @@ static void ppc_powernv_init(MachineState *machine)
>          kernel_size = load_image_targphys(machine->kernel_filename,
>                                            KERNEL_LOAD_ADDR, 0x2000000);
>          if (kernel_size < 0) {
> -            error_report("qemu: could not load kernel'%s'",
> +            error_report("Could not load kernel '%s'",
>                           machine->kernel_filename);
>              exit(1);
>          }
> @@ -405,7 +405,7 @@ static void ppc_powernv_init(MachineState *machine)
>          pnv->initrd_size = load_image_targphys(machine->initrd_filename,
>                                    pnv->initrd_base, 0x10000000); /* 128MB max */
>          if (pnv->initrd_size < 0) {
> -            error_report("qemu: could not load initial ram disk '%s'",
> +            error_report("Could not load initial ram disk '%s'",
>                           machine->initrd_filename);
>              exit(1);
>          }

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]