diff options
| -rw-r--r-- | monitor.c | 36 | ||||
| -rw-r--r-- | qemu-monitor.hx | 19 |
2 files changed, 42 insertions, 13 deletions
@@ -2908,6 +2908,18 @@ static int default_fmt_size = 4; #define MAX_ARGS 16 +static int is_valid_option(const char *c, const char *typestr) +{ + char option[3]; + + option[0] = '-'; + option[1] = *c; + option[2] = '\0'; + + typestr = strstr(typestr, option); + return (typestr != NULL); +} + static const mon_cmd_t *monitor_parse_command(Monitor *mon, const char *cmdline, QDict *qdict) @@ -3100,7 +3112,8 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon, break; case '-': { - int has_option; + const char *tmp = p; + int has_option, skip_key = 0; /* option */ c = *typestr++; @@ -3111,13 +3124,22 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon, has_option = 0; if (*p == '-') { p++; - if (*p != c) { - monitor_printf(mon, "%s: unsupported option -%c\n", - cmdname, *p); - goto fail; + if(c != *p) { + if(!is_valid_option(p, typestr)) { + + monitor_printf(mon, "%s: unsupported option -%c\n", + cmdname, *p); + goto fail; + } else { + skip_key = 1; + } + } + if(skip_key) { + p = tmp; + } else { + p++; + has_option = 1; } - p++; - has_option = 1; } qdict_put(qdict, key, qint_from_int(has_option)); } diff --git a/qemu-monitor.hx b/qemu-monitor.hx index bb01c14714..62e395bffd 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -724,16 +724,23 @@ ETEXI { .name = "migrate", - .args_type = "detach:-d,uri:s", - .params = "[-d] uri", - .help = "migrate to URI (using -d to not wait for completion)", - .user_print = monitor_user_noop, - .mhandler.cmd_new = do_migrate, + .args_type = "detach:-d,blk:-b,inc:-i,uri:s", + .params = "[-d] [-b] [-i] uri", + .help = "migrate to URI (using -d to not wait for completion)" + "\n\t\t\t -b for migration without shared storage with" + " full copy of disk\n\t\t\t -i for migration without " + "shared storage with incremental copy of disk " + "(base image shared between src and destination)", + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_migrate, }, + STEXI -@item migrate [-d] @var{uri} +@item migrate [-d] [-b] [-i] @var{uri} Migrate to @var{uri} (using -d to not wait for completion). + -b for migration with full copy of disk + -i for migration with incremental copy of disk (base image is shared) ETEXI { |