[Qemu-devel] [PATCH] Fix crash at startup

[Qemu-devel] [PATCH] Fix crash at startup

[Lionel Landwerlin]

Fix crash at startup

Signed-off-by: Lionel Landwerlin <lionel.landwerlin@openwide.fr>
---
 exec.c |   3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/exec.c b/exec.c
index faa6333..7c9d7dc 100644
--- a/exec.c
+++ b/exec.c
@@ -2066,2 +2066,2 @@ void page_dump(FILE *f)
     int i, j, prot, prot1;
     PageDesc *p;

+    if (!f)
+        return;
+
     fprintf(f, "%-8s %-8s %-8s %s\n",
             "start", "end", "size", "prot");
     start = -1;
--
1.5.6.5

Re: [Qemu-devel] [PATCH] Fix crash at startup

[Laurent Desnogues]

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

On Mon, Jan 19, 2009 at 7:58 AM, Lionel Landwerlin
<lionel.landwerlin@openwide.fr> wrote:
> Fix crash at startup
>
> Signed-off-by: Lionel Landwerlin <lionel.landwerlin@openwide.fr>
> ---
>  exec.c |   3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/exec.c b/exec.c
> index faa6333..7c9d7dc 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -2066,2 +2066,2 @@ void page_dump(FILE *f)
>     int i, j, prot, prot1;
>     PageDesc *p;
>
> +    if (!f)
> +        return;
> +

I would prefer a slightly different approach like the attached patch,
but that's just personal taste :-)


Laurent

Signed-off-by: Laurent Desnogues <laurent.desnogues@gmail.com>

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: log.patch --]
[-- Type: text/x-patch; name=log.patch, Size: 478 bytes --]

Index: qemu-log.h
===================================================================
--- qemu-log.h	(revision 6367)
+++ qemu-log.h	(working copy)
@@ -63,10 +63,12 @@
         disas(logfile, (start), (len))
 
 /* page_dump() output to the log file: */
-#define log_page_dump() page_dump(logfile)
+#define log_page_dump() do {     \
+        if (logfile)             \
+            page_dump(logfile);  \
+    } while (0)
 
 
-
 /* Maintenance: */
 
 /* fflush() the log file */