Revision 3f020d70

b/qemu-img.c
58 58
/* Please keep in synch with qemu-img.texi */
59 59
static void help(void)
60 60
{
61
    (printf)("qemu-img version " QEMU_VERSION ", Copyright (c) 2004-2008 Fabrice Bellard\n"
62
             "usage: qemu-img command [command options]\n"
63
             "QEMU disk image utility\n"
64
             "\n"
65
             "Command syntax:\n"
61
    printf("qemu-img version " QEMU_VERSION ", Copyright (c) 2004-2008 Fabrice Bellard\n"
62
           "usage: qemu-img command [command options]\n"
63
           "QEMU disk image utility\n"
64
           "\n"
65
           "Command syntax:\n"
66 66
#define DEF(option, callback, arg_string)        \
67 67
           "  " arg_string "\n"
68 68
#include "qemu-img-cmds.h"
69 69
#undef DEF
70 70
#undef GEN_DOCS
71
             "\n"
72
             "Command parameters:\n"
73
             "  'filename' is a disk image filename\n"
74
             "  'fmt' is the disk image format. It is guessed automatically in most cases\n"
75
             "  'size' is the disk image size in bytes. Optional suffixes\n"
76
             "    'k' or 'K' (kilobyte, 1024), 'M' (megabyte, 1024k), 'G' (gigabyte, 1024M)\n"
77
             "    and T (terabyte, 1024G) are supported. 'b' is ignored.\n"
78
             "  'output_filename' is the destination disk image filename\n"
79
             "  'output_fmt' is the destination format\n"
80
             "  'options' is a comma separated list of format specific options in a\n"
81
             "    name=value format. Use -o ? for an overview of the options supported by the\n"
82
             "    used format\n"
83
             "  '-c' indicates that target image must be compressed (qcow format only)\n"
84
             "  '-u' enables unsafe rebasing. It is assumed that old and new backing file\n"
85
             "       match exactly. The image doesn't need a working backing file before\n"
86
             "       rebasing in this case (useful for renaming the backing file)\n"
87
             "  '-h' with or without a command shows this help and lists the supported formats\n"
88
             "\n"
89
             "Parameters to snapshot subcommand:\n"
90
             "  'snapshot' is the name of the snapshot to create, apply or delete\n"
91
             "  '-a' applies a snapshot (revert disk to saved state)\n"
92
             "  '-c' creates a snapshot\n"
93
             "  '-d' deletes a snapshot\n"
94
             "  '-l' lists all snapshots in the given image\n"
95
        );
71
           "\n"
72
           "Command parameters:\n"
73
           "  'filename' is a disk image filename\n"
74
           "  'fmt' is the disk image format. It is guessed automatically in most cases\n"
75
           "  'size' is the disk image size in bytes. Optional suffixes\n"
76
           "    'k' or 'K' (kilobyte, 1024), 'M' (megabyte, 1024k), 'G' (gigabyte, 1024M)\n"
77
           "    and T (terabyte, 1024G) are supported. 'b' is ignored.\n"
78
           "  'output_filename' is the destination disk image filename\n"
79
           "  'output_fmt' is the destination format\n"
80
           "  'options' is a comma separated list of format specific options in a\n"
81
           "    name=value format. Use -o ? for an overview of the options supported by the\n"
82
           "    used format\n"
83
           "  '-c' indicates that target image must be compressed (qcow format only)\n"
84
           "  '-u' enables unsafe rebasing. It is assumed that old and new backing file\n"
85
           "       match exactly. The image doesn't need a working backing file before\n"
86
           "       rebasing in this case (useful for renaming the backing file)\n"
87
           "  '-h' with or without a command shows this help and lists the supported formats\n"
88
           "\n"
89
           "Parameters to snapshot subcommand:\n"
90
           "  'snapshot' is the name of the snapshot to create, apply or delete\n"
91
           "  '-a' applies a snapshot (revert disk to saved state)\n"
92
           "  '-c' creates a snapshot\n"
93
           "  '-d' deletes a snapshot\n"
94
           "  '-l' lists all snapshots in the given image\n"
95
           );
96 96
    printf("\nSupported formats:");
97 97
    bdrv_iterate_format(format_print, NULL);
98 98
    printf("\n");
b/readline.c
28 28
#define IS_ESC  1
29 29
#define IS_CSI  2
30 30

  
31
#ifdef printf
32
#undef printf
33
#endif
34

  
35 31
#define printf do_not_use_printf
36 32

  
37 33
void readline_show_prompt(ReadLineState *rs)
b/vl.c
4022 4022
static void help(int exitcode)
4023 4023
{
4024 4024
    version();
4025
    (printf)("usage: %s [options] [disk_image]\n"
4026
             "\n"
4027
             "'disk_image' is a raw hard image image for IDE hard disk 0\n"
4028
             "\n"
4025
    printf("usage: %s [options] [disk_image]\n"
4026
           "\n"
4027
           "'disk_image' is a raw hard image image for IDE hard disk 0\n"
4028
           "\n"
4029 4029
#define DEF(option, opt_arg, opt_enum, opt_help)        \
4030 4030
           opt_help
4031 4031
#define DEFHEADING(text) stringify(text) "\n"
......
4033 4033
#undef DEF
4034 4034
#undef DEFHEADING
4035 4035
#undef GEN_DOCS
4036
             "\n"
4037
             "During emulation, the following keys are useful:\n"
4038
             "ctrl-alt-f      toggle full screen\n"
4039
             "ctrl-alt-n      switch to virtual console 'n'\n"
4040
             "ctrl-alt        toggle mouse and keyboard grab\n"
4041
             "\n"
4042
             "When using -nographic, press 'ctrl-a h' to get some help.\n"
4043
             ,
4044
             "qemu",
4045
             DEFAULT_RAM_SIZE,
4036
           "\n"
4037
           "During emulation, the following keys are useful:\n"
4038
           "ctrl-alt-f      toggle full screen\n"
4039
           "ctrl-alt-n      switch to virtual console 'n'\n"
4040
           "ctrl-alt        toggle mouse and keyboard grab\n"
4041
           "\n"
4042
           "When using -nographic, press 'ctrl-a h' to get some help.\n"
4043
           ,
4044
           "qemu",
4045
           DEFAULT_RAM_SIZE,
4046 4046
#ifndef _WIN32
4047
             DEFAULT_NETWORK_SCRIPT,
4048
             DEFAULT_NETWORK_DOWN_SCRIPT,
4047
           DEFAULT_NETWORK_SCRIPT,
4048
           DEFAULT_NETWORK_DOWN_SCRIPT,
4049 4049
#endif
4050
             DEFAULT_GDBSTUB_PORT,
4051
             "/tmp/qemu.log");
4050
           DEFAULT_GDBSTUB_PORT,
4051
           "/tmp/qemu.log");
4052 4052
    exit(exitcode);
4053 4053
}
4054 4054

  

Also available in: Unified diff