[Qemu-devel] [PATCH] multiboot: Quote filename in error message.

[Qemu-devel] [PATCH] multiboot: Quote filename in error message.

[Adam Lackorzynski]

Quote filename in error message to spot possible whitespace character in
the filename.

Signed-off-by: Adam Lackorzynski <adam@os.inf.tu-dresden.de>
---
 hw/multiboot.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/multiboot.c b/hw/multiboot.c
index 0d2bfb4..6be6fa0 100644
--- a/hw/multiboot.c
+++ b/hw/multiboot.c
@@ -272,7 +272,7 @@ int load_multiboot(void *fw_cfg,
             mb_debug("multiboot loading module: %s\n", initrd_filename);
             mb_mod_length = get_image_size(initrd_filename);
             if (mb_mod_length < 0) {
-                fprintf(stderr, "failed to get %s image size\n", initrd_filename);
+                fprintf(stderr, "failed to get image size of '%s'\n", initrd_filename);
                 exit(1);
             }
 
-- 
1.7.4.1

Re: [Qemu-devel] [PATCH] multiboot: Quote filename in error message.

[Alexander Graf]

On 07.04.2011, at 20:22, Adam Lackorzynski wrote:

> Quote filename in error message to spot possible whitespace character in
> the filename.
> 
> Signed-off-by: Adam Lackorzynski <adam@os.inf.tu-dresden.de>
> ---
> hw/multiboot.c |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/hw/multiboot.c b/hw/multiboot.c
> index 0d2bfb4..6be6fa0 100644
> --- a/hw/multiboot.c
> +++ b/hw/multiboot.c
> @@ -272,7 +272,7 @@ int load_multiboot(void *fw_cfg,
>             mb_debug("multiboot loading module: %s\n", initrd_filename);
>             mb_mod_length = get_image_size(initrd_filename);
>             if (mb_mod_length < 0) {
> -                fprintf(stderr, "failed to get %s image size\n", initrd_filename);
> +                fprintf(stderr, "failed to get image size of '%s'\n", initrd_filename);

I'd like to see something telling the user that the most likely reason is that the file isn't there :). It might even make sense to only say "Failed to open file '%s'".


Alex

[Qemu-devel] [PATCH] multiboot: Quote filename in error message.

[Adam Lackorzynski]

Quote filename in error message to spot possible whitespace character in
the filename and make error message more meaningful.

Signed-off-by: Adam Lackorzynski <adam@os.inf.tu-dresden.de>
---
 hw/multiboot.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/multiboot.c b/hw/multiboot.c
index 0d2bfb4..394ed01 100644
--- a/hw/multiboot.c
+++ b/hw/multiboot.c
@@ -272,7 +272,7 @@ int load_multiboot(void *fw_cfg,
             mb_debug("multiboot loading module: %s\n", initrd_filename);
             mb_mod_length = get_image_size(initrd_filename);
             if (mb_mod_length < 0) {
-                fprintf(stderr, "failed to get %s image size\n", initrd_filename);
+                fprintf(stderr, "Failed to open file '%s'\n", initrd_filename);
                 exit(1);
             }
 
-- 
1.7.4.1

Re: [Qemu-devel] [PATCH] multiboot: Quote filename in error message.

[Adam Lackorzynski]

On Fri Apr 08, 2011 at 00:44:36 +0200, Alexander Graf wrote:
> 
> On 07.04.2011, at 20:22, Adam Lackorzynski wrote:
> 
> > Quote filename in error message to spot possible whitespace character in
> > the filename.
> > 
> > Signed-off-by: Adam Lackorzynski <adam@os.inf.tu-dresden.de>
> > ---
> > hw/multiboot.c |    2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > diff --git a/hw/multiboot.c b/hw/multiboot.c
> > index 0d2bfb4..6be6fa0 100644
> > --- a/hw/multiboot.c
> > +++ b/hw/multiboot.c
> > @@ -272,7 +272,7 @@ int load_multiboot(void *fw_cfg,
> >             mb_debug("multiboot loading module: %s\n", initrd_filename);
> >             mb_mod_length = get_image_size(initrd_filename);
> >             if (mb_mod_length < 0) {
> > -                fprintf(stderr, "failed to get %s image size\n", initrd_filename);
> > +                fprintf(stderr, "failed to get image size of '%s'\n", initrd_filename);
> 
> I'd like to see something telling the user that the most likely reason is that the file isn't there :). It might even make sense to only say "Failed to open file '%s'".

Looking at get_image_size() it's the right thing to do...



Adam
-- 
Adam                 adam@os.inf.tu-dresden.de
  Lackorzynski         http://os.inf.tu-dresden.de/~adam/

[Qemu-devel] Re: [PATCH] multiboot: Quote filename in error message.

[Alexander Graf]

Am 08.04.2011 um 08:48 schrieb Adam Lackorzynski <adam@os.inf.tu-dresden.de>:

> Quote filename in error message to spot possible whitespace character in
> the filename and make error message more meaningful.
> 
> Signed-off-by: Adam Lackorzynski <adam@os.inf.tu-dresden.de>

Acked-by: Alexander Graf <agraf@suse.de>

Alex

Re: [Qemu-devel] [PATCH] multiboot: Quote filename in error message.

[Stefan Hajnoczi]

On Fri, Apr 8, 2011 at 7:48 AM, Adam Lackorzynski
<adam@os.inf.tu-dresden.de> wrote:
> Quote filename in error message to spot possible whitespace character in
> the filename and make error message more meaningful.
>
> Signed-off-by: Adam Lackorzynski <adam@os.inf.tu-dresden.de>
> ---
>  hw/multiboot.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

Thanks!  Merged into the trivial patches tree at:
git://repo.or.cz/qemu/stefanha.git trivial-patches

A pull request will be sent to merge this into qemu.git.  For more info, see:
http://qemu.org/Contribute/TrivialPatches

Stefan