do not interpolate % from vl.c to qemu-options.h Since qemu-options.h is only used in vl.c, we can avoid using brittle interpolation from a generated file. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: malc <av1474@comtv.ru>
diff --git a/qemu-options.hx b/qemu-options.hx index 4c1bcfb..2fa9ed4 100644 --- a/qemu-options.hx +++ b/qemu-options.hx
@@ -275,7 +275,8 @@ ETEXI DEF("m", HAS_ARG, QEMU_OPTION_m, - "-m megs set virtual RAM size to megs MB [default=%d]\n") + "-m megs set virtual RAM size to megs MB [default=" + stringify(DEFAULT_RAM_SIZE) "]\n") STEXI @item -m @var{megs} Set virtual RAM size to @var{megs} megabytes. Default is 128 MiB. Optionally, @@ -830,8 +831,8 @@ #else "-net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile][,sndbuf=nbytes][,vnet_hdr=on|off]\n" " connect the host TAP network interface to VLAN 'n' and use the\n" - " network scripts 'file' (default=%s)\n" - " and 'dfile' (default=%s)\n" + " network scripts 'file' (default=" DEFAULT_NETWORK_SCRIPT ")\n" + " and 'dfile' (default=" DEFAULT_NETWORK_DOWN_SCRIPT ")\n" " use '[down]script=no' to disable script execution\n" " use 'fd=h' to connect to an already opened TAP interface\n" " use 'sndbuf=nbytes' to limit the size of the send buffer (the\n" @@ -1664,7 +1665,7 @@ ETEXI DEF("s", 0, QEMU_OPTION_s, \ - "-s shorthand for -gdb tcp::%s\n") + "-s shorthand for -gdb tcp::" DEFAULT_GDBSTUB_PORT "\n") STEXI @item -s Shorthand for -gdb tcp::1234, i.e. open a gdbserver on TCP port 1234 @@ -1672,7 +1673,7 @@ ETEXI DEF("d", HAS_ARG, QEMU_OPTION_d, \ - "-d item1,... output log to %s (use -d ? for a list of log items)\n") + "-d item1,... output log to /tmp/qemu.log (use -d ? for a list of log items)\n") STEXI @item -d Output log in /tmp/qemu.log
diff --git a/vl.c b/vl.c index ea9a95c..92a31ba 100644 --- a/vl.c +++ b/vl.c
@@ -4041,14 +4041,7 @@ "\n" "When using -nographic, press 'ctrl-a h' to get some help.\n" , - "qemu", - DEFAULT_RAM_SIZE, -#ifndef _WIN32 - DEFAULT_NETWORK_SCRIPT, - DEFAULT_NETWORK_DOWN_SCRIPT, -#endif - DEFAULT_GDBSTUB_PORT, - "/tmp/qemu.log"); + "qemu"); exit(exitcode); }