ret = -1;
goto done;
}
-
if (virConnectCheckStoreID(conn, (int) id) < 0)
continue;
ids[ret++] = (int) id;
}
}
-
done:
if ((t != NULL) && (conn->xshandle != NULL))
xs_transaction_end(conn->xshandle, t, 0);
if (!VIR_IS_CONNECTED_DOMAIN(domain))
return(NULL);
+ if (domain->conn->xshandle==NULL)
+ return(NULL);
snprintf(s, 255, "%s/%s", vm, name);
s[255] = 0;
}
/* then though the XenStore */
-
- t = xs_transaction_start(conn->xshandle);
- if (t == NULL)
- goto done;
-
- idlist = xs_directory(conn->xshandle, t, "/local/domain", &num);
- if (idlist == NULL)
- goto done;
-
- for (i = 0;i < num;i++) {
- id = strtol(idlist[i], &endptr, 10);
- if ((endptr == idlist[i]) || (*endptr != 0)) {
- goto done;
- }
- if (virConnectCheckStoreID(conn, (int) id) < 0)
- continue;
- snprintf(prop, 199, "/local/domain/%s/name", idlist[i]);
- prop[199] = 0;
- tmp = xs_read(conn->xshandle, t, prop, &len);
- if (tmp != NULL) {
- found = !strcmp(name, tmp);
- free(tmp);
- if (found)
- break;
- }
+ if (conn->xshandle != NULL) {
+ t = xs_transaction_start(conn->xshandle);
+ if (t == NULL)
+ goto done;
+
+ idlist = xs_directory(conn->xshandle, t, "/local/domain", &num);
+ if (idlist == NULL)
+ goto done;
+
+ for (i = 0;i < num;i++) {
+ id = strtol(idlist[i], &endptr, 10);
+ if ((endptr == idlist[i]) || (*endptr != 0)) {
+ goto done;
+ }
+ if (virConnectCheckStoreID(conn, (int) id) < 0)
+ continue;
+ snprintf(prop, 199, "/local/domain/%s/name", idlist[i]);
+ prop[199] = 0;
+ tmp = xs_read(conn->xshandle, t, prop, &len);
+ if (tmp != NULL) {
+ found = !strcmp(name, tmp);
+ free(tmp);
+ if (found)
+ break;
+ }
+ }
+ path = xs_get_domain_path(conn->xshandle, (unsigned int) id);
}
- path = xs_get_domain_path(conn->xshandle, (unsigned int) id);
do_found:
return(-1);
if (domain->conn->flags & VIR_CONNECT_RO)
return(-1);
+ if (domain->conn->xshandle==NULL)
+ return(-1);
ret = xenHypervisorSetMaxMemory(domain->conn->handle, domain->handle,
memory);
if (ret < 0)
* int_option = --optionname <number>
* string_option = --optionname <string>
*
- * keyword = [a-zA-Z]
- * number = [0-9]+
- * string = [^[:blank:]] | "[[:alnum:]]"$
+ * keyword = [a-zA-Z]
+ * number = [0-9]+
+ * string = [^[:blank:]] | "[[:alnum:]]"$
*
- * Note: only one <data> token per command is supported. It means:
- * "command aaa bbb" is unsupported and you have to use any option, like:
- * "command --aaa <data> bbb" or whatever.
*/
/*
};
static vshCmdOptDef opts_dstate[] = {
- { "domain", VSH_OT_DATA, 0, "domain name or id" },
+ { "domain", VSH_OT_DATA, VSH_OFLAG_REQ, "domain name or id" },
{ NULL, 0, 0, NULL }
};
};
static vshCmdOptDef opts_suspend[] = {
- { "domain", VSH_OT_DATA, 0, "domain name or id" },
+ { "domain", VSH_OT_DATA, VSH_OFLAG_REQ, "domain name or id" },
{ NULL, 0, 0, NULL }
};
* "save" command
*/
static vshCmdInfo info_save[] = {
- { "syntax", "save <domain> to <file>" },
+ { "syntax", "save <domain> <file>" },
{ "help", "save a domain state to a file" },
{ "desc", "Save a running domain." },
{ NULL, NULL }
};
static vshCmdOptDef opts_save[] = {
- { "file", VSH_OT_STRING, VSH_OFLAG_REQ, "where to save the data" },
- { "domain", VSH_OT_DATA, 0, "domain name or id" },
+ { "file", VSH_OT_DATA, VSH_OFLAG_REQ, "where to save the data" },
+ { "domain", VSH_OT_DATA, VSH_OFLAG_REQ, "domain name or id" },
{ NULL, 0, 0, NULL }
};
virDomainPtr dom;
char *name;
char *to;
- int found;
int ret = TRUE;
if (!vshConnectionUsability(ctl, ctl->conn, TRUE))
return FALSE;
- to = vshCommandOptString(cmd, "file", &found);
- if (!found)
+ if (!(to = vshCommandOptString(cmd, "file", NULL)))
return FALSE;
if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", &name)))
};
static vshCmdOptDef opts_restore[] = {
- { "file", VSH_OT_DATA, 0, "the state to restore" },
+ { "file", VSH_OT_DATA, VSH_OFLAG_REQ, "the state to restore" },
{ NULL, 0, 0, NULL }
};
};
static vshCmdOptDef opts_resume[] = {
- { "domain", VSH_OT_DATA, 0, "domain name or id" },
+ { "domain", VSH_OT_DATA, VSH_OFLAG_REQ, "domain name or id" },
{ NULL, 0, 0, NULL }
};
};
static vshCmdOptDef opts_shutdown[] = {
- { "domain", VSH_OT_DATA, 0, "domain name or id" },
+ { "domain", VSH_OT_DATA, VSH_OFLAG_REQ, "domain name or id" },
{ NULL, 0, 0, NULL }
};
};
static vshCmdOptDef opts_destroy[] = {
- { "domain", VSH_OT_DATA, 0, "domain name or id" },
+ { "domain", VSH_OT_DATA, VSH_OFLAG_REQ, "domain name or id" },
{ NULL, 0, 0, NULL }
};
};
static vshCmdOptDef opts_dinfo[] = {
- { "domain", VSH_OT_DATA, 0, "domain name or id" },
+ { "domain", VSH_OT_DATA, VSH_OFLAG_REQ, "domain name or id" },
{ NULL, 0, 0, NULL }
};
};
static vshCmdOptDef opts_dumpxml[] = {
- { "domain", VSH_OT_DATA, 0, "domain name or id" },
+ { "domain", VSH_OT_DATA, VSH_OFLAG_REQ, "domain name or id" },
{ NULL, 0, 0, NULL }
};
};
static vshCmdOptDef opts_nameof[] = {
- { "id", VSH_OT_DATA, 0, "domain Id" },
+ { "id", VSH_OT_DATA, VSH_OFLAG_REQ, "domain Id" },
{ NULL, 0, 0, NULL }
};
};
static vshCmdOptDef opts_idof[] = {
- { "name", VSH_OT_DATA, 0, "domain name" },
+ { "name", VSH_OT_DATA, VSH_OFLAG_REQ, "domain name" },
{ NULL, 0, 0, NULL }
};
}
static vshCmdOptDef *
-vshCmddefGetData(vshCmdDef *cmd) {
+vshCmddefGetData(vshCmdDef *cmd, int data_ct) {
vshCmdOptDef *opt;
- for (opt = cmd->opts; opt && opt->name; opt++)
- if (opt->type==VSH_OT_DATA)
- return opt;
+ for (opt = cmd->opts; opt && opt->name; opt++) {
+ if (opt->type==VSH_OT_DATA) {
+ if (data_ct==0)
+ return opt;
+ else
+ data_ct--;
+ }
+ }
return NULL;
}
+/*
+ * Checks for required options
+ */
+static int
+vshCommandCheckOpts(vshControl *ctl, vshCmd *cmd)
+{
+ vshCmdDef *def = cmd->def;
+ vshCmdOptDef *d;
+ int err=0;
+
+ for (d = def->opts; d && d->name; d++) {
+ if (d->flag & VSH_OFLAG_REQ) {
+ vshCmdOpt *o = cmd->opts;
+ int ok=0;
+
+ while(o && ok==0) {
+ if (o->def == d)
+ ok=1;
+ o = o->next;
+ }
+ if (!ok) {
+ vshError(ctl, FALSE,
+ d->type == VSH_OT_DATA ?
+ "command '%s' requires <%s> option" :
+ "command '%s' requires --%s option",
+ def->name, d->name);
+ err = 1;
+ }
+
+ }
+ }
+ return !err;
+}
+
static vshCmdDef *
vshCmddefSearch(const char *cmdname) {
vshCmdDef *c;
vshCmdOpt *arg = vshCommandOpt(cmd, name);
if (found)
*found = arg ? TRUE : FALSE;
- return arg ? arg->data : NULL;
+
+ return arg && arg->data && *arg->data ? arg->data : NULL;
}
/*
return vshCommandOpt(cmd, name) ? TRUE : FALSE;
}
+
static virDomainPtr
vshCommandOptDomain(vshControl *ctl, vshCmd *cmd, const char *optname, char **name) {
virDomainPtr dom = NULL;
return NULL;
}
+ vshPrint(ctl, VSH_DEBUG5, "%s: found option <%s>: %s\n", cmd->def->name, optname, n);
+
if (name)
*name = n;
/* try it by ID */
id = (int) strtol(n, &end, 10);
- if (id >= 0 && end && *end=='\0')
+ if (id >= 0 && end && *end=='\0') {
+ vshPrint(ctl, VSH_DEBUG5, "%s: <%s> seems like domain ID\n", cmd->def->name, optname);
dom = virDomainLookupByID(ctl->conn, id);
+ }
/* try it by NAME */
- if (!dom)
+ if (!dom) {
+ vshPrint(ctl, VSH_DEBUG5, "%s: <%s> tring as domain NAME\n", cmd->def->name, optname);
dom = virDomainLookupByName(ctl->conn, n);
-
+ }
if (!dom)
vshError(ctl, FALSE, "failed to get domain '%s'", n);
/* end of token is blank space or ';' */
if ((quote==FALSE && isblank((unsigned char) *p)) || *p==';')
break;
-
+
+ /* end of option name could be '=' */
+ if (tk==VSH_TK_OPTION && *p=='=') {
+ p++; /* skip '=' */
+ break;
+ }
+
if (tk==VSH_TK_NONE) {
if (*p=='-' && *(p+1)=='-' && *(p+2) && isalnum((unsigned char) *(p+2))) {
tk = VSH_TK_OPTION;
vshCmdOpt *last = NULL;
vshCmdDef *cmd = NULL;
int tk = VSH_TK_NONE;
+ int data_ct = 0;
first = NULL;
}
}
} else if (tk==VSH_TK_DATA) {
- if (!(opt = vshCmddefGetData(cmd))) {
+ if (!(opt = vshCmddefGetData(cmd, data_ct++))) {
vshError(ctl, FALSE,
"unexpected data '%s'",
tkdata);
c->def = cmd;
c->next = NULL;
+ if (!vshCommandCheckOpts(ctl, c))
+ goto syntaxError;
+
if (!ctl->cmd)
ctl->cmd = c;
if (clast)
if (argc < 2)
return TRUE;
- /* look for begin of command, for example:
+ /* look for begin of the command, for example:
* ./virsh --debug 5 -q command --cmdoption
* <--- ^ --->
* getopt() stuff | command suff
projects / people / liuw / libxenctrl-split / libvirt.git / commitdiff