Patchwork qemu: printf related build fixes

login
register
mail settings
Submitter Michael S. Tsirkin
Date March 2, 2010, 1:25 p.m.
Message ID <20100302132540.GA6681@redhat.com>
Download mbox | patch
Permalink /patch/46637/
State New
Headers show

Comments

Michael S. Tsirkin - March 2, 2010, 1:25 p.m.
Some versions of glibc (e.g. globc 2.5 that ships with rhel5.4)
make printf a macro. This makes using preprocessor within calls
to printf illegal. Move preprocessor use outside printf calls.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 qemu-img.c |    5 +++--
 readline.c |    1 +
 vl.c       |   16 +++++++++++-----
 3 files changed, 15 insertions(+), 7 deletions(-)
Michael S. Tsirkin - March 2, 2010, 3:29 p.m.
On Tue, Mar 02, 2010 at 03:25:40PM +0200, Michael S. Tsirkin wrote:
> Some versions of glibc (e.g. globc 2.5 that ships with rhel5.4)
> make printf a macro. This makes using preprocessor within calls
> to printf illegal. Move preprocessor use outside printf calls.
> 
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

Looks like this was solved differently meanwhile.
Pls disregard.

Patch

diff --git a/qemu-img.c b/qemu-img.c
index cbba4fc..435a9c1 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -58,7 +58,8 @@  static void format_print(void *opaque, const char *name)
 /* Please keep in synch with qemu-img.texi */
 static void help(void)
 {
-    printf("qemu-img version " QEMU_VERSION ", Copyright (c) 2004-2008 Fabrice Bellard\n"
+    const char h[] = 
+          ("qemu-img version " QEMU_VERSION ", Copyright (c) 2004-2008 Fabrice Bellard\n"
            "usage: qemu-img command [command options]\n"
            "QEMU disk image utility\n"
            "\n"
@@ -93,7 +94,7 @@  static void help(void)
            "  '-d' deletes a snapshot\n"
            "  '-l' lists all snapshots in the given image\n"
            );
-    printf("\nSupported formats:");
+    printf("%s\nSupported formats:", h);
     bdrv_iterate_format(format_print, NULL);
     printf("\n");
     exit(1);
diff --git a/readline.c b/readline.c
index 7834af0..92f9cd1 100644
--- a/readline.c
+++ b/readline.c
@@ -28,6 +28,7 @@ 
 #define IS_ESC  1
 #define IS_CSI  2
 
+#undef printf
 #define printf do_not_use_printf
 
 void readline_show_prompt(ReadLineState *rs)
diff --git a/vl.c b/vl.c
index 4ef6a78..7804001 100644
--- a/vl.c
+++ b/vl.c
@@ -4080,7 +4080,8 @@  static void version(void)
 static void help(int exitcode)
 {
     version();
-    printf("usage: %s [options] [disk_image]\n"
+    const char h[] =
+          ("usage: %s [options] [disk_image]\n"
            "\n"
            "'disk_image' is a raw hard image image for IDE hard disk 0\n"
            "\n"
@@ -4098,15 +4099,20 @@  static void help(int exitcode)
            "ctrl-alt        toggle mouse and keyboard grab\n"
            "\n"
            "When using -nographic, press 'ctrl-a h' to get some help.\n"
-           ,
-           "qemu",
-           DEFAULT_RAM_SIZE,
+           );
 #ifndef _WIN32
+    printf(h, "qemu",
+           DEFAULT_RAM_SIZE,
            DEFAULT_NETWORK_SCRIPT,
            DEFAULT_NETWORK_DOWN_SCRIPT,
-#endif
            DEFAULT_GDBSTUB_PORT,
            "/tmp/qemu.log");
+#else
+    printf(h, "qemu",
+           DEFAULT_RAM_SIZE,
+           DEFAULT_GDBSTUB_PORT,
+           "/tmp/qemu.log");
+#endif
     exit(exitcode);
 }