From a1620fac3d267b67921d0e3e3c0e42dff22ec49d Mon Sep 17 00:00:00 2001 From: aurel32 Date: Tue, 29 Apr 2008 05:58:01 +0000 Subject: [PATCH] =?utf8?q?Describe=20the=20format=3D=20option=20in=20the?= =?utf8?q?=20--help=20output.=20List=20the=20accepted=20values=20with=20fo?= =?utf8?q?rmat=3D=3F.?= git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4279 c046a42c-6fe2-441c-8c8c-71466251a162 --- vl.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/vl.c b/vl.c index 983c438261..648b36e432 100644 --- a/vl.c +++ b/vl.c @@ -4949,6 +4949,11 @@ int drive_get_max_bus(BlockInterfaceType type) return max_bus; } +static void bdrv_format_print(void *opaque, const char *name) +{ + fprintf(stderr, " %s", name); +} + static int drive_init(struct drive_opt *arg, int snapshot, QEMUMachine *machine) { @@ -5138,6 +5143,12 @@ static int drive_init(struct drive_opt *arg, int snapshot, } if (get_param_value(buf, sizeof(buf), "format", str)) { + if (strcmp(buf, "?") == 0) { + fprintf(stderr, "qemu: Supported formats:"); + bdrv_iterate_format(bdrv_format_print, NULL); + fprintf(stderr, "\n"); + return -1; + } drv = bdrv_find_format(buf); if (!drv) { fprintf(stderr, "qemu: '%s' invalid format\n", buf); @@ -7634,9 +7645,9 @@ static void help(int exitcode) "-hda/-hdb file use 'file' as IDE hard disk 0/1 image\n" "-hdc/-hdd file use 'file' as IDE hard disk 2/3 image\n" "-cdrom file use 'file' as IDE cdrom image (cdrom is ide1 master)\n" - "-drive [file=file][,if=type][,bus=n][,unit=m][,media=d][index=i]\n" - " [,cyls=c,heads=h,secs=s[,trans=t]][snapshot=on|off]" - " [,cache=on|off]\n" + "-drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i]\n" + " [,cyls=c,heads=h,secs=s[,trans=t]][,snapshot=on|off]\n" + " [,cache=on|off][,format=f]\n" " use 'file' as a drive image\n" "-mtdblock file use 'file' as on-board Flash memory image\n" "-sd file use 'file' as SecureDigital card image\n" -- 2.11.0