@@ -2582,6 +2582,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)
@@ -2774,8 +2786,9 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon,
break;
case '-':
{
- int has_option;
- /* option */
+ const char *tmp = p;
+ int has_option, skip_key = 0;
+ /* option */
c = *typestr++;
if (c == '\0')
@@ -2785,15 +2798,24 @@ 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",
+ if(c != *p) {
+ if(!is_valid_option(p, typestr)) {
+
+ monitor_printf(mon, "%s: unsupported option -%c\n",
cmdname, *p);
- goto fail;
+ goto fail;
+ } else {
+ skip_key = 1;
+ }
}
- p++;
- has_option = 1;
+ if(skip_key) {
+ p = tmp;
+ } else {
+ p++;
+ has_option = 1;
+ }
}
- qdict_put(qdict, key, qint_from_int(has_option));
+ qdict_put(qdict, key, qint_from_int(has_option));
}
break;
default:
@@ -466,11 +466,13 @@ STEXI
Inject an NMI on the given CPU (x86 only).
ETEXI
- { "migrate", "detach:-d,uri:s", do_migrate,
- "[-d] uri", "migrate to URI (using -d to not wait for completion)" },
+ { "migrate", "detach:-d,blk:-b,inc:-i,uri:s", do_migrate,
+ "[-d] [-b] [-i] uri", "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)" },
STEXI
@item migrate [-d] @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
{ "migrate_cancel", "", do_migrate_cancel,