Shorten the function name as there isn't any vshCommandOptString. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tools/virsh-backup.c | 4 +- tools/virsh-checkpoint.c | 8 +- tools/virsh-completer-domain.c | 2 +- tools/virsh-completer-host.c | 8 +- tools/virsh-domain-event.c | 2 +- tools/virsh-domain-monitor.c | 10 +- tools/virsh-domain.c | 248 ++++++++++++++++----------------- tools/virsh-host.c | 40 +++--- tools/virsh-interface.c | 6 +- tools/virsh-network.c | 26 ++-- tools/virsh-nodedev.c | 30 ++-- tools/virsh-nwfilter.c | 8 +- tools/virsh-pool.c | 64 ++++----- tools/virsh-secret.c | 10 +- tools/virsh-snapshot.c | 14 +- tools/virsh-util.c | 2 +- tools/virsh-volume.c | 29 ++-- tools/virsh.c | 2 +- tools/virt-admin.c | 22 +-- tools/vsh.c | 10 +- tools/vsh.h | 2 +- 21 files changed, 273 insertions(+), 274 deletions(-) diff --git a/tools/virsh-backup.c b/tools/virsh-backup.c index 9a1e89760f..27777eea74 100644 --- a/tools/virsh-backup.c +++ b/tools/virsh-backup.c @@ -68,7 +68,7 @@ cmdBackupBegin(vshControl *ctl, if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptStringReq(ctl, cmd, "backupxml", &backup_from) < 0) + if (vshCommandOptString(ctl, cmd, "backupxml", &backup_from) < 0) return false; if (!backup_from) { @@ -80,7 +80,7 @@ cmdBackupBegin(vshControl *ctl, } } - if (vshCommandOptStringReq(ctl, cmd, "checkpointxml", &check_from) < 0) + if (vshCommandOptString(ctl, cmd, "checkpointxml", &check_from) < 0) return false; if (check_from) { if (virFileReadAll(check_from, VSH_MAX_XML_FILE, &check_buffer) < 0) { diff --git a/tools/virsh-checkpoint.c b/tools/virsh-checkpoint.c index e3fd6b2df2..fea6b4fb4b 100644 --- a/tools/virsh-checkpoint.c +++ b/tools/virsh-checkpoint.c @@ -121,7 +121,7 @@ cmdCheckpointCreate(vshControl *ctl, if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptStringReq(ctl, cmd, "xmlfile", &from) < 0) + if (vshCommandOptString(ctl, cmd, "xmlfile", &from) < 0) return false; if (!from) { buffer = g_strdup("<domaincheckpoint/>"); @@ -234,8 +234,8 @@ cmdCheckpointCreateAs(vshControl *ctl, if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptStringReq(ctl, cmd, "name", &name) < 0 || - vshCommandOptStringReq(ctl, cmd, "description", &desc) < 0) + if (vshCommandOptString(ctl, cmd, "name", &name) < 0 || + vshCommandOptString(ctl, cmd, "description", &desc) < 0) return false; virBufferAddLit(&buf, "<domaincheckpoint>\n"); @@ -281,7 +281,7 @@ virshLookupCheckpoint(vshControl *ctl, { const char *chkname = NULL; - if (vshCommandOptStringReq(ctl, cmd, arg, &chkname) < 0) + if (vshCommandOptString(ctl, cmd, arg, &chkname) < 0) return -1; if (!(*chk = virDomainCheckpointLookupByName(dom, chkname, 0))) diff --git a/tools/virsh-completer-domain.c b/tools/virsh-completer-domain.c index 2891d1399c..61362224a3 100644 --- a/tools/virsh-completer-domain.c +++ b/tools/virsh-completer-domain.c @@ -381,7 +381,7 @@ virshDomainInterfaceStateCompleter(vshControl *ctl, if (virshDomainGetXML(ctl, cmd, flags, &xml, &ctxt) < 0) return NULL; - if (vshCommandOptStringReq(ctl, cmd, "interface", &iface) < 0) + if (vshCommandOptString(ctl, cmd, "interface", &iface) < 0) return NULL; /* normalize the mac addr */ diff --git a/tools/virsh-completer-host.c b/tools/virsh-completer-host.c index 93b633eb64..78d2236f97 100644 --- a/tools/virsh-completer-host.c +++ b/tools/virsh-completer-host.c @@ -227,10 +227,10 @@ virshCPUModelCompleter(vshControl *ctl, virCheckFlags(0, NULL); - if (vshCommandOptStringReq(ctl, cmd, "virttype", &virttype) < 0 || - vshCommandOptStringReq(ctl, cmd, "emulator", &emulator) < 0 || - vshCommandOptStringReq(ctl, cmd, "arch", &arch) < 0 || - vshCommandOptStringReq(ctl, cmd, "machine", &machine) < 0) + if (vshCommandOptString(ctl, cmd, "virttype", &virttype) < 0 || + vshCommandOptString(ctl, cmd, "emulator", &emulator) < 0 || + vshCommandOptString(ctl, cmd, "arch", &arch) < 0 || + vshCommandOptString(ctl, cmd, "machine", &machine) < 0) return NULL; if (!priv->conn || virConnectIsAlive(priv->conn) <= 0) diff --git a/tools/virsh-domain-event.c b/tools/virsh-domain-event.c index 8bf57ade7a..cd33d4d938 100644 --- a/tools/virsh-domain-event.c +++ b/tools/virsh-domain-event.c @@ -927,7 +927,7 @@ cmdEvent(vshControl *ctl, const vshCmd *cmd) return true; } - if (vshCommandOptStringReq(ctl, cmd, "event", &eventName) < 0) + if (vshCommandOptString(ctl, cmd, "event", &eventName) < 0) return false; if (!eventName && !all) { diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 599ae71e7a..700f3ae094 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -765,7 +765,7 @@ cmdDomIfGetLink(vshControl *ctl, const vshCmd *cmd) int ninterfaces; unsigned int flags = 0; - if (vshCommandOptStringReq(ctl, cmd, "interface", &iface) < 0) + if (vshCommandOptString(ctl, cmd, "interface", &iface) < 0) return false; if (vshCommandOptBool(cmd, "config")) @@ -934,7 +934,7 @@ cmdDomblkstat(vshControl *ctl, const vshCmd *cmd) string to denote 'all devices'. A NULL device arg would violate API contract. */ - if (vshCommandOptStringReq(ctl, cmd, "device", &device) < 0) + if (vshCommandOptString(ctl, cmd, "device", &device) < 0) return false; if (!device) @@ -1058,7 +1058,7 @@ cmdDomIfstat(vshControl *ctl, const vshCmd *cmd) if (!(dom = virshCommandOptDomain(ctl, cmd, &name))) return false; - if (vshCommandOptStringReq(ctl, cmd, "interface", &device) < 0) + if (vshCommandOptString(ctl, cmd, "interface", &device) < 0) return false; if (virDomainInterfaceStats(dom, device, &stats, sizeof(stats)) == -1) { @@ -2254,9 +2254,9 @@ cmdDomIfAddr(vshControl *ctl, const vshCmd *cmd) const char *sourcestr = NULL; int source = VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE; - if (vshCommandOptStringReq(ctl, cmd, "interface", &ifacestr) < 0) + if (vshCommandOptString(ctl, cmd, "interface", &ifacestr) < 0) return false; - if (vshCommandOptStringReq(ctl, cmd, "source", &sourcestr) < 0) + if (vshCommandOptString(ctl, cmd, "source", &sourcestr) < 0) return false; if (sourcestr && diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 3d9c48629a..28d90377a1 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -382,7 +382,7 @@ cmdAttachDevice(vshControl *ctl, const vshCmd *cmd) if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) + if (vshCommandOptString(ctl, cmd, "file", &from) < 0) return false; if (persistent && @@ -647,25 +647,25 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) if (live) flags |= VIR_DOMAIN_AFFECT_LIVE; - if (vshCommandOptStringReq(ctl, cmd, "source", &source) < 0 || - vshCommandOptStringReq(ctl, cmd, "target", &target) < 0 || - vshCommandOptStringReq(ctl, cmd, "driver", &driver) < 0 || - vshCommandOptStringReq(ctl, cmd, "subdriver", &subdriver) < 0 || - vshCommandOptStringReq(ctl, cmd, "type", &device) < 0 || - vshCommandOptStringReq(ctl, cmd, "mode", &mode) < 0 || - vshCommandOptStringReq(ctl, cmd, "iothread", &iothread) < 0 || - vshCommandOptStringReq(ctl, cmd, "cache", &cache) < 0 || - vshCommandOptStringReq(ctl, cmd, "io", &io) < 0 || - vshCommandOptStringReq(ctl, cmd, "serial", &serial) < 0 || - vshCommandOptStringReq(ctl, cmd, "wwn", &wwn) < 0 || - vshCommandOptStringReq(ctl, cmd, "address", &straddr) < 0 || - vshCommandOptStringReq(ctl, cmd, "targetbus", &targetbus) < 0 || - vshCommandOptStringReq(ctl, cmd, "alias", &alias) < 0 || - vshCommandOptStringReq(ctl, cmd, "sourcetype", &stype) < 0 || - vshCommandOptStringReq(ctl, cmd, "source-protocol", &source_protocol) < 0 || - vshCommandOptStringReq(ctl, cmd, "source-host-name", &host_name) < 0 || - vshCommandOptStringReq(ctl, cmd, "source-host-transport", &host_transport) < 0 || - vshCommandOptStringReq(ctl, cmd, "source-host-socket", &host_socket) < 0) + if (vshCommandOptString(ctl, cmd, "source", &source) < 0 || + vshCommandOptString(ctl, cmd, "target", &target) < 0 || + vshCommandOptString(ctl, cmd, "driver", &driver) < 0 || + vshCommandOptString(ctl, cmd, "subdriver", &subdriver) < 0 || + vshCommandOptString(ctl, cmd, "type", &device) < 0 || + vshCommandOptString(ctl, cmd, "mode", &mode) < 0 || + vshCommandOptString(ctl, cmd, "iothread", &iothread) < 0 || + vshCommandOptString(ctl, cmd, "cache", &cache) < 0 || + vshCommandOptString(ctl, cmd, "io", &io) < 0 || + vshCommandOptString(ctl, cmd, "serial", &serial) < 0 || + vshCommandOptString(ctl, cmd, "wwn", &wwn) < 0 || + vshCommandOptString(ctl, cmd, "address", &straddr) < 0 || + vshCommandOptString(ctl, cmd, "targetbus", &targetbus) < 0 || + vshCommandOptString(ctl, cmd, "alias", &alias) < 0 || + vshCommandOptString(ctl, cmd, "sourcetype", &stype) < 0 || + vshCommandOptString(ctl, cmd, "source-protocol", &source_protocol) < 0 || + vshCommandOptString(ctl, cmd, "source-host-name", &host_name) < 0 || + vshCommandOptString(ctl, cmd, "source-host-transport", &host_transport) < 0 || + vshCommandOptString(ctl, cmd, "source-host-socket", &host_socket) < 0) return false; if (stype && @@ -963,16 +963,16 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) if (live) flags |= VIR_DOMAIN_AFFECT_LIVE; - if (vshCommandOptStringReq(ctl, cmd, "type", &type) < 0 || - vshCommandOptStringReq(ctl, cmd, "source", &source) < 0 || - vshCommandOptStringReq(ctl, cmd, "target", &target) < 0 || - vshCommandOptStringReq(ctl, cmd, "mac", &mac) < 0 || - vshCommandOptStringReq(ctl, cmd, "script", &script) < 0 || - vshCommandOptStringReq(ctl, cmd, "model", &model) < 0 || - vshCommandOptStringReq(ctl, cmd, "alias", &alias) < 0 || - vshCommandOptStringReq(ctl, cmd, "inbound", &inboundStr) < 0 || - vshCommandOptStringReq(ctl, cmd, "outbound", &outboundStr) < 0 || - vshCommandOptStringReq(ctl, cmd, "source-mode", &sourceModeStr) < 0) + if (vshCommandOptString(ctl, cmd, "type", &type) < 0 || + vshCommandOptString(ctl, cmd, "source", &source) < 0 || + vshCommandOptString(ctl, cmd, "target", &target) < 0 || + vshCommandOptString(ctl, cmd, "mac", &mac) < 0 || + vshCommandOptString(ctl, cmd, "script", &script) < 0 || + vshCommandOptString(ctl, cmd, "model", &model) < 0 || + vshCommandOptString(ctl, cmd, "alias", &alias) < 0 || + vshCommandOptString(ctl, cmd, "inbound", &inboundStr) < 0 || + vshCommandOptString(ctl, cmd, "outbound", &outboundStr) < 0 || + vshCommandOptString(ctl, cmd, "source-mode", &sourceModeStr) < 0) return false; /* check interface type */ @@ -1402,7 +1402,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) if (!(dom = virshCommandOptDomain(ctl, cmd, &name))) goto cleanup; - if (vshCommandOptStringReq(ctl, cmd, "device", &disk) < 0) + if (vshCommandOptString(ctl, cmd, "device", &disk) < 0) goto cleanup; #define VSH_ADD_IOTUNE_SCALED(PARAM, CONST) \ @@ -1450,7 +1450,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) VSH_ADD_IOTUNE(write-iops-sec-max-length, WRITE_IOPS_SEC_MAX_LENGTH); #undef VSH_ADD_IOTUNE - if (vshCommandOptStringReq(ctl, cmd, "group-name", &group_name) < 0) { + if (vshCommandOptString(ctl, cmd, "group-name", &group_name) < 0) { vshError(ctl, "%s", _("Unable to parse group-name parameter")); goto cleanup; } @@ -2095,13 +2095,13 @@ cmdBlockcommit(vshControl *ctl, const vshCmd *cmd) VSH_EXCLUSIVE_OPTIONS("pivot", "keep-overlay"); - if (vshCommandOptStringReq(ctl, cmd, "path", &path) < 0) + if (vshCommandOptString(ctl, cmd, "path", &path) < 0) return false; - if (vshCommandOptStringReq(ctl, cmd, "base", &base) < 0) + if (vshCommandOptString(ctl, cmd, "base", &base) < 0) return false; - if (vshCommandOptStringReq(ctl, cmd, "top", &top) < 0) + if (vshCommandOptString(ctl, cmd, "top", &top) < 0) return false; if (vshBlockJobOptionBandwidth(ctl, cmd, bytes, &bandwidth) < 0) @@ -2352,13 +2352,13 @@ cmdBlockcopy(vshControl *ctl, const vshCmd *cmd) virshBlockJobWaitData *bjWait = NULL; int nparams = 0; - if (vshCommandOptStringReq(ctl, cmd, "path", &path) < 0) + if (vshCommandOptString(ctl, cmd, "path", &path) < 0) return false; - if (vshCommandOptStringReq(ctl, cmd, "dest", &dest) < 0) + if (vshCommandOptString(ctl, cmd, "dest", &dest) < 0) return false; - if (vshCommandOptStringReq(ctl, cmd, "xml", &xml) < 0) + if (vshCommandOptString(ctl, cmd, "xml", &xml) < 0) return false; - if (vshCommandOptStringReq(ctl, cmd, "format", &format) < 0) + if (vshCommandOptString(ctl, cmd, "format", &format) < 0) return false; if (vshBlockJobOptionBandwidth(ctl, cmd, bytes, &bandwidth) < 0) return false; @@ -2755,7 +2755,7 @@ cmdBlockjob(vshControl *ctl, const vshCmd *cmd) return false; /* XXX Allow path to be optional to list info on all devices at once */ - if (vshCommandOptStringReq(ctl, cmd, "path", &path) < 0) + if (vshCommandOptString(ctl, cmd, "path", &path) < 0) return false; if (bandwidth) @@ -2840,10 +2840,10 @@ cmdBlockpull(vshControl *ctl, const vshCmd *cmd) VSH_REQUIRE_OPTION("verbose", "wait"); VSH_REQUIRE_OPTION("async", "wait"); - if (vshCommandOptStringReq(ctl, cmd, "path", &path) < 0) + if (vshCommandOptString(ctl, cmd, "path", &path) < 0) return false; - if (vshCommandOptStringReq(ctl, cmd, "base", &base) < 0) + if (vshCommandOptString(ctl, cmd, "base", &base) < 0) return false; if (vshBlockJobOptionBandwidth(ctl, cmd, bytes, &bandwidth) < 0) @@ -2950,7 +2950,7 @@ cmdBlockresize(vshControl *ctl, const vshCmd *cmd) VSH_ALTERNATIVE_OPTIONS("size", "capacity"); - if (vshCommandOptStringReq(ctl, cmd, "path", (const char **) &path) < 0) + if (vshCommandOptString(ctl, cmd, "path", (const char **) &path) < 0) return false; if (vshCommandOptScaledInt(ctl, cmd, "size", &size, 1024, ULLONG_MAX) < 0) @@ -3052,7 +3052,7 @@ cmdConsole(vshControl *ctl, const vshCmd *cmd) if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptStringReq(ctl, cmd, "devname", &name) < 0) /* sc_prohibit_devname */ + if (vshCommandOptString(ctl, cmd, "devname", &name) < 0) /* sc_prohibit_devname */ return false; if (force) @@ -3121,8 +3121,8 @@ cmdDomIfSetLink(vshControl *ctl, const vshCmd *cmd) if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptStringReq(ctl, cmd, "interface", &iface) < 0 || - vshCommandOptStringReq(ctl, cmd, "state", &state) < 0) + if (vshCommandOptString(ctl, cmd, "interface", &iface) < 0 || + vshCommandOptString(ctl, cmd, "state", &state) < 0) return false; if (STRNEQ(state, "up") && STRNEQ(state, "down")) { @@ -3276,11 +3276,11 @@ cmdDomIftune(vshControl *ctl, const vshCmd *cmd) if (!(dom = virshCommandOptDomain(ctl, cmd, &name))) return false; - if (vshCommandOptStringReq(ctl, cmd, "interface", &device) < 0) + if (vshCommandOptString(ctl, cmd, "interface", &device) < 0) goto cleanup; - if (vshCommandOptStringReq(ctl, cmd, "inbound", &inboundStr) < 0 || - vshCommandOptStringReq(ctl, cmd, "outbound", &outboundStr) < 0) + if (vshCommandOptString(ctl, cmd, "inbound", &inboundStr) < 0 || + vshCommandOptString(ctl, cmd, "outbound", &outboundStr) < 0) goto cleanup; if (inboundStr) { @@ -3481,7 +3481,7 @@ cmdDomPMSuspend(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptULongLong(ctl, cmd, "duration", &duration) < 0) return false; - if (vshCommandOptStringReq(ctl, cmd, "target", &target) < 0) + if (vshCommandOptString(ctl, cmd, "target", &target) < 0) return false; if ((suspendTarget = virshNodeSuspendTargetTypeFromString(target)) < 0) { @@ -4188,7 +4188,7 @@ doSave(void *opaque) goto out_sig; #endif /* !WIN32 */ - if (vshCommandOptStringReq(ctl, cmd, "file", &to) < 0) + if (vshCommandOptString(ctl, cmd, "file", &to) < 0) goto out; if (vshCommandOptBool(cmd, "bypass-cache")) @@ -4198,7 +4198,7 @@ doSave(void *opaque) if (vshCommandOptBool(cmd, "paused")) flags |= VIR_DOMAIN_SAVE_PAUSED; - if (vshCommandOptStringReq(ctl, cmd, "xml", &xmlfile) < 0) + if (vshCommandOptString(ctl, cmd, "xml", &xmlfile) < 0) goto out; if (!(dom = virshCommandOptDomain(ctl, cmd, &name))) @@ -4454,7 +4454,7 @@ cmdSave(vshControl *ctl, const vshCmd *cmd) if (!(dom = virshCommandOptDomain(ctl, cmd, &name))) return false; - if (vshCommandOptStringReq(ctl, cmd, "file", &to) < 0) + if (vshCommandOptString(ctl, cmd, "file", &to) < 0) return false; if (vshCommandOptBool(cmd, "verbose")) @@ -4521,7 +4521,7 @@ cmdSaveImageDumpxml(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "security-info")) flags |= VIR_DOMAIN_XML_SECURE; - if (vshCommandOptStringReq(ctl, cmd, "file", &file) < 0) + if (vshCommandOptString(ctl, cmd, "file", &file) < 0) return false; if (vshCommandOptStringQuiet(ctl, cmd, "xpath", &xpath) < 0) @@ -4581,10 +4581,10 @@ cmdSaveImageDefine(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "paused")) flags |= VIR_DOMAIN_SAVE_PAUSED; - if (vshCommandOptStringReq(ctl, cmd, "file", &file) < 0) + if (vshCommandOptString(ctl, cmd, "file", &file) < 0) return false; - if (vshCommandOptStringReq(ctl, cmd, "xml", &xmlfile) < 0) + if (vshCommandOptString(ctl, cmd, "xml", &xmlfile) < 0) return false; if (virFileReadAll(xmlfile, VSH_MAX_XML_FILE, &xml) < 0) @@ -4645,7 +4645,7 @@ cmdSaveImageEdit(vshControl *ctl, const vshCmd *cmd) * flags, so we reject it up front to avoid looping. */ VSH_EXCLUSIVE_OPTIONS("running", "paused"); - if (vshCommandOptStringReq(ctl, cmd, "file", &file) < 0) + if (vshCommandOptString(ctl, cmd, "file", &file) < 0) return false; #define EDIT_GET_XML \ @@ -4980,7 +4980,7 @@ cmdManagedSaveDefine(vshControl *ctl, const vshCmd *cmd) VSH_EXCLUSIVE_OPTIONS("running", "paused"); - if (vshCommandOptStringReq(ctl, cmd, "xml", &xmlfile) < 0) + if (vshCommandOptString(ctl, cmd, "xml", &xmlfile) < 0) return false; if (virFileReadAll(xmlfile, VSH_MAX_XML_FILE, &xml) < 0) @@ -5089,7 +5089,7 @@ cmdSchedInfoUpdate(vshControl *ctl, const vshCmd *cmd, goto cleanup; } - rv = vshCommandOptStringReq(ctl, cmd, "cap", &val); + rv = vshCommandOptString(ctl, cmd, "cap", &val); if (rv < 0 || (val && cmdSchedInfoUpdateOne(ctl, src_params, nsrc_params, @@ -5097,7 +5097,7 @@ cmdSchedInfoUpdate(vshControl *ctl, const vshCmd *cmd, "cap", val) < 0)) goto cleanup; - rv = vshCommandOptStringReq(ctl, cmd, "weight", &val); + rv = vshCommandOptString(ctl, cmd, "weight", &val); if (rv < 0 || (val && cmdSchedInfoUpdateOne(ctl, src_params, nsrc_params, @@ -5263,7 +5263,7 @@ cmdRestore(vshControl *ctl, const vshCmd *cmd) virshControl *priv = ctl->privData; int rc; - if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) + if (vshCommandOptString(ctl, cmd, "file", &from) < 0) return false; if (vshCommandOptBool(cmd, "bypass-cache")) @@ -5275,7 +5275,7 @@ cmdRestore(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "reset-nvram")) flags |= VIR_DOMAIN_SAVE_RESET_NVRAM; - if (vshCommandOptStringReq(ctl, cmd, "xml", &xmlfile) < 0) + if (vshCommandOptString(ctl, cmd, "xml", &xmlfile) < 0) return false; if (xmlfile && @@ -5372,7 +5372,7 @@ doDump(void *opaque) goto out_sig; #endif /* !WIN32 */ - if (vshCommandOptStringReq(ctl, cmd, "file", &to) < 0) + if (vshCommandOptString(ctl, cmd, "file", &to) < 0) goto out; if (!(dom = virshCommandOptDomain(ctl, cmd, &name))) @@ -5445,7 +5445,7 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) if (!(dom = virshCommandOptDomain(ctl, cmd, &name))) return false; - if (vshCommandOptStringReq(ctl, cmd, "file", &to) < 0) + if (vshCommandOptString(ctl, cmd, "file", &to) < 0) return false; if (vshCommandOptBool(cmd, "verbose")) @@ -5536,7 +5536,7 @@ cmdScreenshot(vshControl *ctl, const vshCmd *cmd) virshControl *priv = ctl->privData; virshStreamCallbackData cbdata; - if (vshCommandOptStringReq(ctl, cmd, "file", (const char **) &file) < 0) + if (vshCommandOptString(ctl, cmd, "file", (const char **) &file) < 0) return false; if (vshCommandOptUInt(ctl, cmd, "screen", &screen) < 0) @@ -5666,8 +5666,8 @@ cmdSetLifecycleAction(vshControl *ctl, const vshCmd *cmd) if (live) flags |= VIR_DOMAIN_AFFECT_LIVE; - if (vshCommandOptStringReq(ctl, cmd, "type", &typeStr) < 0 || - vshCommandOptStringReq(ctl, cmd, "action", &actionStr) < 0) { + if (vshCommandOptString(ctl, cmd, "type", &typeStr) < 0 || + vshCommandOptString(ctl, cmd, "action", &actionStr) < 0) { return false; } @@ -5735,10 +5735,10 @@ cmdSetUserPassword(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "encrypted")) flags = VIR_DOMAIN_PASSWORD_ENCRYPTED; - if (vshCommandOptStringReq(ctl, cmd, "user", &user) < 0) + if (vshCommandOptString(ctl, cmd, "user", &user) < 0) return false; - if (vshCommandOptStringReq(ctl, cmd, "password", &password) < 0) + if (vshCommandOptString(ctl, cmd, "password", &password) < 0) return false; if (!(dom = virshCommandOptDomain(ctl, cmd, &name))) @@ -5811,7 +5811,7 @@ cmdShutdown(vshControl *ctl, const vshCmd *cmd) g_auto(GStrv) modes = NULL; char **tmp; - if (vshCommandOptStringReq(ctl, cmd, "mode", &mode) < 0) + if (vshCommandOptString(ctl, cmd, "mode", &mode) < 0) return false; if (mode && !(modes = g_strsplit(mode, ",", 0))) { @@ -5886,7 +5886,7 @@ cmdReboot(vshControl *ctl, const vshCmd *cmd) g_auto(GStrv) modes = NULL; char **tmp; - if (vshCommandOptStringReq(ctl, cmd, "mode", &mode) < 0) + if (vshCommandOptString(ctl, cmd, "mode", &mode) < 0) return false; if (mode && !(modes = g_strsplit(mode, ",", 0))) { @@ -6982,7 +6982,7 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) if (live) flags |= VIR_DOMAIN_AFFECT_LIVE; - if (vshCommandOptStringReq(ctl, cmd, "cpulist", &cpulist) < 0) + if (vshCommandOptString(ctl, cmd, "cpulist", &cpulist) < 0) return false; if (!cpulist) @@ -7076,7 +7076,7 @@ cmdEmulatorPin(vshControl *ctl, const vshCmd *cmd) if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptStringReq(ctl, cmd, "cpulist", &cpulist) < 0) { + if (vshCommandOptString(ctl, cmd, "cpulist", &cpulist) < 0) { return false; } query = !cpulist; @@ -7253,7 +7253,7 @@ cmdGuestvcpus(vshControl *ctl, const vshCmd *cmd) VSH_REQUIRE_OPTION("enable", "cpulist"); VSH_REQUIRE_OPTION("disable", "cpulist"); - if (vshCommandOptStringReq(ctl, cmd, "cpulist", &cpulist)) + if (vshCommandOptString(ctl, cmd, "cpulist", &cpulist)) return false; if (cpulist && !(enable || disable)) { @@ -7346,7 +7346,7 @@ cmdSetvcpu(vshControl *ctl, const vshCmd *cmd) return false; } - if (vshCommandOptStringReq(ctl, cmd, "vcpulist", &vcpulist)) + if (vshCommandOptString(ctl, cmd, "vcpulist", &vcpulist)) return false; if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) @@ -7396,7 +7396,7 @@ cmdDomblkthreshold(vshControl *ctl, const vshCmd *cmd) const char *dev = NULL; g_autoptr(virshDomain) dom = NULL; - if (vshCommandOptStringReq(ctl, cmd, "dev", &dev)) + if (vshCommandOptString(ctl, cmd, "dev", &dev)) return false; if (vshCommandOptScaledInt(ctl, cmd, "threshold", @@ -7552,7 +7552,7 @@ cmdIOThreadPin(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptUInt(ctl, cmd, "iothread", &iothread_id) < 0) return false; - if (vshCommandOptStringReq(ctl, cmd, "cpulist", &cpulist) < 0) + if (vshCommandOptString(ctl, cmd, "cpulist", &cpulist) < 0) return false; if ((maxcpu = virshNodeGetCPUCount(priv->conn)) < 0) @@ -8052,7 +8052,7 @@ cmdCreate(vshControl *ctl, const vshCmd *cmd) g_autofree int *fds = NULL; virshControl *priv = ctl->privData; - if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) + if (vshCommandOptString(ctl, cmd, "file", &from) < 0) return false; if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) @@ -8129,7 +8129,7 @@ cmdDefine(vshControl *ctl, const vshCmd *cmd) unsigned int flags = 0; virshControl *priv = ctl->privData; - if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) + if (vshCommandOptString(ctl, cmd, "file", &from) < 0) return false; if (vshCommandOptBool(cmd, "validate")) @@ -8432,9 +8432,9 @@ cmdMetadata(vshControl *ctl, const vshCmd *cmd) if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptStringReq(ctl, cmd, "uri", &uri) < 0 || - vshCommandOptStringReq(ctl, cmd, "key", &key) < 0 || - vshCommandOptStringReq(ctl, cmd, "set", &set) < 0) + if (vshCommandOptString(ctl, cmd, "uri", &uri) < 0 || + vshCommandOptString(ctl, cmd, "key", &key) < 0 || + vshCommandOptString(ctl, cmd, "set", &set) < 0) return false; if ((set || edit) && !key) { @@ -8684,7 +8684,7 @@ cmdSendProcessSignal(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptLongLong(ctl, cmd, "pid", &pid_value) < 0) return false; - if (vshCommandOptStringReq(ctl, cmd, "signame", &signame) < 0) + if (vshCommandOptString(ctl, cmd, "signame", &signame) < 0) return false; if ((signum = getSignalNumber(signame)) < 0) { @@ -8896,7 +8896,7 @@ virshGetUpdatedMemoryXML(char **updatedMemoryXML, return -1; nodeOpt = vshCommandOptBool(cmd, "node"); - if (vshCommandOptStringReq(ctl, cmd, "alias", &alias) < 0 || + if (vshCommandOptString(ctl, cmd, "alias", &alias) < 0 || vshCommandOptUInt(ctl, cmd, "node", &node) < 0) { return -1; } @@ -9248,8 +9248,8 @@ cmdPerf(vshControl *ctl, const vshCmd *cmd) if (live) flags |= VIR_DOMAIN_AFFECT_LIVE; - if (vshCommandOptStringReq(ctl, cmd, "enable", &enable) < 0 || - vshCommandOptStringReq(ctl, cmd, "disable", &disable) < 0) + if (vshCommandOptString(ctl, cmd, "enable", &enable) < 0 || + vshCommandOptString(ctl, cmd, "disable", &disable) < 0) return false; if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) @@ -9340,7 +9340,7 @@ cmdNumatune(vshControl * ctl, const vshCmd * cmd) if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptStringReq(ctl, cmd, "nodeset", &nodeset) < 0) + if (vshCommandOptString(ctl, cmd, "nodeset", &nodeset) < 0) goto cleanup; if (nodeset && @@ -9348,7 +9348,7 @@ cmdNumatune(vshControl * ctl, const vshCmd * cmd) VIR_DOMAIN_NUMA_NODESET, nodeset) < 0) goto save_error; - if (vshCommandOptStringReq(ctl, cmd, "mode", &mode) < 0) + if (vshCommandOptString(ctl, cmd, "mode", &mode) < 0) goto cleanup; if (mode) { @@ -9502,10 +9502,10 @@ cmdDomSetLaunchSecState(vshControl * ctl, const vshCmd * cmd) if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptStringReq(ctl, cmd, "secrethdr", &sechdrfile) < 0) + if (vshCommandOptString(ctl, cmd, "secrethdr", &sechdrfile) < 0) return false; - if (vshCommandOptStringReq(ctl, cmd, "secret", &secfile) < 0) + if (vshCommandOptString(ctl, cmd, "secret", &secfile) < 0) return false; if (sechdrfile == NULL || secfile == NULL) { @@ -9609,7 +9609,7 @@ cmdDomFdAssociate(vshControl *ctl, const vshCmd *cmd) if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptStringReq(ctl, cmd, "name", &name) < 0) + if (vshCommandOptString(ctl, cmd, "name", &name) < 0) return false; if (virshFetchPassFdsList(ctl, cmd, &nfds, &fds) < 0) @@ -9941,7 +9941,7 @@ cmdQemuMonitorEvent(vshControl *ctl, const vshCmd *cmd) data.count = 0; if (vshCommandOptTimeoutToMs(ctl, cmd, &timeout) < 0) return false; - if (vshCommandOptStringReq(ctl, cmd, "event", &event) < 0) + if (vshCommandOptString(ctl, cmd, "event", &event) < 0) return false; if (vshCommandOptBool(cmd, "domain")) @@ -10350,8 +10350,8 @@ cmdDomXMLFromNative(vshControl *ctl, const vshCmd *cmd) unsigned int flags = 0; virshControl *priv = ctl->privData; - if (vshCommandOptStringReq(ctl, cmd, "format", &format) < 0 || - vshCommandOptStringReq(ctl, cmd, "config", &configFile) < 0) + if (vshCommandOptString(ctl, cmd, "format", &format) < 0 || + vshCommandOptString(ctl, cmd, "config", &configFile) < 0) return false; if (virFileReadAll(configFile, VSH_MAX_XML_FILE, &configData) < 0) @@ -10405,8 +10405,8 @@ cmdDomXMLToNative(vshControl *ctl, const vshCmd *cmd) virshControl *priv = ctl->privData; g_autoptr(virshDomain) dom = NULL; - if (vshCommandOptStringReq(ctl, cmd, "format", &format) < 0 || - vshCommandOptStringReq(ctl, cmd, "xml", &xmlFile) < 0) + if (vshCommandOptString(ctl, cmd, "format", &format) < 0 || + vshCommandOptString(ctl, cmd, "xml", &xmlFile) < 0) return false; VSH_EXCLUSIVE_OPTIONS("domain", "xml"); @@ -10500,7 +10500,7 @@ cmdDomrename(vshControl *ctl, const vshCmd *cmd) if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptStringReq(ctl, cmd, "new-name", &new_name) < 0) + if (vshCommandOptString(ctl, cmd, "new-name", &new_name) < 0) return false; if (virDomainRename(dom, new_name, 0) < 0) @@ -10881,24 +10881,24 @@ doMigrate(void *opaque) if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) goto out; - if (vshCommandOptStringReq(ctl, cmd, "desturi", &desturi) < 0) + if (vshCommandOptString(ctl, cmd, "desturi", &desturi) < 0) goto out; - if (vshCommandOptStringReq(ctl, cmd, "migrateuri", &opt) < 0) + if (vshCommandOptString(ctl, cmd, "migrateuri", &opt) < 0) goto out; if (opt && virTypedParamsAddString(&params, &nparams, &maxparams, VIR_MIGRATE_PARAM_URI, opt) < 0) goto save_error; - if (vshCommandOptStringReq(ctl, cmd, "graphicsuri", &opt) < 0) + if (vshCommandOptString(ctl, cmd, "graphicsuri", &opt) < 0) goto out; if (opt && virTypedParamsAddString(&params, &nparams, &maxparams, VIR_MIGRATE_PARAM_GRAPHICS_URI, opt) < 0) goto save_error; - if (vshCommandOptStringReq(ctl, cmd, "listen-address", &opt) < 0) + if (vshCommandOptString(ctl, cmd, "listen-address", &opt) < 0) goto out; if (opt && virTypedParamsAddString(&params, &nparams, &maxparams, @@ -10912,7 +10912,7 @@ doMigrate(void *opaque) VIR_MIGRATE_PARAM_DISKS_PORT, intOpt) < 0) goto save_error; - if (vshCommandOptStringReq(ctl, cmd, "disks-uri", &opt) < 0) + if (vshCommandOptString(ctl, cmd, "disks-uri", &opt) < 0) goto out; if (opt && virTypedParamsAddString(&params, &nparams, &maxparams, @@ -10920,14 +10920,14 @@ doMigrate(void *opaque) opt) < 0) goto save_error; - if (vshCommandOptStringReq(ctl, cmd, "dname", &opt) < 0) + if (vshCommandOptString(ctl, cmd, "dname", &opt) < 0) goto out; if (opt && virTypedParamsAddString(&params, &nparams, &maxparams, VIR_MIGRATE_PARAM_DEST_NAME, opt) < 0) goto save_error; - if (vshCommandOptStringReq(ctl, cmd, "migrate-disks", &opt) < 0) + if (vshCommandOptString(ctl, cmd, "migrate-disks", &opt) < 0) goto out; if (opt) { g_autofree char **val = NULL; @@ -10948,7 +10948,7 @@ doMigrate(void *opaque) } } - if (vshCommandOptStringReq(ctl, cmd, "comp-methods", &opt) < 0) + if (vshCommandOptString(ctl, cmd, "comp-methods", &opt) < 0) goto out; if (opt) { g_autofree char **val = g_strsplit(opt, ",", 0); @@ -10998,7 +10998,7 @@ doMigrate(void *opaque) goto save_error; } - if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0) + if (vshCommandOptString(ctl, cmd, "xml", &opt) < 0) goto out; if (opt) { g_autofree char *xml = NULL; @@ -11014,7 +11014,7 @@ doMigrate(void *opaque) } } - if (vshCommandOptStringReq(ctl, cmd, "persistent-xml", &opt) < 0) + if (vshCommandOptString(ctl, cmd, "persistent-xml", &opt) < 0) goto out; if (opt) { g_autofree char *xml = NULL; @@ -11093,7 +11093,7 @@ doMigrate(void *opaque) goto save_error; } - if (vshCommandOptStringReq(ctl, cmd, "tls-destination", &opt) < 0) + if (vshCommandOptString(ctl, cmd, "tls-destination", &opt) < 0) goto out; if (opt && virTypedParamsAddString(&params, &nparams, &maxparams, @@ -11250,7 +11250,7 @@ cmdMigrate(vshControl *ctl, const vshCmd *cmd) virConnectPtr dconn = NULL; const char *desturi = NULL; - if (vshCommandOptStringReq(ctl, cmd, "desturi", &desturi) < 0) + if (vshCommandOptString(ctl, cmd, "desturi", &desturi) < 0) goto cleanup; dconn = virshConnect(ctl, desturi, false); @@ -11722,7 +11722,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "include-password")) flags |= VIR_DOMAIN_XML_SECURE; - if (vshCommandOptStringReq(ctl, cmd, "type", &type) < 0) + if (vshCommandOptString(ctl, cmd, "type", &type) < 0) return false; if (virshDomainGetXMLFromDom(ctl, dom, flags, &xml, &ctxt) < 0) @@ -11885,7 +11885,7 @@ cmdDomHostname(vshControl *ctl, const vshCmd *cmd) if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptStringReq(ctl, cmd, "source", &sourcestr) < 0) + if (vshCommandOptString(ctl, cmd, "source", &sourcestr) < 0) return false; if (sourcestr) { @@ -11966,7 +11966,7 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) virDomainIsActive(dom) == 1) flags |= VIR_DOMAIN_AFFECT_LIVE; - if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) + if (vshCommandOptString(ctl, cmd, "file", &from) < 0) return false; if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) { @@ -12033,7 +12033,7 @@ cmdDetachDeviceAlias(vshControl *ctl, const vshCmd *cmd) if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptStringReq(ctl, cmd, "alias", &alias) < 0) + if (vshCommandOptString(ctl, cmd, "alias", &alias) < 0) return false; if (virDomainDetachDeviceAlias(dom, alias, flags) < 0) { @@ -12093,7 +12093,7 @@ cmdUpdateDevice(vshControl *ctl, const vshCmd *cmd) if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) + if (vshCommandOptString(ctl, cmd, "file", &from) < 0) return false; if (persistent && @@ -12255,10 +12255,10 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptStringReq(ctl, cmd, "type", &type) < 0) + if (vshCommandOptString(ctl, cmd, "type", &type) < 0) goto cleanup; - if (vshCommandOptStringReq(ctl, cmd, "mac", &mac) < 0) + if (vshCommandOptString(ctl, cmd, "mac", &mac) < 0) goto cleanup; affect_config = (config || persistent); @@ -12548,7 +12548,7 @@ cmdDetachDisk(vshControl *ctl, const vshCmd *cmd) if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptStringReq(ctl, cmd, "target", &target) < 0) + if (vshCommandOptString(ctl, cmd, "target", &target) < 0) return false; if (flags == VIR_DOMAIN_AFFECT_CONFIG) @@ -12736,7 +12736,7 @@ cmdChangeMedia(vshControl *ctl, const vshCmd *cmd) VSH_EXCLUSIVE_OPTIONS_VAR(eject, block); - if (vshCommandOptStringReq(ctl, cmd, "source", &source) < 0) + if (vshCommandOptString(ctl, cmd, "source", &source) < 0) return false; /* Docs state that update without source is eject */ @@ -12776,7 +12776,7 @@ cmdChangeMedia(vshControl *ctl, const vshCmd *cmd) if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptStringReq(ctl, cmd, "path", &path) < 0) + if (vshCommandOptString(ctl, cmd, "path", &path) < 0) return false; if (flags & VIR_DOMAIN_AFFECT_CONFIG) @@ -12842,7 +12842,7 @@ cmdDomFSTrim(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptULongLong(ctl, cmd, "minimum", &minimum) < 0) return false; - if (vshCommandOptStringReq(ctl, cmd, "mountpoint", &mountPoint) < 0) + if (vshCommandOptString(ctl, cmd, "mountpoint", &mountPoint) < 0) return false; if (virDomainFSTrim(dom, mountPoint, minimum, flags) < 0) { @@ -13164,7 +13164,7 @@ cmdGetUserSSHKeys(vshControl *ctl, const vshCmd *cmd) if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptStringReq(ctl, cmd, "user", &user) < 0) + if (vshCommandOptString(ctl, cmd, "user", &user) < 0) return false; nkeys = virDomainAuthorizedSSHKeysGet(dom, user, &keys, flags); @@ -13230,10 +13230,10 @@ cmdSetUserSSHKeys(vshControl *ctl, const vshCmd *cmd) if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptStringReq(ctl, cmd, "user", &user) < 0) + if (vshCommandOptString(ctl, cmd, "user", &user) < 0) return false; - if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) + if (vshCommandOptString(ctl, cmd, "file", &from) < 0) return false; if (vshCommandOptBool(cmd, "remove")) { @@ -13323,7 +13323,7 @@ cmdDomDirtyRateCalc(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptInt(ctl, cmd, "seconds", &seconds) < 0) return false; - if (vshCommandOptStringReq(ctl, cmd, "mode", &modestr) < 0) + if (vshCommandOptString(ctl, cmd, "mode", &modestr) < 0) return false; if (modestr) { diff --git a/tools/virsh-host.c b/tools/virsh-host.c index c338b5cd85..2fe64e415f 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -130,10 +130,10 @@ cmdDomCapabilities(vshControl *ctl, const vshCmd *cmd) bool wrap = vshCommandOptBool(cmd, "wrap"); virshControl *priv = ctl->privData; - if (vshCommandOptStringReq(ctl, cmd, "virttype", &virttype) < 0 || - vshCommandOptStringReq(ctl, cmd, "emulatorbin", &emulatorbin) < 0 || - vshCommandOptStringReq(ctl, cmd, "arch", &arch) < 0 || - vshCommandOptStringReq(ctl, cmd, "machine", &machine) < 0 || + if (vshCommandOptString(ctl, cmd, "virttype", &virttype) < 0 || + vshCommandOptString(ctl, cmd, "emulatorbin", &emulatorbin) < 0 || + vshCommandOptString(ctl, cmd, "arch", &arch) < 0 || + vshCommandOptString(ctl, cmd, "machine", &machine) < 0 || vshCommandOptStringQuiet(ctl, cmd, "xpath", &xpath) < 0) return false; @@ -605,7 +605,7 @@ cmdMaxvcpus(vshControl *ctl, const vshCmd *cmd) g_autoptr(xmlXPathContext) ctxt = NULL; virshControl *priv = ctl->privData; - if (vshCommandOptStringReq(ctl, cmd, "type", &type) < 0) + if (vshCommandOptString(ctl, cmd, "type", &type) < 0) return false; if ((caps = virConnectGetDomainCapabilities(priv->conn, NULL, NULL, NULL, @@ -977,7 +977,7 @@ cmdNodeSuspend(vshControl *ctl, const vshCmd *cmd) long long duration; virshControl *priv = ctl->privData; - if (vshCommandOptStringReq(ctl, cmd, "target", &target) < 0) + if (vshCommandOptString(ctl, cmd, "target", &target) < 0) return false; if (vshCommandOptLongLong(ctl, cmd, "duration", &duration) < 0) @@ -1189,7 +1189,7 @@ cmdCPUCompare(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "validate")) flags |= VIR_CONNECT_COMPARE_CPU_VALIDATE_XML; - if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) + if (vshCommandOptString(ctl, cmd, "file", &from) < 0) return false; if (!(cpus = vshExtractCPUDefXMLs(ctl, from))) @@ -1258,7 +1258,7 @@ cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "migratable")) flags |= VIR_CONNECT_BASELINE_CPU_MIGRATABLE; - if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) + if (vshCommandOptString(ctl, cmd, "file", &from) < 0) return false; if (!(list = vshExtractCPUDefXMLs(ctl, from))) @@ -1300,7 +1300,7 @@ cmdCPUModelNames(vshControl *ctl, const vshCmd *cmd) const char *arch = NULL; virshControl *priv = ctl->privData; - if (vshCommandOptStringReq(ctl, cmd, "arch", &arch) < 0) + if (vshCommandOptString(ctl, cmd, "arch", &arch) < 0) return false; nmodels = virConnectGetCPUModelNames(priv->conn, arch, &models, 0); @@ -1598,11 +1598,11 @@ cmdHypervisorCPUCompare(vshControl *ctl, if (vshCommandOptBool(cmd, "validate")) flags |= VIR_CONNECT_COMPARE_CPU_VALIDATE_XML; - if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0 || - vshCommandOptStringReq(ctl, cmd, "virttype", &virttype) < 0 || - vshCommandOptStringReq(ctl, cmd, "emulator", &emulator) < 0 || - vshCommandOptStringReq(ctl, cmd, "arch", &arch) < 0 || - vshCommandOptStringReq(ctl, cmd, "machine", &machine) < 0) + if (vshCommandOptString(ctl, cmd, "file", &from) < 0 || + vshCommandOptString(ctl, cmd, "virttype", &virttype) < 0 || + vshCommandOptString(ctl, cmd, "emulator", &emulator) < 0 || + vshCommandOptString(ctl, cmd, "arch", &arch) < 0 || + vshCommandOptString(ctl, cmd, "machine", &machine) < 0) return false; if (!(cpus = vshExtractCPUDefXMLs(ctl, from))) @@ -1718,12 +1718,12 @@ cmdHypervisorCPUBaseline(vshControl *ctl, if (vshCommandOptBool(cmd, "migratable")) flags |= VIR_CONNECT_BASELINE_CPU_MIGRATABLE; - if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0 || - vshCommandOptStringReq(ctl, cmd, "virttype", &virttype) < 0 || - vshCommandOptStringReq(ctl, cmd, "emulator", &emulator) < 0 || - vshCommandOptStringReq(ctl, cmd, "arch", &arch) < 0 || - vshCommandOptStringReq(ctl, cmd, "machine", &machine) < 0 || - vshCommandOptStringReq(ctl, cmd, "model", &model) < 0) + if (vshCommandOptString(ctl, cmd, "file", &from) < 0 || + vshCommandOptString(ctl, cmd, "virttype", &virttype) < 0 || + vshCommandOptString(ctl, cmd, "emulator", &emulator) < 0 || + vshCommandOptString(ctl, cmd, "arch", &arch) < 0 || + vshCommandOptString(ctl, cmd, "machine", &machine) < 0 || + vshCommandOptString(ctl, cmd, "model", &model) < 0) return false; VSH_ALTERNATIVE_OPTIONS_EXPR("file", from, "model", model); diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index 755c0d6455..fda6d55158 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -58,7 +58,7 @@ virshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd, if (!optname) optname = "interface"; - if (vshCommandOptStringReq(ctl, cmd, optname, &n) < 0) + if (vshCommandOptString(ctl, cmd, optname, &n) < 0) return NULL; vshDebug(ctl, VSH_ERR_INFO, "%s: found option <%s>: %s\n", @@ -515,7 +515,7 @@ cmdInterfaceDefine(vshControl *ctl, const vshCmd *cmd) unsigned int flags = 0; virshControl *priv = ctl->privData; - if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) + if (vshCommandOptString(ctl, cmd, "file", &from) < 0) return false; if (vshCommandOptBool(cmd, "validate")) @@ -770,7 +770,7 @@ cmdInterfaceBridge(vshControl *ctl, const vshCmd *cmd) } /* Name for new bridge device */ - if (vshCommandOptStringReq(ctl, cmd, "bridge", &br_name) < 0) + if (vshCommandOptString(ctl, cmd, "bridge", &br_name) < 0) goto cleanup; /* make sure "new" device doesn't already exist */ diff --git a/tools/virsh-network.c b/tools/virsh-network.c index e6552cbe57..24049a66f3 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -65,7 +65,7 @@ virshCommandOptNetworkBy(vshControl *ctl, const vshCmd *cmd, virCheckFlags(VIRSH_BYUUID | VIRSH_BYNAME, NULL); - if (vshCommandOptStringReq(ctl, cmd, optname, &n) < 0) + if (vshCommandOptString(ctl, cmd, optname, &n) < 0) return NULL; vshDebug(ctl, VSH_ERR_INFO, "%s: found option <%s>: %s\n", @@ -103,7 +103,7 @@ virshCommandOptNetworkPort(vshControl *ctl, const vshCmd *cmd, const char *n = NULL; const char *optname = "port"; - if (vshCommandOptStringReq(ctl, cmd, optname, &n) < 0) + if (vshCommandOptString(ctl, cmd, optname, &n) < 0) return NULL; vshDebug(ctl, VSH_ERR_INFO, "%s: found option <%s>: %s\n", @@ -193,7 +193,7 @@ cmdNetworkCreate(vshControl *ctl, const vshCmd *cmd) unsigned int flags = 0; virshControl *priv = ctl->privData; - if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) + if (vshCommandOptString(ctl, cmd, "file", &from) < 0) return false; if (vshCommandOptBool(cmd, "validate")) @@ -244,7 +244,7 @@ cmdNetworkDefine(vshControl *ctl, const vshCmd *cmd) unsigned int flags = 0; virshControl *priv = ctl->privData; - if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) + if (vshCommandOptString(ctl, cmd, "file", &from) < 0) return false; if (vshCommandOptBool(cmd, "validate")) @@ -570,9 +570,9 @@ cmdNetworkMetadata(vshControl *ctl, const vshCmd *cmd) if (!(net = virshCommandOptNetwork(ctl, cmd, NULL))) return false; - if (vshCommandOptStringReq(ctl, cmd, "uri", &uri) < 0 || - vshCommandOptStringReq(ctl, cmd, "key", &key) < 0 || - vshCommandOptStringReq(ctl, cmd, "set", &set) < 0) + if (vshCommandOptString(ctl, cmd, "uri", &uri) < 0 || + vshCommandOptString(ctl, cmd, "key", &key) < 0 || + vshCommandOptString(ctl, cmd, "set", &set) < 0) return false; if ((set || edit) && !key) { @@ -1281,7 +1281,7 @@ cmdNetworkUpdate(vshControl *ctl, const vshCmd *cmd) if (!(network = virshCommandOptNetwork(ctl, cmd, NULL))) return false; - if (vshCommandOptStringReq(ctl, cmd, "command", &commandStr) < 0) + if (vshCommandOptString(ctl, cmd, "command", &commandStr) < 0) goto cleanup; if (STREQ(commandStr, "add")) { @@ -1295,7 +1295,7 @@ cmdNetworkUpdate(vshControl *ctl, const vshCmd *cmd) } } - if (vshCommandOptStringReq(ctl, cmd, "section", &sectionStr) < 0) + if (vshCommandOptString(ctl, cmd, "section", &sectionStr) < 0) goto cleanup; section = virshNetworkSectionTypeFromString(sectionStr); @@ -1314,7 +1314,7 @@ cmdNetworkUpdate(vshControl *ctl, const vshCmd *cmd) * the desired xml. */ - if (vshCommandOptStringReq(ctl, cmd, "xml", &xml) < 0) + if (vshCommandOptString(ctl, cmd, "xml", &xml) < 0) goto cleanup; if (*xml != '<') { @@ -1631,7 +1631,7 @@ cmdNetworkEvent(vshControl *ctl, const vshCmd *cmd) return true; } - if (vshCommandOptStringReq(ctl, cmd, "event", &eventName) < 0) + if (vshCommandOptString(ctl, cmd, "event", &eventName) < 0) return false; if (!eventName) { vshError(ctl, "%s", _("either --list or --event <type> is required")); @@ -1736,7 +1736,7 @@ cmdNetworkDHCPLeases(vshControl *ctl, const vshCmd *cmd) g_autoptr(virshNetwork) network = NULL; g_autoptr(vshTable) table = NULL; - if (vshCommandOptStringReq(ctl, cmd, "mac", &mac) < 0) + if (vshCommandOptString(ctl, cmd, "mac", &mac) < 0) return false; if (!(network = virshCommandOptNetwork(ctl, cmd, &name))) @@ -1829,7 +1829,7 @@ cmdNetworkPortCreate(vshControl *ctl, const vshCmd *cmd) if (network == NULL) goto cleanup; - if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) + if (vshCommandOptString(ctl, cmd, "file", &from) < 0) goto cleanup; if (vshCommandOptBool(cmd, "validate")) diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index b0563395f0..910eaefc9e 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -61,7 +61,7 @@ cmdNodeDeviceCreate(vshControl *ctl, const vshCmd *cmd) virshControl *priv = ctl->privData; unsigned int flags = 0; - if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) + if (vshCommandOptString(ctl, cmd, "file", &from) < 0) return false; if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) @@ -142,7 +142,7 @@ cmdNodeDeviceDestroy(vshControl *ctl, const vshCmd *cmd) g_autoptr(virshNodeDevice) dev = NULL; const char *device_value = NULL; - if (vshCommandOptStringReq(ctl, cmd, "device", &device_value) < 0) + if (vshCommandOptString(ctl, cmd, "device", &device_value) < 0) return false; dev = vshFindNodeDevice(ctl, device_value); @@ -604,7 +604,7 @@ cmdNodeDeviceDumpXML(vshControl *ctl, const vshCmd *cmd) bool wrap = vshCommandOptBool(cmd, "wrap"); const char *xpath = NULL; - if (vshCommandOptStringReq(ctl, cmd, "device", &device_value) < 0) + if (vshCommandOptString(ctl, cmd, "device", &device_value) < 0) return false; if (vshCommandOptStringQuiet(ctl, cmd, "xpath", &xpath) < 0) @@ -659,7 +659,7 @@ cmdNodeDeviceDetach(vshControl *ctl, const vshCmd *cmd) bool ret = true; virshControl *priv = ctl->privData; - if (vshCommandOptStringReq(ctl, cmd, "device", &name) < 0) + if (vshCommandOptString(ctl, cmd, "device", &name) < 0) return false; ignore_value(vshCommandOptStringQuiet(ctl, cmd, "driver", &driverName)); @@ -716,7 +716,7 @@ cmdNodeDeviceReAttach(vshControl *ctl, const vshCmd *cmd) bool ret = true; virshControl *priv = ctl->privData; - if (vshCommandOptStringReq(ctl, cmd, "device", &name) < 0) + if (vshCommandOptString(ctl, cmd, "device", &name) < 0) return false; if (!(device = virNodeDeviceLookupByName(priv->conn, name))) { @@ -762,7 +762,7 @@ cmdNodeDeviceReset(vshControl *ctl, const vshCmd *cmd) bool ret = true; virshControl *priv = ctl->privData; - if (vshCommandOptStringReq(ctl, cmd, "device", &name) < 0) + if (vshCommandOptString(ctl, cmd, "device", &name) < 0) return false; if (!(device = virNodeDeviceLookupByName(priv->conn, name))) { @@ -936,7 +936,7 @@ cmdNodeDeviceEvent(vshControl *ctl, const vshCmd *cmd) return true; } - if (vshCommandOptStringReq(ctl, cmd, "event", &eventName) < 0) + if (vshCommandOptString(ctl, cmd, "event", &eventName) < 0) return false; if (!eventName) { vshError(ctl, "%s", _("either --list or --event <type> is required")); @@ -958,7 +958,7 @@ cmdNodeDeviceEvent(vshControl *ctl, const vshCmd *cmd) data.cb = &virshNodeDeviceEventCallbacks[event]; if (vshCommandOptTimeoutToMs(ctl, cmd, &timeout) < 0) return false; - if (vshCommandOptStringReq(ctl, cmd, "device", &device_value) < 0) + if (vshCommandOptString(ctl, cmd, "device", &device_value) < 0) return false; if (device_value) { @@ -1025,7 +1025,7 @@ cmdNodeDeviceUndefine(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) g_autoptr(virshNodeDevice) dev = NULL; const char *device_value = NULL; - if (vshCommandOptStringReq(ctl, cmd, "device", &device_value) < 0) + if (vshCommandOptString(ctl, cmd, "device", &device_value) < 0) return false; dev = vshFindNodeDevice(ctl, device_value); @@ -1072,7 +1072,7 @@ cmdNodeDeviceDefine(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) virshControl *priv = ctl->privData; unsigned int flags = 0; - if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) + if (vshCommandOptString(ctl, cmd, "file", &from) < 0) return false; if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) @@ -1119,7 +1119,7 @@ cmdNodeDeviceStart(vshControl *ctl, const vshCmd *cmd) bool ret = true; virshControl *priv = ctl->privData; - if (vshCommandOptStringReq(ctl, cmd, "device", &name) < 0) + if (vshCommandOptString(ctl, cmd, "device", &name) < 0) return false; if (!(device = virNodeDeviceLookupByName(priv->conn, name))) { @@ -1168,7 +1168,7 @@ cmdNodeDeviceAutostart(vshControl *ctl, const vshCmd *cmd) const char *name = NULL; int autostart; - if (vshCommandOptStringReq(ctl, cmd, "device", &name) < 0) + if (vshCommandOptString(ctl, cmd, "device", &name) < 0) return false; dev = vshFindNodeDevice(ctl, name); @@ -1223,7 +1223,7 @@ cmdNodeDeviceInfo(vshControl *ctl, const vshCmd *cmd) int autostart; const char *parent = NULL; - if (vshCommandOptStringReq(ctl, cmd, "device", &device_value) < 0) + if (vshCommandOptString(ctl, cmd, "device", &device_value) < 0) return false; device = vshFindNodeDevice(ctl, device_value); @@ -1286,7 +1286,7 @@ cmdNodeDeviceUpdate(vshControl *ctl, const vshCmd *cmd) VSH_EXCLUSIVE_OPTIONS("current", "live"); VSH_EXCLUSIVE_OPTIONS("current", "config"); - if (vshCommandOptStringReq(ctl, cmd, "device", &device_value) < 0) + if (vshCommandOptString(ctl, cmd, "device", &device_value) < 0) return false; device = vshFindNodeDevice(ctl, device_value); @@ -1294,7 +1294,7 @@ cmdNodeDeviceUpdate(vshControl *ctl, const vshCmd *cmd) if (!device) return false; - if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) + if (vshCommandOptString(ctl, cmd, "file", &from) < 0) goto cleanup; if (virFileReadAll(from, VSH_MAX_XML_FILE, &xml) < 0) diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c index 69473b4935..56133d6566 100644 --- a/tools/virsh-nwfilter.c +++ b/tools/virsh-nwfilter.c @@ -38,7 +38,7 @@ virshCommandOptNWFilterBy(vshControl *ctl, const vshCmd *cmd, virCheckFlags(VIRSH_BYUUID | VIRSH_BYNAME, NULL); - if (vshCommandOptStringReq(ctl, cmd, optname, &n) < 0) + if (vshCommandOptString(ctl, cmd, optname, &n) < 0) return NULL; vshDebug(ctl, VSH_ERR_INFO, "%s: found option <%s>: %s\n", @@ -94,7 +94,7 @@ cmdNWFilterDefine(vshControl *ctl, const vshCmd *cmd) unsigned int flags = 0; virshControl *priv = ctl->privData; - if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) + if (vshCommandOptString(ctl, cmd, "file", &from) < 0) return false; if (vshCommandOptBool(cmd, "validate")) @@ -447,7 +447,7 @@ virshCommandOptNWFilterBindingBy(vshControl *ctl, virCheckFlags(0, NULL); - if (vshCommandOptStringReq(ctl, cmd, optname, &n) < 0) + if (vshCommandOptString(ctl, cmd, optname, &n) < 0) return NULL; vshDebug(ctl, VSH_ERR_INFO, "%s: found option <%s>: %s\n", @@ -494,7 +494,7 @@ cmdNWFilterBindingCreate(vshControl *ctl, const vshCmd *cmd) unsigned int flags = 0; virshControl *priv = ctl->privData; - if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) + if (vshCommandOptString(ctl, cmd, "file", &from) < 0) return false; if (vshCommandOptBool(cmd, "validate")) diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index 24e7bb9bf5..f9aad8ded0 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -180,7 +180,7 @@ virshCommandOptPoolBy(vshControl *ctl, const vshCmd *cmd, const char *optname, virCheckFlags(VIRSH_BYUUID | VIRSH_BYNAME, NULL); - if (vshCommandOptStringReq(ctl, cmd, optname, &n) < 0) + if (vshCommandOptString(ctl, cmd, optname, &n) < 0) return NULL; if (cmd->skipChecks && !n) @@ -286,7 +286,7 @@ cmdPoolCreate(vshControl *ctl, const vshCmd *cmd) unsigned int flags = 0; virshControl *priv = ctl->privData; - if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) + if (vshCommandOptString(ctl, cmd, "file", &from) < 0) return false; build = vshCommandOptBool(cmd, "build"); @@ -340,31 +340,31 @@ virshBuildPoolXML(vshControl *ctl, VSH_EXCLUSIVE_OPTIONS("secret-usage", "secret-uuid"); - if (vshCommandOptStringReq(ctl, cmd, "name", &name) < 0) + if (vshCommandOptString(ctl, cmd, "name", &name) < 0) return false; - if (vshCommandOptStringReq(ctl, cmd, "type", &type) < 0) + if (vshCommandOptString(ctl, cmd, "type", &type) < 0) return false; - if (vshCommandOptStringReq(ctl, cmd, "source-host", &srcHost) < 0 || - vshCommandOptStringReq(ctl, cmd, "source-path", &srcPath) < 0 || - vshCommandOptStringReq(ctl, cmd, "source-dev", &srcDev) < 0 || - vshCommandOptStringReq(ctl, cmd, "source-name", &srcName) < 0 || - vshCommandOptStringReq(ctl, cmd, "source-format", &srcFormat) < 0 || - vshCommandOptStringReq(ctl, cmd, "target", &target) < 0 || - vshCommandOptStringReq(ctl, cmd, "auth-type", &authType) < 0 || - vshCommandOptStringReq(ctl, cmd, "auth-username", &authUsername) < 0 || - vshCommandOptStringReq(ctl, cmd, "secret-usage", &secretUsage) < 0 || - vshCommandOptStringReq(ctl, cmd, "secret-uuid", &secretUUID) < 0 || - vshCommandOptStringReq(ctl, cmd, "adapter-name", &adapterName) < 0 || - vshCommandOptStringReq(ctl, cmd, "adapter-wwnn", &adapterWwnn) < 0 || - vshCommandOptStringReq(ctl, cmd, "adapter-wwpn", &adapterWwpn) < 0 || - vshCommandOptStringReq(ctl, cmd, "adapter-parent", &adapterParent) < 0 || - vshCommandOptStringReq(ctl, cmd, "adapter-parent-wwnn", &adapterParentWwnn) < 0 || - vshCommandOptStringReq(ctl, cmd, "adapter-parent-wwpn", &adapterParentWwpn) < 0 || - vshCommandOptStringReq(ctl, cmd, "adapter-parent-fabric-wwn", &adapterParentFabricWwn) < 0 || - vshCommandOptStringReq(ctl, cmd, "source-protocol-ver", &protoVer) < 0 || - vshCommandOptStringReq(ctl, cmd, "source-initiator", &srcInitiator) < 0) { + if (vshCommandOptString(ctl, cmd, "source-host", &srcHost) < 0 || + vshCommandOptString(ctl, cmd, "source-path", &srcPath) < 0 || + vshCommandOptString(ctl, cmd, "source-dev", &srcDev) < 0 || + vshCommandOptString(ctl, cmd, "source-name", &srcName) < 0 || + vshCommandOptString(ctl, cmd, "source-format", &srcFormat) < 0 || + vshCommandOptString(ctl, cmd, "target", &target) < 0 || + vshCommandOptString(ctl, cmd, "auth-type", &authType) < 0 || + vshCommandOptString(ctl, cmd, "auth-username", &authUsername) < 0 || + vshCommandOptString(ctl, cmd, "secret-usage", &secretUsage) < 0 || + vshCommandOptString(ctl, cmd, "secret-uuid", &secretUUID) < 0 || + vshCommandOptString(ctl, cmd, "adapter-name", &adapterName) < 0 || + vshCommandOptString(ctl, cmd, "adapter-wwnn", &adapterWwnn) < 0 || + vshCommandOptString(ctl, cmd, "adapter-wwpn", &adapterWwpn) < 0 || + vshCommandOptString(ctl, cmd, "adapter-parent", &adapterParent) < 0 || + vshCommandOptString(ctl, cmd, "adapter-parent-wwnn", &adapterParentWwnn) < 0 || + vshCommandOptString(ctl, cmd, "adapter-parent-wwpn", &adapterParentWwpn) < 0 || + vshCommandOptString(ctl, cmd, "adapter-parent-fabric-wwn", &adapterParentFabricWwn) < 0 || + vshCommandOptString(ctl, cmd, "source-protocol-ver", &protoVer) < 0 || + vshCommandOptString(ctl, cmd, "source-initiator", &srcInitiator) < 0) { return false; } @@ -530,7 +530,7 @@ cmdPoolDefine(vshControl *ctl, const vshCmd *cmd) unsigned int flags = 0; virshControl *priv = ctl->privData; - if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) + if (vshCommandOptString(ctl, cmd, "file", &from) < 0) return false; if (vshCommandOptBool(cmd, "validate")) @@ -1124,7 +1124,7 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) if (vshCommandOptBool(cmd, "name")) name = true; - if (vshCommandOptStringReq(ctl, cmd, "type", &type) < 0) + if (vshCommandOptString(ctl, cmd, "type", &type) < 0) return false; VSH_EXCLUSIVE_OPTIONS("details", "uuid"); @@ -1407,16 +1407,16 @@ cmdPoolDiscoverSourcesAs(vshControl * ctl, const vshCmd * cmd G_GNUC_UNUSED) const char *initiator = NULL; virshControl *priv = ctl->privData; - if (vshCommandOptStringReq(ctl, cmd, "type", &type) < 0 || - vshCommandOptStringReq(ctl, cmd, "host", &host) < 0 || - vshCommandOptStringReq(ctl, cmd, "initiator", &initiator) < 0) + if (vshCommandOptString(ctl, cmd, "type", &type) < 0 || + vshCommandOptString(ctl, cmd, "host", &host) < 0 || + vshCommandOptString(ctl, cmd, "initiator", &initiator) < 0) return false; if (host) { const char *port = NULL; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - if (vshCommandOptStringReq(ctl, cmd, "port", &port) < 0) { + if (vshCommandOptString(ctl, cmd, "port", &port) < 0) { vshError(ctl, "%s", _("missing argument")); return false; } @@ -1480,10 +1480,10 @@ cmdPoolDiscoverSources(vshControl * ctl, const vshCmd * cmd G_GNUC_UNUSED) char *srcSpec = NULL, *srcList; virshControl *priv = ctl->privData; - if (vshCommandOptStringReq(ctl, cmd, "type", &type) < 0) + if (vshCommandOptString(ctl, cmd, "type", &type) < 0) return false; - if (vshCommandOptStringReq(ctl, cmd, "srcSpec", &srcSpecFile) < 0) + if (vshCommandOptString(ctl, cmd, "srcSpec", &srcSpecFile) < 0) return false; if (srcSpecFile && virFileReadAll(srcSpecFile, VSH_MAX_XML_FILE, @@ -1952,7 +1952,7 @@ cmdPoolEvent(vshControl *ctl, const vshCmd *cmd) return true; } - if (vshCommandOptStringReq(ctl, cmd, "event", &eventName) < 0) + if (vshCommandOptString(ctl, cmd, "event", &eventName) < 0) return false; if (!eventName) { vshError(ctl, "%s", _("either --list or --event <type> is required")); diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index 5653451862..d9435e4357 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -41,7 +41,7 @@ virshCommandOptSecret(vshControl *ctl, const vshCmd *cmd, const char **name) const char *optname = "secret"; virshControl *priv = ctl->privData; - if (vshCommandOptStringReq(ctl, cmd, optname, &n) < 0) + if (vshCommandOptString(ctl, cmd, optname, &n) < 0) return NULL; vshDebug(ctl, VSH_ERR_DEBUG, @@ -86,7 +86,7 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd) unsigned int flags = 0; virshControl *priv = ctl->privData; - if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) + if (vshCommandOptString(ctl, cmd, "file", &from) < 0) return false; if (vshCommandOptBool(cmd, "validate")) @@ -227,10 +227,10 @@ cmdSecretSetValue(vshControl *ctl, const vshCmd *cmd) if (!(secret = virshCommandOptSecret(ctl, cmd, NULL))) return false; - if (vshCommandOptStringReq(ctl, cmd, "base64", &base64) < 0) + if (vshCommandOptString(ctl, cmd, "base64", &base64) < 0) return false; - if (vshCommandOptStringReq(ctl, cmd, "file", &filename) < 0) + if (vshCommandOptString(ctl, cmd, "file", &filename) < 0) return false; if (base64) { @@ -763,7 +763,7 @@ cmdSecretEvent(vshControl *ctl, const vshCmd *cmd) return true; } - if (vshCommandOptStringReq(ctl, cmd, "event", &eventName) < 0) + if (vshCommandOptString(ctl, cmd, "event", &eventName) < 0) return false; if (!eventName) { vshError(ctl, "%s", _("either --list or --event <type> is required")); diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 80448ca08d..415a390786 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -182,7 +182,7 @@ cmdSnapshotCreate(vshControl *ctl, const vshCmd *cmd) if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptStringReq(ctl, cmd, "xmlfile", &from) < 0) + if (vshCommandOptString(ctl, cmd, "xmlfile", &from) < 0) return false; if (!from) { buffer = g_strdup("<domainsnapshot/>"); @@ -401,8 +401,8 @@ cmdSnapshotCreateAs(vshControl *ctl, const vshCmd *cmd) if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptStringReq(ctl, cmd, "name", &name) < 0 || - vshCommandOptStringReq(ctl, cmd, "description", &desc) < 0) + if (vshCommandOptString(ctl, cmd, "name", &name) < 0 || + vshCommandOptString(ctl, cmd, "description", &desc) < 0) return false; virBufferAddLit(&buf, "<domainsnapshot>\n"); @@ -410,7 +410,7 @@ cmdSnapshotCreateAs(vshControl *ctl, const vshCmd *cmd) virBufferEscapeString(&buf, "<name>%s</name>\n", name); virBufferEscapeString(&buf, "<description>%s</description>\n", desc); - if (vshCommandOptStringReq(ctl, cmd, "memspec", &memspec) < 0) + if (vshCommandOptString(ctl, cmd, "memspec", &memspec) < 0) return false; if (memspec && virshParseSnapshotMemspec(ctl, &buf, memspec) < 0) @@ -451,7 +451,7 @@ virshLookupSnapshot(vshControl *ctl, const vshCmd *cmd, bool current = vshCommandOptBool(cmd, "current"); const char *snapname = NULL; - if (vshCommandOptStringReq(ctl, cmd, arg, &snapname) < 0) + if (vshCommandOptString(ctl, cmd, arg, &snapname) < 0) return -1; if (exclusive && current && snapname) { @@ -629,7 +629,7 @@ cmdSnapshotCurrent(vshControl *ctl, const vshCmd *cmd) if (!(dom = virshCommandOptDomain(ctl, cmd, &domname))) return false; - if (vshCommandOptStringReq(ctl, cmd, "snapshotname", &snapshotname) < 0) + if (vshCommandOptString(ctl, cmd, "snapshotname", &snapshotname) < 0) goto cleanup; if (snapshotname) { @@ -1616,7 +1616,7 @@ cmdSnapshotDumpXML(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "security-info")) flags |= VIR_DOMAIN_XML_SECURE; - if (vshCommandOptStringReq(ctl, cmd, "snapshotname", &name) < 0) + if (vshCommandOptString(ctl, cmd, "snapshotname", &name) < 0) return false; if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) diff --git a/tools/virsh-util.c b/tools/virsh-util.c index a6026eed53..ab350f0326 100644 --- a/tools/virsh-util.c +++ b/tools/virsh-util.c @@ -87,7 +87,7 @@ virshCommandOptDomainBy(vshControl *ctl, const char *n = NULL; const char *optname = "domain"; - if (vshCommandOptStringReq(ctl, cmd, optname, &n) < 0) + if (vshCommandOptString(ctl, cmd, optname, &n) < 0) return NULL; vshDebug(ctl, VSH_ERR_INFO, "%s: found option <%s>: %s\n", diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 67a6f2eda0..8805b8c06b 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -92,11 +92,11 @@ virshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd, virCheckFlags(VIRSH_BYUUID | VIRSH_BYNAME, NULL); - if (vshCommandOptStringReq(ctl, cmd, optname, &n) < 0) + if (vshCommandOptString(ctl, cmd, optname, &n) < 0) return NULL; if (pooloptname != NULL && - vshCommandOptStringReq(ctl, cmd, pooloptname, &p) < 0) + vshCommandOptString(ctl, cmd, pooloptname, &p) < 0) return NULL; if (p) { @@ -249,10 +249,10 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd) if (!(pool = virshCommandOptPool(ctl, cmd, "pool", NULL))) return false; - if (vshCommandOptStringReq(ctl, cmd, "name", &name) < 0) + if (vshCommandOptString(ctl, cmd, "name", &name) < 0) return false; - if (vshCommandOptStringReq(ctl, cmd, "capacity", &capacityStr) < 0) + if (vshCommandOptString(ctl, cmd, "capacity", &capacityStr) < 0) return false; if (virshVolSize(capacityStr, &capacity) < 0) { @@ -266,10 +266,9 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd) return false; } - if (vshCommandOptStringReq(ctl, cmd, "format", &format) < 0 || - vshCommandOptStringReq(ctl, cmd, "backing-vol", &snapshotStrVol) < 0 || - vshCommandOptStringReq(ctl, cmd, "backing-vol-format", - &snapshotStrFormat) < 0) + if (vshCommandOptString(ctl, cmd, "format", &format) < 0 || + vshCommandOptString(ctl, cmd, "backing-vol", &snapshotStrVol) < 0 || + vshCommandOptString(ctl, cmd, "backing-vol-format", &snapshotStrFormat) < 0) return false; virBufferAddLit(&buf, "<volume>\n"); @@ -404,7 +403,7 @@ cmdVolCreate(vshControl *ctl, const vshCmd *cmd) if (!(pool = virshCommandOptPool(ctl, cmd, "pool", NULL))) return false; - if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) + if (vshCommandOptString(ctl, cmd, "file", &from) < 0) return false; if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) { @@ -477,7 +476,7 @@ cmdVolCreateFrom(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "validate")) flags |= VIR_STORAGE_VOL_CREATE_VALIDATE; - if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) + if (vshCommandOptString(ctl, cmd, "file", &from) < 0) return false; if (!(inputvol = virshCommandOptVol(ctl, cmd, "vol", "inputpool", NULL))) @@ -577,7 +576,7 @@ cmdVolClone(vshControl *ctl, const vshCmd *cmd) return false; } - if (vshCommandOptStringReq(ctl, cmd, "newname", &name) < 0) + if (vshCommandOptString(ctl, cmd, "newname", &name) < 0) return false; if (!(origxml = virStorageVolGetXMLDesc(origvol, 0))) @@ -656,7 +655,7 @@ cmdVolUpload(vshControl *ctl, const vshCmd *cmd) if (!(vol = virshCommandOptVol(ctl, cmd, "vol", "pool", &name))) return false; - if (vshCommandOptStringReq(ctl, cmd, "file", &file) < 0) + if (vshCommandOptString(ctl, cmd, "file", &file) < 0) return false; if ((fd = open(file, O_RDONLY)) < 0) { @@ -768,7 +767,7 @@ cmdVolDownload(vshControl *ctl, const vshCmd *cmd) if (!(vol = virshCommandOptVol(ctl, cmd, "vol", "pool", &name))) return false; - if (vshCommandOptStringReq(ctl, cmd, "file", &file) < 0) + if (vshCommandOptString(ctl, cmd, "file", &file) < 0) goto cleanup; if (vshCommandOptBool(cmd, "sparse")) @@ -908,7 +907,7 @@ cmdVolWipe(vshControl *ctl, const vshCmd *cmd) if (!(vol = virshCommandOptVol(ctl, cmd, "vol", "pool", &name))) return false; - if (vshCommandOptStringReq(ctl, cmd, "algorithm", &algorithm_str) < 0) + if (vshCommandOptString(ctl, cmd, "algorithm", &algorithm_str) < 0) return false; if (algorithm_str && @@ -1078,7 +1077,7 @@ cmdVolResize(vshControl *ctl, const vshCmd *cmd) if (!(vol = virshCommandOptVol(ctl, cmd, "vol", "pool", NULL))) return false; - if (vshCommandOptStringReq(ctl, cmd, "capacity", &capacityStr) < 0) + if (vshCommandOptString(ctl, cmd, "capacity", &capacityStr) < 0) return false; virSkipSpaces(&capacityStr); if (*capacityStr == '-') { diff --git a/tools/virsh.c b/tools/virsh.c index 0a586fd639..58ebb493fc 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -269,7 +269,7 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd) bool ro = vshCommandOptBool(cmd, "readonly"); const char *name = NULL; - if (vshCommandOptStringReq(ctl, cmd, "name", &name) < 0) + if (vshCommandOptString(ctl, cmd, "name", &name) < 0) return false; if (virshReconnect(ctl, name, ro, true) < 0) diff --git a/tools/virt-admin.c b/tools/virt-admin.c index 9a10a4eb45..a996923094 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -273,7 +273,7 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd) vshAdmControl *priv = ctl->privData; bool connected = priv->conn; - if (vshCommandOptStringReq(ctl, cmd, "name", &name) < 0) + if (vshCommandOptString(ctl, cmd, "name", &name) < 0) return false; if (name) { @@ -379,7 +379,7 @@ cmdSrvThreadpoolInfo(vshControl *ctl, const vshCmd *cmd) virAdmServerPtr srv = NULL; vshAdmControl *priv = ctl->privData; - if (vshCommandOptStringReq(ctl, cmd, "server", &srvname) < 0) + if (vshCommandOptString(ctl, cmd, "server", &srvname) < 0) return false; if (!(srv = virAdmConnectLookupServer(priv->conn, srvname, 0))) @@ -454,7 +454,7 @@ cmdSrvThreadpoolSet(vshControl *ctl, const vshCmd *cmd) virAdmServerPtr srv = NULL; vshAdmControl *priv = ctl->privData; - if (vshCommandOptStringReq(ctl, cmd, "server", &srvname) < 0) + if (vshCommandOptString(ctl, cmd, "server", &srvname) < 0) return false; #define PARSE_CMD_TYPED_PARAM(NAME, FIELD) \ @@ -545,7 +545,7 @@ cmdSrvClientsList(vshControl *ctl, const vshCmd *cmd) vshAdmControl *priv = ctl->privData; g_autoptr(vshTable) table = NULL; - if (vshCommandOptStringReq(ctl, cmd, "server", &srvname) < 0) + if (vshCommandOptString(ctl, cmd, "server", &srvname) < 0) return false; if (!(srv = virAdmConnectLookupServer(priv->conn, srvname, 0))) @@ -638,7 +638,7 @@ cmdClientInfo(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptULongLong(ctl, cmd, "client", &id) < 0) return false; - if (vshCommandOptStringReq(ctl, cmd, "server", &srvname) < 0) + if (vshCommandOptString(ctl, cmd, "server", &srvname) < 0) return false; if (!(srv = virAdmConnectLookupServer(priv->conn, srvname, 0)) || @@ -714,7 +714,7 @@ cmdClientDisconnect(vshControl *ctl, const vshCmd *cmd) virAdmClientPtr client = NULL; vshAdmControl *priv = ctl->privData; - if (vshCommandOptStringReq(ctl, cmd, "server", &srvname) < 0) + if (vshCommandOptString(ctl, cmd, "server", &srvname) < 0) return false; if (vshCommandOptULongLongWrap(ctl, cmd, "client", &id) < 0) @@ -772,7 +772,7 @@ cmdSrvClientsInfo(vshControl *ctl, const vshCmd *cmd) virAdmServerPtr srv = NULL; vshAdmControl *priv = ctl->privData; - if (vshCommandOptStringReq(ctl, cmd, "server", &srvname) < 0) + if (vshCommandOptString(ctl, cmd, "server", &srvname) < 0) return false; if (!(srv = virAdmConnectLookupServer(priv->conn, srvname, 0))) @@ -841,7 +841,7 @@ cmdSrvClientsSet(vshControl *ctl, const vshCmd *cmd) virTypedParameterPtr params = NULL; vshAdmControl *priv = ctl->privData; - if (vshCommandOptStringReq(ctl, cmd, "server", &srvname) < 0) + if (vshCommandOptString(ctl, cmd, "server", &srvname) < 0) return false; #define PARSE_CMD_TYPED_PARAM(NAME, FIELD) \ @@ -925,7 +925,7 @@ cmdSrvUpdateTlsFiles(vshControl *ctl, const vshCmd *cmd) virAdmServerPtr srv = NULL; vshAdmControl *priv = ctl->privData; - if (vshCommandOptStringReq(ctl, cmd, "server", &srvname) < 0) + if (vshCommandOptString(ctl, cmd, "server", &srvname) < 0) return false; if (!(srv = virAdmConnectLookupServer(priv->conn, srvname, 0))) @@ -973,7 +973,7 @@ cmdDaemonLogFilters(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "filters")) { const char *filters = NULL; - if ((vshCommandOptStringReq(ctl, cmd, "filters", &filters) < 0 || + if ((vshCommandOptString(ctl, cmd, "filters", &filters) < 0 || virAdmConnectSetLoggingFilters(priv->conn, filters, 0) < 0)) { vshError(ctl, _("Unable to change daemon logging settings")); return false; @@ -1056,7 +1056,7 @@ cmdDaemonLogOutputs(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "outputs")) { const char *outputs = NULL; - if ((vshCommandOptStringReq(ctl, cmd, "outputs", &outputs) < 0 || + if ((vshCommandOptString(ctl, cmd, "outputs", &outputs) < 0 || virAdmConnectSetLoggingOutputs(priv->conn, outputs, 0) < 0)) { vshError(ctl, _("Unable to change daemon logging settings")); return false; diff --git a/tools/vsh.c b/tools/vsh.c index 2805574ec6..d6c05c46e6 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -1036,7 +1036,7 @@ vshCommandOptStringQuiet(vshControl *ctl G_GNUC_UNUSED, const vshCmd *cmd, } /** - * vshCommandOptStringReq: + * vshCommandOptString: * @ctl virtshell control structure * @cmd command structure * @name option name @@ -1049,10 +1049,10 @@ vshCommandOptStringQuiet(vshControl *ctl G_GNUC_UNUSED, const vshCmd *cmd, * returned and error message printed. */ int -vshCommandOptStringReq(vshControl *ctl, - const vshCmd *cmd, - const char *name, - const char **value) +vshCommandOptString(vshControl *ctl, + const vshCmd *cmd, + const char *name, + const char **value) { vshCmdOpt *arg; int ret; diff --git a/tools/vsh.h b/tools/vsh.h index eeba1d4b3c..a51140eeee 100644 --- a/tools/vsh.h +++ b/tools/vsh.h @@ -265,7 +265,7 @@ int vshCommandOptULWrap(vshControl *ctl, const vshCmd *cmd, int vshCommandOptStringQuiet(vshControl *ctl, const vshCmd *cmd, const char *name, const char **value) ATTRIBUTE_NONNULL(4) G_GNUC_WARN_UNUSED_RESULT; -int vshCommandOptStringReq(vshControl *ctl, const vshCmd *cmd, +int vshCommandOptString(vshControl *ctl, const vshCmd *cmd, const char *name, const char **value) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) G_GNUC_WARN_UNUSED_RESULT; -- 2.44.0

While the 'complete' command is meant to be hidden and used only for the completion script, there's nothing preventing it being used in all virsh modes. This poses a problem as the command tries to close 'stdin' to avoid the possibility that an auth callback would want to read the password. In interactive mode this immediately terminates virsh and in non-interactive mode it attempts to close it multiple times if you use virsh in batch mode. Fix the issues by using virOnce() to close it exactly once and do so only in non-interactive mode. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tools/vsh.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index d6c05c46e6..8719875413 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -3401,11 +3401,25 @@ const vshCmdInfo info_complete = { #ifdef WITH_READLINE + +static virOnceControl vshCmdCompleteCloseStdinOnce = VIR_ONCE_CONTROL_INITIALIZER; + +static void +vshCmdCompleteCloseStdin(void) +{ + /* In non-interactive mode which is how the 'complete' command is intended + * to be used we need to ensure that any authentication callback will not + * attempt to read any input which would break the completion */ + int stdin_fileno = STDIN_FILENO; + + VIR_FORCE_CLOSE(stdin_fileno); +} + + bool cmdComplete(vshControl *ctl, const vshCmd *cmd) { const vshClientHooks *hooks = ctl->hooks; - int stdin_fileno = STDIN_FILENO; const char *arg = ""; const vshCmdOpt *opt = NULL; g_auto(GStrv) matches = NULL; @@ -3418,7 +3432,10 @@ cmdComplete(vshControl *ctl, const vshCmd *cmd) /* This command is flagged VSH_CMD_FLAG_NOCONNECT because we * need to prevent auth hooks reading any input. Therefore, we * have to close stdin and then connect ourselves. */ - VIR_FORCE_CLOSE(stdin_fileno); + if (!ctl->imode) { + if (virOnce(&vshCmdCompleteCloseStdinOnce, vshCmdCompleteCloseStdin) < 0) + return false; + } if (!(hooks && hooks->connHandler && hooks->connHandler(ctl))) return false; -- 2.44.0

Add both single invocations as well as a script containing the same commands. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tests/virshtest.c | 37 ++++++++++ .../completion-arg-full-argv-next.out | 2 + .../completion-arg-full-argv.out | 2 + .../completion-arg-full-bool-next.out | 7 ++ .../completion-arg-full-bool.out | 2 + .../completion-arg-full-string-next.out | 7 ++ .../completion-arg-full-string.out | 2 + .../virshtestdata/completion-arg-partial.out | 4 ++ .../completion-arg-positional-empty.out | 3 + ...completion-arg-positional-partial-next.out | 2 + .../completion-arg-positional-partial.out | 2 + tests/virshtestdata/completion-args.out | 7 ++ .../completion-argv-multiple-next.out | 25 +++++++ ...mpletion-argv-multiple-positional-next.out | 25 +++++++ .../completion-argv-multiple-positional.out | 2 + .../completion-argv-multiple.out | 2 + .../completion-command-complete.out | 2 + tests/virshtestdata/completion-command.out | 2 + tests/virshtestdata/completion.in | 16 +++++ tests/virshtestdata/completion.out | 71 +++++++++++++++++++ 20 files changed, 222 insertions(+) create mode 100644 tests/virshtestdata/completion-arg-full-argv-next.out create mode 100644 tests/virshtestdata/completion-arg-full-argv.out create mode 100644 tests/virshtestdata/completion-arg-full-bool-next.out create mode 100644 tests/virshtestdata/completion-arg-full-bool.out create mode 100644 tests/virshtestdata/completion-arg-full-string-next.out create mode 100644 tests/virshtestdata/completion-arg-full-string.out create mode 100644 tests/virshtestdata/completion-arg-partial.out create mode 100644 tests/virshtestdata/completion-arg-positional-empty.out create mode 100644 tests/virshtestdata/completion-arg-positional-partial-next.out create mode 100644 tests/virshtestdata/completion-arg-positional-partial.out create mode 100644 tests/virshtestdata/completion-args.out create mode 100644 tests/virshtestdata/completion-argv-multiple-next.out create mode 100644 tests/virshtestdata/completion-argv-multiple-positional-next.out create mode 100644 tests/virshtestdata/completion-argv-multiple-positional.out create mode 100644 tests/virshtestdata/completion-argv-multiple.out create mode 100644 tests/virshtestdata/completion-command-complete.out create mode 100644 tests/virshtestdata/completion-command.out create mode 100644 tests/virshtestdata/completion.in create mode 100644 tests/virshtestdata/completion.out diff --git a/tests/virshtest.c b/tests/virshtest.c index 14a96f2d35..869ecbb358 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -342,6 +342,43 @@ mymain(void) "checkpoint-create test --redefine checkpoint-c2.xml ;" "checkpoint-info test c2"); + DO_TEST_FULL("completion-command", NULL, VIRSH_CUSTOM, + "complete", "--", "ech"); + DO_TEST_FULL("completion-command-complete", NULL, VIRSH_CUSTOM, + "complete", "--", "echo"); + DO_TEST_FULL("completion-args", NULL, VIRSH_CUSTOM, + "complete", "--", "echo", ""); + DO_TEST_FULL("completion-arg-partial", NULL, VIRSH_CUSTOM, + "complete", "--", "echo", "--xm", "--s"); + DO_TEST_FULL("completion-arg-full-bool", NULL, VIRSH_CUSTOM, + "complete", "--", "echo", "--nonexistant-arg", "--xml"); + DO_TEST_FULL("completion-arg-full-bool-next", NULL, VIRSH_CUSTOM, + "complete", "--", "echo", "--nonexistant-arg", "--xml", ""); + DO_TEST_FULL("completion-arg-full-string", NULL, VIRSH_CUSTOM, + "complete", "--", "echo", "--nonexistant-arg", "--prefix"); + DO_TEST_FULL("completion-arg-full-string-next", NULL, VIRSH_CUSTOM, + "complete", "--", "echo", "--nonexistant-arg", "--prefix", ""); + DO_TEST_FULL("completion-arg-full-argv", NULL, VIRSH_CUSTOM, + "complete", "--", "domstats", "--domain"); + DO_TEST_FULL("completion-arg-full-argv-next", NULL, VIRSH_DEFAULT, + "complete", "--", "domstats", "--domain", ""); + DO_TEST_FULL("completion-argv-multiple", NULL, VIRSH_CUSTOM, + "complete", "--", "domstats", "--domain", "fc", "--domain", "fv"); + DO_TEST_FULL("completion-argv-multiple-next", NULL, VIRSH_CUSTOM, + "complete", "--", "domstats", "--domain", "fv", "--domain", "fc", ""); + DO_TEST_FULL("completion-argv-multiple-positional", NULL, VIRSH_CUSTOM, + "complete", "--", "domstats", "--domain", "fc", "fv"); + DO_TEST_FULL("completion-argv-multiple-positional-next", NULL, VIRSH_CUSTOM, + "complete", "--", "domstats", "--domain", "fc", "fv", ""); + DO_TEST_FULL("completion-arg-positional-empty", NULL, VIRSH_CUSTOM, + "complete", "--", "domstate", ""); + DO_TEST_FULL("completion-arg-positional-partial", NULL, VIRSH_CUSTOM, + "complete", "--", "domstate", "fv"); + DO_TEST_FULL("completion-arg-positional-partial-next", NULL, VIRSH_CUSTOM, + "complete", "--", "domstate", "fv", ""); + + DO_TEST_SCRIPT("completion", NULL, VIRSH_DEFAULT); + if (virTestRun("read-big-pipe", testVirshPipe, NULL) < 0) ret = -1; diff --git a/tests/virshtestdata/completion-arg-full-argv-next.out b/tests/virshtestdata/completion-arg-full-argv-next.out new file mode 100644 index 0000000000..76e579ae4c --- /dev/null +++ b/tests/virshtestdata/completion-arg-full-argv-next.out @@ -0,0 +1,2 @@ +test + diff --git a/tests/virshtestdata/completion-arg-full-argv.out b/tests/virshtestdata/completion-arg-full-argv.out new file mode 100644 index 0000000000..2d795410c2 --- /dev/null +++ b/tests/virshtestdata/completion-arg-full-argv.out @@ -0,0 +1,2 @@ +--domain + diff --git a/tests/virshtestdata/completion-arg-full-bool-next.out b/tests/virshtestdata/completion-arg-full-bool-next.out new file mode 100644 index 0000000000..3fc6e035d0 --- /dev/null +++ b/tests/virshtestdata/completion-arg-full-bool-next.out @@ -0,0 +1,7 @@ +--shell +--xml +--split +--err +--prefix +--string + diff --git a/tests/virshtestdata/completion-arg-full-bool.out b/tests/virshtestdata/completion-arg-full-bool.out new file mode 100644 index 0000000000..511582e4c9 --- /dev/null +++ b/tests/virshtestdata/completion-arg-full-bool.out @@ -0,0 +1,2 @@ +--xml + diff --git a/tests/virshtestdata/completion-arg-full-string-next.out b/tests/virshtestdata/completion-arg-full-string-next.out new file mode 100644 index 0000000000..3fc6e035d0 --- /dev/null +++ b/tests/virshtestdata/completion-arg-full-string-next.out @@ -0,0 +1,7 @@ +--shell +--xml +--split +--err +--prefix +--string + diff --git a/tests/virshtestdata/completion-arg-full-string.out b/tests/virshtestdata/completion-arg-full-string.out new file mode 100644 index 0000000000..b29473399a --- /dev/null +++ b/tests/virshtestdata/completion-arg-full-string.out @@ -0,0 +1,2 @@ +--prefix + diff --git a/tests/virshtestdata/completion-arg-partial.out b/tests/virshtestdata/completion-arg-partial.out new file mode 100644 index 0000000000..cc2820d9a8 --- /dev/null +++ b/tests/virshtestdata/completion-arg-partial.out @@ -0,0 +1,4 @@ +--shell +--split +--string + diff --git a/tests/virshtestdata/completion-arg-positional-empty.out b/tests/virshtestdata/completion-arg-positional-empty.out new file mode 100644 index 0000000000..cf2bdf1586 --- /dev/null +++ b/tests/virshtestdata/completion-arg-positional-empty.out @@ -0,0 +1,3 @@ +--domain +--reason + diff --git a/tests/virshtestdata/completion-arg-positional-partial-next.out b/tests/virshtestdata/completion-arg-positional-partial-next.out new file mode 100644 index 0000000000..d9e9cd0a05 --- /dev/null +++ b/tests/virshtestdata/completion-arg-positional-partial-next.out @@ -0,0 +1,2 @@ +--reason + diff --git a/tests/virshtestdata/completion-arg-positional-partial.out b/tests/virshtestdata/completion-arg-positional-partial.out new file mode 100644 index 0000000000..4289a724d9 --- /dev/null +++ b/tests/virshtestdata/completion-arg-positional-partial.out @@ -0,0 +1,2 @@ +fv0 + diff --git a/tests/virshtestdata/completion-args.out b/tests/virshtestdata/completion-args.out new file mode 100644 index 0000000000..3fc6e035d0 --- /dev/null +++ b/tests/virshtestdata/completion-args.out @@ -0,0 +1,7 @@ +--shell +--xml +--split +--err +--prefix +--string + diff --git a/tests/virshtestdata/completion-argv-multiple-next.out b/tests/virshtestdata/completion-argv-multiple-next.out new file mode 100644 index 0000000000..b29a060eff --- /dev/null +++ b/tests/virshtestdata/completion-argv-multiple-next.out @@ -0,0 +1,25 @@ +--state +--cpu-total +--balloon +--vcpu +--interface +--block +--perf +--iothread +--memory +--dirtyrate +--vm +--list-active +--list-inactive +--list-persistent +--list-transient +--list-running +--list-paused +--list-shutoff +--list-other +--raw +--enforce +--backing +--nowait +--domain + diff --git a/tests/virshtestdata/completion-argv-multiple-positional-next.out b/tests/virshtestdata/completion-argv-multiple-positional-next.out new file mode 100644 index 0000000000..b29a060eff --- /dev/null +++ b/tests/virshtestdata/completion-argv-multiple-positional-next.out @@ -0,0 +1,25 @@ +--state +--cpu-total +--balloon +--vcpu +--interface +--block +--perf +--iothread +--memory +--dirtyrate +--vm +--list-active +--list-inactive +--list-persistent +--list-transient +--list-running +--list-paused +--list-shutoff +--list-other +--raw +--enforce +--backing +--nowait +--domain + diff --git a/tests/virshtestdata/completion-argv-multiple-positional.out b/tests/virshtestdata/completion-argv-multiple-positional.out new file mode 100644 index 0000000000..4289a724d9 --- /dev/null +++ b/tests/virshtestdata/completion-argv-multiple-positional.out @@ -0,0 +1,2 @@ +fv0 + diff --git a/tests/virshtestdata/completion-argv-multiple.out b/tests/virshtestdata/completion-argv-multiple.out new file mode 100644 index 0000000000..4289a724d9 --- /dev/null +++ b/tests/virshtestdata/completion-argv-multiple.out @@ -0,0 +1,2 @@ +fv0 + diff --git a/tests/virshtestdata/completion-command-complete.out b/tests/virshtestdata/completion-command-complete.out new file mode 100644 index 0000000000..40cf7bd7c0 --- /dev/null +++ b/tests/virshtestdata/completion-command-complete.out @@ -0,0 +1,2 @@ +echo + diff --git a/tests/virshtestdata/completion-command.out b/tests/virshtestdata/completion-command.out new file mode 100644 index 0000000000..40cf7bd7c0 --- /dev/null +++ b/tests/virshtestdata/completion-command.out @@ -0,0 +1,2 @@ +echo + diff --git a/tests/virshtestdata/completion.in b/tests/virshtestdata/completion.in new file mode 100644 index 0000000000..cd2594609f --- /dev/null +++ b/tests/virshtestdata/completion.in @@ -0,0 +1,16 @@ +complete -- ech +complete -- echo +complete -- echo '' +complete -- echo --xm --s +complete -- echo --nonexistant-arg --xml +complete -- echo --nonexistant-arg --xml '' +complete -- echo --nonexistant-arg --prefix +complete -- echo --nonexistant-arg --prefix '' +complete -- domstats --domain +complete -- domstats --domain '' +complete -- domstats --domain f +complete -- domstats --domain fc --domain fv +complete -- domstats --domain fv --domain fc '' +complete -- domstats --domain fc fv +complete -- domstate '' +complete -- domstate fv diff --git a/tests/virshtestdata/completion.out b/tests/virshtestdata/completion.out new file mode 100644 index 0000000000..9cceb088e3 --- /dev/null +++ b/tests/virshtestdata/completion.out @@ -0,0 +1,71 @@ +echo + +echo + +--shell +--xml +--split +--err +--prefix +--string + +--shell +--split +--string + +--xml + +--shell +--xml +--split +--err +--prefix +--string + +--prefix + +--shell +--xml +--split +--err +--prefix +--string + +--domain + +test + + + +--state +--cpu-total +--balloon +--vcpu +--interface +--block +--perf +--iothread +--memory +--dirtyrate +--vm +--list-active +--list-inactive +--list-persistent +--list-transient +--list-running +--list-paused +--list-shutoff +--list-other +--raw +--enforce +--backing +--nowait +--domain + + +--domain +--reason + + + +## Exit code: 1 -- 2.44.0

Currently the code decides which option to complete by looking into the input string and trying to infer it based on whether we are at the end position as we truncate the string to complete to the current cursor position. That basically means that only the last-parsed option will be up for completion. Replace the logic by remembering which is the last option rather than using two different position checks and base the completion decision on that and the actual value of the last argument (see comment). Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tools/vsh.c | 63 +++++++++++++++++++++++++++-------------------------- tools/vsh.h | 1 + 2 files changed, 33 insertions(+), 31 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index 71c0778660..8af6aeaa48 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -1390,6 +1390,7 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser, vshCmd **partial) char *tkdata = NULL; vshCmd *clast = NULL; vshCmdOpt *first = NULL; + vshCmdOpt *last = NULL; const vshCmdDef *cmd = NULL; if (!partial) { @@ -1397,7 +1398,6 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser, vshCmd **partial) } while (1) { - vshCmdOpt *last = NULL; vshCommandToken tk; bool data_only = false; uint64_t opts_need_arg = 0; @@ -1406,6 +1406,7 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser, vshCmd **partial) cmd = NULL; first = NULL; + last = NULL; if (partial) { g_clear_pointer(partial, vshCommandFree); @@ -1589,6 +1590,7 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser, vshCmd **partial) } c->opts = g_steal_pointer(&first); + c->lastopt = last; c->def = cmd; c->next = NULL; @@ -1622,6 +1624,7 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser, vshCmd **partial) tmp = g_new0(vshCmd, 1); tmp->opts = first; + tmp->lastopt = last; tmp->def = cmd; *partial = tmp; @@ -2735,27 +2738,6 @@ vshReadlineOptionsGenerator(const vshCmdDef *cmd, } -static const vshCmdOptDef * -vshReadlineCommandFindOpt(const vshCmd *partial) -{ - const vshCmd *tmp = partial; - - while (tmp) { - const vshCmdOpt *opt = tmp->opts; - - while (opt) { - if (opt->completeThis) - return opt->def; - - opt = opt->next; - } - tmp = tmp->next; - } - - return NULL; -} - - static int vshCompleterFilter(char ***list, const char *text) @@ -2802,7 +2784,6 @@ vshReadlineParse(const char *text, int state) if (!state) { g_autoptr(vshCmd) partial = NULL; const vshCmdDef *cmd = NULL; - const vshCmdOptDef *opt = NULL; g_autofree char *line = g_strdup(rl_line_buffer); g_clear_pointer(&list, g_strfreev); @@ -2828,16 +2809,36 @@ vshReadlineParse(const char *text, int state) cmd = NULL; } - opt = vshReadlineCommandFindOpt(partial); - if (!cmd) { list = vshReadlineCommandGenerator(); - } else if (!opt || opt->type == VSH_OT_BOOL) { - list = vshReadlineOptionsGenerator(cmd, partial); - } else if (opt && opt->completer) { - list = opt->completer(autoCompleteOpaque, - partial, - opt->completer_flags); + } else { + bool complete_argument = false; + + /* attempt completion only when: + - there is an argument + - it has the 'data' field filled + - it has a completer (rules out booleans) + */ + if (partial->lastopt && partial->lastopt->data && partial->lastopt->def->completer) { + /* Furthermore we want to do the completion only at the point of + * user's cursor. This is the case if: + * - value in 'data' is equal to 'text' (last component of the completed command) + * - value in 'data' is a space when 'text' is empty (quirk) + */ + if (STREQ_NULLABLE(partial->lastopt->data, text)) + complete_argument = true; + + if (STREQ_NULLABLE(partial->lastopt->data, " ") && *text == '\0') + complete_argument = true; + } + + if (complete_argument) { + list = partial->lastopt->def->completer(autoCompleteOpaque, + partial, + partial->lastopt->def->completer_flags); + } else { + list = vshReadlineOptionsGenerator(cmd, partial); + } } /* Escape completions, if needed (i.e. argument diff --git a/tools/vsh.h b/tools/vsh.h index a51140eeee..d2426d1e30 100644 --- a/tools/vsh.h +++ b/tools/vsh.h @@ -178,6 +178,7 @@ struct _vshCmdDef { struct _vshCmd { const vshCmdDef *def; /* command definition */ vshCmdOpt *opts; /* list of command arguments */ + vshCmdOpt *lastopt; /* last option of the commandline */ vshCmd *next; /* next command */ bool skipChecks; /* skip validity checks when retrieving opts */ }; -- 2.44.0

Remove the old helpers which were used previously to pick which field to complete. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tools/virsh.c | 4 ++-- tools/virt-admin.c | 4 ++-- tools/vsh.c | 20 +++----------------- tools/vsh.h | 4 +--- 4 files changed, 8 insertions(+), 24 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 58ebb493fc..a958f2b82f 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -770,7 +770,7 @@ virshParseArgv(vshControl *ctl, int argc, char **argv) ctl->imode = false; if (argc - optind == 1) { vshDebug(ctl, VSH_ERR_INFO, "commands: \"%s\"\n", argv[optind]); - return vshCommandStringParse(ctl, argv[optind], NULL, 0); + return vshCommandStringParse(ctl, argv[optind], NULL); } else { return vshCommandArgvParse(ctl, argc - optind, argv + optind); } @@ -908,7 +908,7 @@ main(int argc, char **argv) if (*ctl->cmdstr) { vshReadlineHistoryAdd(ctl->cmdstr); - if (vshCommandStringParse(ctl, ctl->cmdstr, NULL, 0)) + if (vshCommandStringParse(ctl, ctl->cmdstr, NULL)) vshCommandRun(ctl, ctl->cmd); } VIR_FREE(ctl->cmdstr); diff --git a/tools/virt-admin.c b/tools/virt-admin.c index a996923094..1805618035 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -1331,7 +1331,7 @@ vshAdmParseArgv(vshControl *ctl, int argc, char **argv) ctl->imode = false; if (argc - optind == 1) { vshDebug(ctl, VSH_ERR_INFO, "commands: \"%s\"\n", argv[optind]); - return vshCommandStringParse(ctl, argv[optind], NULL, 0); + return vshCommandStringParse(ctl, argv[optind], NULL); } else { return vshCommandArgvParse(ctl, argc - optind, argv + optind); } @@ -1558,7 +1558,7 @@ main(int argc, char **argv) if (*ctl->cmdstr) { vshReadlineHistoryAdd(ctl->cmdstr); - if (vshCommandStringParse(ctl, ctl->cmdstr, NULL, 0)) + if (vshCommandStringParse(ctl, ctl->cmdstr, NULL)) vshCommandRun(ctl, ctl->cmd); } VIR_FREE(ctl->cmdstr); diff --git a/tools/vsh.c b/tools/vsh.c index e9ed7c0794..1d8aecc41b 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -1430,7 +1430,6 @@ struct _vshCommandParser { char **, bool); /* vshCommandStringGetArg() */ char *pos; - const char *originalLine; size_t point; /* vshCommandArgvGetArg() */ char **arg_pos; @@ -1543,9 +1542,6 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser, vshCmd **partial) arg->data = g_steal_pointer(&tkdata); arg->next = NULL; - if (parser->pos - parser->originalLine == parser->point - 1) - arg->completeThis = true; - if (!first) first = arg; if (last) @@ -1596,9 +1592,6 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser, vshCmd **partial) arg->data = g_steal_pointer(&tkdata); arg->next = NULL; - if (parser->pos - parser->originalLine == parser->point) - arg->completeThis = true; - if (!first) first = arg; if (last) @@ -1812,23 +1805,18 @@ vshCommandStringGetArg(vshControl *ctl, vshCommandParser *parser, char **res, * @ctl virsh control structure * @cmdstr: string to parse * @partial: store partially parsed command here - * @point: position of cursor (rl_point) * * Parse given string @cmdstr as a command and store it under * @ctl->cmd. For readline completion, if @partial is not NULL on * the input then errors in parsing are ignored (because user is * still in progress of writing the command string) and partially * parsed command is stored at *@partial (caller has to free it - * afterwards). Among with @partial, caller must set @point which - * is the position of cursor in @cmdstr (offset, numbered from 1). - * Parser will then set @completeThis attribute to true for the - * vshCmdOpt that appeared under the cursor. + * afterwards). */ bool vshCommandStringParse(vshControl *ctl, char *cmdstr, - vshCmd **partial, - size_t point) + vshCmd **partial) { vshCommandParser parser = { 0 }; @@ -1836,8 +1824,6 @@ vshCommandStringParse(vshControl *ctl, return false; parser.pos = cmdstr; - parser.originalLine = cmdstr; - parser.point = point; parser.getNextArg = vshCommandStringGetArg; return vshCommandParse(ctl, &parser, partial); } @@ -2844,7 +2830,7 @@ vshReadlineParse(const char *text, int state) *(line + rl_point) = '\0'; - vshCommandStringParse(NULL, line, &partial, rl_point); + vshCommandStringParse(NULL, line, &partial); if (partial) { cmd = partial->def; diff --git a/tools/vsh.h b/tools/vsh.h index 4576c286fe..a9c5b674bb 100644 --- a/tools/vsh.h +++ b/tools/vsh.h @@ -149,8 +149,6 @@ struct _vshCmdOpt { char *data; /* allocated data, or NULL for bool option */ const char **argv; /* for VSH_OT_ARGV, the list of options */ char *argvstr; /* space-joined @argv */ - bool completeThis; /* true if this is the option user's wishing to - autocomplete */ vshCmdOpt *next; }; @@ -292,7 +290,7 @@ int vshBlockJobOptionBandwidth(vshControl *ctl, bool vshCommandOptBool(const vshCmd *cmd, const char *name); bool vshCommandRun(vshControl *ctl, const vshCmd *cmd); bool vshCommandStringParse(vshControl *ctl, char *cmdstr, - vshCmd **partial, size_t point); + vshCmd **partial); const char ** vshCommandOptArgv(const vshCmd *cmd, -- 2.44.0

Refactor the very old opaque logic (using multiple bitmaps) by fully-allocating vshCmdOpt for each possible argument and then filling them as they go rather than allocating them each time after it's parsed. This simplifies the checkers and removes the need to cross-reference multiple arrays. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tools/vsh.c | 548 +++++++++++++++++++++++----------------------------- tools/vsh.h | 6 +- 2 files changed, 242 insertions(+), 312 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index 256ba55a83..30cbf4c0dc 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -476,81 +476,36 @@ vshCmddefCheckInternals(vshControl *ctl, return 0; } -/* Parse the options associated with @cmd, i.e. test whether options are - * required or need an argument and fill the appropriate caller-provided bitmaps - */ -static void -vshCmddefOptParse(const vshCmdDef *cmd, - uint64_t *opts_need_arg, - uint64_t *opts_required) -{ - size_t i; - - *opts_need_arg = 0; - *opts_required = 0; - - if (!cmd->opts) - return; - - for (i = 0; cmd->opts[i].name; i++) { - const vshCmdOptDef *opt = &cmd->opts[i]; - if (opt->type == VSH_OT_BOOL) - continue; - - if (opt->type == VSH_OT_ALIAS) - continue; /* skip the alias option */ - - if (opt->positional || opt->unwanted_positional) - *opts_need_arg |= 1ULL << i; - - if (opt->required) - *opts_required |= 1ULL << i; - } -} - -static vshCmdOptDef helpopt = { - .name = "help", - .type = VSH_OT_BOOL, - .help = N_("print help for this function") -}; - -static const vshCmdOptDef * -vshCmddefGetOption(vshControl *ctl, - const vshCmdDef *cmd, - const char *name, - uint64_t *opts_seen, - size_t *opt_index, - char **optstr, - bool report) +static vshCmdOpt * +vshCmdGetOption(vshControl *ctl, + vshCmd *cmd, + const char *name, + char **optstr, + bool report) { - size_t i; g_autofree char *alias = NULL; + vshCmdOpt *n; - if (STREQ(name, helpopt.name)) - return &helpopt; - - for (i = 0; cmd->opts && cmd->opts[i].name; i++) { - const vshCmdOptDef *opt = &cmd->opts[i]; - - if (STRNEQ(opt->name, name)) + for (n = cmd->opts; n && n->def; n++) { + if (STRNEQ(n->def->name, name)) continue; - if (opt->type == VSH_OT_ALIAS) { + if (n->def->type == VSH_OT_ALIAS) { char *value; /* Two types of replacements: opt->help = "string": straight replacement of name opt->help = "string=value": treat boolean flag as alias of option and its default value */ - alias = g_strdup(opt->help); + alias = g_strdup(n->def->help); name = alias; if ((value = strchr(name, '='))) { *value = '\0'; if (*optstr) { if (report) vshError(ctl, _("invalid '=' after option --%1$s"), - opt->name); + n->def->name); return NULL; } *optstr = g_strdup(value + 1); @@ -558,72 +513,122 @@ vshCmddefGetOption(vshControl *ctl, continue; } - if ((*opts_seen & (1ULL << i)) && opt->type != VSH_OT_ARGV) { + if (n->present && n->def->type != VSH_OT_ARGV) { if (report) vshError(ctl, _("option --%1$s already seen"), name); + return NULL; } - *opts_seen |= 1ULL << i; - *opt_index = i; - return opt; + return n; } /* The 'help' command ignores extra options */ - if (STRNEQ(cmd->name, "help") && report) { + if (STRNEQ(cmd->def->name, "help") && report) { vshError(ctl, _("command '%1$s' doesn't support option --%2$s"), - cmd->name, name); + cmd->def->name, name); } return NULL; } -static const vshCmdOptDef * -vshCmddefGetData(const vshCmdDef *cmd, uint64_t *opts_need_arg, - uint64_t *opts_seen) + +static void +vshCmdOptAssign(vshCmd *cmd, + vshCmdOpt *opt, + const char *val) { - size_t i; - const vshCmdOptDef *opt; + cmd->lastopt = opt; - if (!*opts_need_arg) - return NULL; + opt->present = true; + + switch (opt->def->type) { + case VSH_OT_BOOL: + /* nothing to do */ + break; + + case VSH_OT_STRING: + case VSH_OT_INT: + opt->data = g_strdup(val); + break; + + case VSH_OT_ARGV: + VIR_EXPAND_N(opt->argv, opt->nargv, 2); + /* VIR_EXPAND_N updates count */ + opt->nargv--; + opt->argv[opt->nargv - 1] = g_strdup(val); + /* for completers to work properly we need to also remember the last + * field in 'data' */ + g_clear_pointer(&opt->data, g_free); + opt->data = g_strdup(val); + break; + + case VSH_OT_NONE: + case VSH_OT_ALIAS: + /* impossible code path */ + break; + } +} + + +/** + * vshCmdGetNextPositionalOpt: + * @cmd: command structure + * + * Get next unpopulated positional argument definition. + */ +static vshCmdOpt * +vshCmdGetNextPositionalOpt(const vshCmd *cmd) +{ + vshCmdOpt *n; + + for (n = cmd->opts; n && n->def; n++) { + /* Consider only "positional" options. Tests ensure that boolean options + * don't set these. */ + if (!(n->def->positional || n->def->unwanted_positional)) + continue; - /* Grab least-significant set bit */ - i = __builtin_ffsl(*opts_need_arg) - 1; - opt = &cmd->opts[i]; - if (opt->type != VSH_OT_ARGV) - *opts_need_arg &= ~(1ULL << i); - *opts_seen |= 1ULL << i; - return opt; + /* 'VSH_OT_ARGV' positionals must allow multiple arguments */ + if (n->present && + n->def->type != VSH_OT_ARGV) + continue; + + return n; + } + + return NULL; } + /* * Checks for required options */ static int -vshCommandCheckOpts(vshControl *ctl, const vshCmd *cmd, uint64_t opts_required, - uint64_t opts_seen) +vshCommandCheckOpts(vshControl *ctl, + const vshCmd *cmd) { - const vshCmdDef *def = cmd->def; - size_t i; - - opts_required &= ~opts_seen; - if (!opts_required) - return 0; + vshCmdOpt *n; - for (i = 0; def->opts[i].name; i++) { - if (opts_required & (1ULL << i)) { - const vshCmdOptDef *opt = &def->opts[i]; + for (n = cmd->opts; n && n->def; n++) { + if (!n->present && n->def->required) { + if (n->def->positional) { + vshError(ctl, + _("command '%1$s' requires <%2$s> option"), + cmd->def->name, n->def->name); + } else { + vshError(ctl, + _("command '%1$s' requires --%2$s option"), + cmd->def->name, n->def->name); + } - vshError(ctl, - opt->positional ? - _("command '%1$s' requires <%2$s> option") : - _("command '%1$s' requires --%2$s option"), - def->name, opt->name); + return -1; } } - return -1; + + + return 0; } + static const vshCmdGrp * vshCmdGrpSearch(const char *grpname) { @@ -776,24 +781,6 @@ vshCmddefHelp(const vshCmdDef *def) * Utils for work with runtime commands data * --------------- */ -static void -vshCommandOptFree(vshCmdOpt * arg) -{ - vshCmdOpt *a = arg; - - while (a) { - vshCmdOpt *tmp = a; - - a = a->next; - - g_free(tmp->data); - /* 'argv' doesn't own the strings themselves */ - g_free(tmp->argv); - g_free(tmp->argvstr); - g_free(tmp); - } -} - static void vshCommandFree(vshCmd *cmd) { @@ -801,10 +788,18 @@ vshCommandFree(vshCmd *cmd) while (c) { vshCmd *tmp = c; + vshCmdOpt *n; c = c->next; - vshCommandOptFree(tmp->opts); + for (n = tmp->opts; n && n->def; n++) { + g_free(n->data); + g_strfreev(n->argv); + g_free(n->argvstr); + } + + g_free(tmp->opts); + g_free(tmp); } } @@ -826,40 +821,37 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(vshCmd, vshCommandFree); * is set. No error messages are issued if a value is returned. */ static int -vshCommandOpt(const vshCmd *cmd, const char *name, vshCmdOpt **opt, +vshCommandOpt(const vshCmd *cmd, + const char *name, + vshCmdOpt **opt, bool needData) { - vshCmdOpt *candidate = cmd->opts; - const vshCmdOptDef *valid = cmd->def->opts; - int ret = 0; + vshCmdOpt *n; - /* See if option is valid and/or required. */ *opt = NULL; - while (valid && valid->name) { - if (STREQ(name, valid->name)) - break; - valid++; - } - - if (!cmd->skipChecks) - assert(valid && (!needData || valid->type != VSH_OT_BOOL)); + for (n = cmd->opts; n && n->def; n++) { + if (STRNEQ(name, n->def->name)) + continue; - if (valid && valid->required) - ret = -1; + if (!cmd->skipChecks) + assert(!needData || n->def->type != VSH_OT_BOOL); - /* See if option is present on command line. */ - while (candidate) { - if (STREQ(candidate->def->name, name)) { - *opt = candidate; - ret = 1; - break; + if (n->present) { + *opt = n; + return 1; + } else { + return 0; } - candidate = candidate->next; } - return ret; + + if (!cmd->skipChecks) + assert(false); + + return -1; } + /** * vshCommandOptInt: * @ctl virtshell control structure @@ -1238,39 +1230,6 @@ vshCommandOptBool(const vshCmd *cmd, const char *name) } -static vshCmdOpt * -vshCommandOptArgvInternal(const vshCmd *cmd, - const char *name) -{ - vshCmdOpt *first = NULL; - vshCmdOpt *opt; - size_t nargv = 0; - size_t nargv_alloc = 0; - - for (opt = cmd->opts; opt; opt = opt->next) { - if (STRNEQ(opt->def->name, name)) - continue; - - if (!first) { - /* Return existing data if we'we already processed it */ - if (opt->argv) - return opt; - - first = opt; - } - - /* extra NULL terminator */ - VIR_RESIZE_N(first->argv, nargv_alloc, nargv, 2); - first->argv[nargv++] = opt->data; - } - - if (first) - first->argvstr = g_strjoinv(" ", (GStrv) first->argv); - - return first; -} - - /** * vshCommandOptArgv: * @cmd: command reference @@ -1284,12 +1243,12 @@ const char ** vshCommandOptArgv(const vshCmd *cmd, const char *name) { - vshCmdOpt *opt = vshCommandOptArgvInternal(cmd, name); + vshCmdOpt *opt; - if (!opt) + if (vshCommandOpt(cmd, name, &opt, true) != 1) return NULL; - return opt->argv; + return (const char **) opt->argv; } @@ -1305,11 +1264,14 @@ const char * vshCommandOptArgvString(const vshCmd *cmd, const char *name) { - vshCmdOpt *opt = vshCommandOptArgvInternal(cmd, name); + vshCmdOpt *opt; - if (!opt) + if (vshCommandOpt(cmd, name, &opt, true) != 1) return NULL; + if (!opt->argvstr) + opt->argvstr = g_strjoinv(" ", opt->argv); + return opt->argvstr; } @@ -1444,14 +1406,71 @@ struct _vshCommandParser { char **arg_end; }; + +static vshCmd * +vshCmdNewHelp(const char *name) +{ + vshCmd *c = g_new0(vshCmd, 1); + + c->def = vshCmddefSearch("help"); + + c->opts = g_new0(vshCmdOpt, 2); + c->opts->def = c->def->opts; + c->opts->data = g_strdup(name); + c->opts->present = true; + + return c; +} + + +static vshCmd * +vshCmdNew(vshControl *ctl, + const char *cmdname, + bool report) +{ + g_autoptr(vshCmd) c = g_new0(vshCmd, 1); + const vshCmdOptDef *optdef; + vshCmdOpt *opt; + size_t nopts = 0; + + if (!(c->def = vshCmddefSearch(cmdname))) { + if (report) + vshError(ctl, _("unknown command: '%1$s'"), cmdname); + + return NULL; + } + + /* resolve command alias */ + if (c->def->alias) { + if (!(c->def = vshCmddefSearch(c->def->alias))) { + /* dead code: self-test ensures that the alias exists thus no error reported here */ + return NULL; + } + } + + /* Find number of arguments */ + for (optdef = c->def->opts; optdef && optdef->name; optdef++) + nopts++; + + c->opts = g_new0(vshCmdOpt, nopts + 1); + opt = c->opts; + + /* populate links to definitions */ + for (optdef = c->def->opts; optdef && optdef->name; optdef++) { + opt->def = optdef; + opt++; + } + + return g_steal_pointer(&c); +} + + static bool vshCommandParse(vshControl *ctl, vshCommandParser *parser, vshCmd **partial) { + g_autoptr(vshCmd) cmd = NULL; char *tkdata = NULL; vshCmd *clast = NULL; - vshCmdOpt *first = NULL; - vshCmdOpt *last = NULL; - const vshCmdDef *cmd = NULL; if (!partial) { g_clear_pointer(&ctl->cmd, vshCommandFree); @@ -1460,20 +1479,13 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser, vshCmd **partial) while (1) { vshCommandToken tk; bool data_only = false; - uint64_t opts_need_arg = 0; - uint64_t opts_required = 0; - uint64_t opts_seen = 0; - - cmd = NULL; - first = NULL; - last = NULL; if (partial) { g_clear_pointer(partial, vshCommandFree); } while (1) { - const vshCmdOptDef *opt = NULL; + vshCmdOpt *opt = NULL; tkdata = NULL; tk = parser->getNextArg(ctl, parser, &tkdata, true); @@ -1494,48 +1506,34 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser, vshCmd **partial) } while (tk == VSH_TK_ARG); VIR_FREE(tkdata); break; - } else if (!(cmd = vshCmddefSearch(tkdata))) { - if (!partial) - vshError(ctl, _("unknown command: '%1$s'"), tkdata); - goto syntaxError; /* ... or ignore this command only? */ } - /* aliases need to be resolved to the actual commands */ - if (cmd->alias) { - VIR_FREE(tkdata); - tkdata = g_strdup(cmd->alias); - if (!(cmd = vshCmddefSearch(tkdata))) { - /* self-test ensures that the alias exists */ - vshError(ctl, _("unknown command: '%1$s'"), tkdata); - goto syntaxError; - } - } + if (!(cmd = vshCmdNew(ctl, tkdata, !partial))) + goto syntaxError; - vshCmddefOptParse(cmd, &opts_need_arg, &opts_required); VIR_FREE(tkdata); } else if (data_only) { goto get_data; } else if (tkdata[0] == '-' && tkdata[1] == '-' && g_ascii_isalnum(tkdata[2])) { char *optstr = strchr(tkdata + 2, '='); - size_t opt_index = 0; if (optstr) { *optstr = '\0'; /* convert the '=' to '\0' */ optstr = g_strdup(optstr + 1); } + /* Special case 'help' to ignore all spurious options */ - if (!(opt = vshCmddefGetOption(ctl, cmd, tkdata + 2, - &opts_seen, &opt_index, - &optstr, partial == NULL))) { + if (!(opt = vshCmdGetOption(ctl, cmd, tkdata + 2, + &optstr, partial == NULL))) { VIR_FREE(optstr); - if (STREQ(cmd->name, "help")) + if (STREQ(cmd->def->name, "help")) continue; goto syntaxError; } VIR_FREE(tkdata); - if (opt->type != VSH_OT_BOOL) { + if (opt->def->type != VSH_OT_BOOL) { /* option data */ if (optstr) tkdata = optstr; @@ -1545,33 +1543,23 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser, vshCmd **partial) goto syntaxError; if (tk != VSH_TK_ARG) { if (partial) { - vshCmdOpt *arg = g_new0(vshCmdOpt, 1); - arg->def = opt; - arg->data = g_steal_pointer(&tkdata); - arg->next = NULL; - - if (!first) - first = arg; - if (last) - last->next = arg; - last = arg; + vshCmdOptAssign(cmd, opt, tkdata); + VIR_FREE(tkdata); } else { vshError(ctl, _("expected syntax: --%1$s <%2$s>"), - opt->name, - opt->type == + opt->def->name, + opt->def->type == VSH_OT_INT ? _("number") : _("string")); } goto syntaxError; } - if (opt->type != VSH_OT_ARGV) - opts_need_arg &= ~(1ULL << opt_index); } else { tkdata = NULL; if (optstr) { if (!partial) vshError(ctl, _("invalid '=' after option --%1$s"), - opt->name); + opt->def->name); VIR_FREE(optstr); goto syntaxError; } @@ -1584,85 +1572,52 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser, vshCmd **partial) } else { get_data: /* Special case 'help' to ignore spurious data */ - if (!(opt = vshCmddefGetData(cmd, &opts_need_arg, - &opts_seen)) && - STRNEQ(cmd->name, "help")) { + if (!(opt = vshCmdGetNextPositionalOpt(cmd)) && + STRNEQ(cmd->def->name, "help")) { if (!partial) vshError(ctl, _("unexpected data '%1$s'"), tkdata); goto syntaxError; } } - if (opt) { - /* save option */ - vshCmdOpt *arg = g_new0(vshCmdOpt, 1); - - arg->def = opt; - arg->data = g_steal_pointer(&tkdata); - arg->next = NULL; - if (!first) - first = arg; - if (last) - last->next = arg; - last = arg; + if (opt) { + vshCmdOptAssign(cmd, opt, tkdata); + VIR_FREE(tkdata); if (!partial) vshDebug(ctl, VSH_ERR_INFO, "%s: %s(%s): %s\n", - cmd->name, - opt->name, - opt->type != VSH_OT_BOOL ? _("optdata") : _("bool"), - opt->type != VSH_OT_BOOL ? arg->data : _("(none)")); + cmd->def->name, + opt->def->name, + opt->def->type != VSH_OT_BOOL ? _("optdata") : _("bool"), + opt->def->type != VSH_OT_BOOL ? opt->data : _("(none)")); } } /* command parsed -- allocate new struct for the command */ if (cmd) { - vshCmd *c = g_new0(vshCmd, 1); - vshCmdOpt *tmpopt = first; - - /* if we encountered --help, replace parsed command with - * 'help <cmdname>' */ - for (tmpopt = first; tmpopt; tmpopt = tmpopt->next) { - const vshCmdDef *help; - if (STRNEQ(tmpopt->def->name, "help")) - continue; - - /* the self-test code ensures that help exists */ - if (!(help = vshCmddefSearch("help"))) - break; - - vshCommandOptFree(first); - first = g_new0(vshCmdOpt, 1); - first->def = help->opts; - first->data = g_strdup(cmd->name); - first->next = NULL; + /* if we encountered --help, replace parsed command with 'help <cmdname>' */ + if (cmd->helpOptionSeen) { + vshCmd *helpcmd = vshCmdNewHelp(cmd->def->name); - cmd = help; - opts_required = 0; - opts_seen = 0; - break; + vshCommandFree(cmd); + cmd = helpcmd; } - c->opts = g_steal_pointer(&first); - c->lastopt = last; - c->def = cmd; - c->next = NULL; - if (!partial && - vshCommandCheckOpts(ctl, c, opts_required, opts_seen) < 0) { - vshCommandFree(c); + vshCommandCheckOpts(ctl, cmd) < 0) { + vshCommandFree(cmd); goto syntaxError; } if (partial) { vshCommandFree(*partial); - *partial = c; + *partial = g_steal_pointer(&cmd); } else { if (!ctl->cmd) - ctl->cmd = c; + ctl->cmd = cmd; if (clast) - clast->next = c; - clast = c; + clast->next = cmd; + clast = g_steal_pointer(&cmd); } } @@ -1674,17 +1629,9 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser, vshCmd **partial) syntaxError: if (partial) { - vshCmd *tmp; - - tmp = g_new0(vshCmd, 1); - tmp->opts = first; - tmp->lastopt = last; - tmp->def = cmd; - - *partial = tmp; + *partial = g_steal_pointer(&cmd); } else { g_clear_pointer(&ctl->cmd, vshCommandFree); - vshCommandOptFree(first); } VIR_FREE(tkdata); return false; @@ -2739,43 +2686,24 @@ vshReadlineCommandGenerator(void) static char ** -vshReadlineOptionsGenerator(const vshCmdDef *cmd, - vshCmd *last) +vshReadlineOptionsGenerator(vshCmd *cmd) { - size_t list_index = 0; size_t ret_size = 0; g_auto(GStrv) ret = NULL; + vshCmdOpt *n; - if (!cmd) - return NULL; - - if (!cmd->opts) - return NULL; - - for (list_index = 0; cmd->opts[list_index].name; list_index++) { - const char *name = cmd->opts[list_index].name; - bool exists = false; - vshCmdOpt *opt = last->opts; - + for (n = cmd->opts; n && n->def; n++) { /* Skip aliases, we do not report them in help output either. */ - if (cmd->opts[list_index].type == VSH_OT_ALIAS) + if (n->def->type == VSH_OT_ALIAS) continue; - while (opt) { - if (STREQ(opt->def->name, name) && opt->def->type != VSH_OT_ARGV) { - exists = true; - break; - } - - opt = opt->next; - } - - if (exists) + /* skip already populated single-instance arguments */ + if (n->present && n->def->type != VSH_OT_ARGV) continue; VIR_REALLOC_N(ret, ret_size + 2); - ret[ret_size] = g_strdup_printf("--%s", name); + ret[ret_size] = g_strdup_printf("--%s", n->def->name); ret_size++; /* Terminate the string list properly. */ ret[ret_size] = NULL; @@ -2884,7 +2812,7 @@ vshReadlineParse(const char *text, int state) partial, partial->lastopt->def->completer_flags); } else { - list = vshReadlineOptionsGenerator(cmd, partial); + list = vshReadlineOptionsGenerator(partial); } } diff --git a/tools/vsh.h b/tools/vsh.h index 20eaf10022..66226940ef 100644 --- a/tools/vsh.h +++ b/tools/vsh.h @@ -146,10 +146,11 @@ struct _vshCmdOptDef { */ struct _vshCmdOpt { const vshCmdOptDef *def; /* non-NULL pointer to option definition */ + bool present; /* true if option was present on command line */ char *data; /* allocated data, or NULL for bool option */ - const char **argv; /* for VSH_OT_ARGV, the list of options */ + char **argv; /* for VSH_OT_ARGV, the list of options */ + size_t nargv; char *argvstr; /* space-joined @argv */ - vshCmdOpt *next; }; /* @@ -181,6 +182,7 @@ struct _vshCmd { vshCmdOpt *lastopt; /* last option of the commandline */ vshCmd *next; /* next command */ bool skipChecks; /* skip validity checks when retrieving opts */ + bool helpOptionSeen; /* The '--help' option was seen when persing the command */ }; /* -- 2.44.0

As we now have a centralized point to assign values to options move the debugging logic there. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tools/vsh.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index 3cd9202a8a..b04b4f5cd0 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -528,9 +528,11 @@ vshCmdGetOption(vshControl *ctl, static void -vshCmdOptAssign(vshCmd *cmd, +vshCmdOptAssign(vshControl *ctl, + vshCmd *cmd, vshCmdOpt *opt, - const char *val) + const char *val, + bool report) { cmd->lastopt = opt; @@ -539,14 +541,28 @@ vshCmdOptAssign(vshCmd *cmd, switch (opt->def->type) { case VSH_OT_BOOL: /* nothing to do */ + if (report) { + vshDebug(ctl, VSH_ERR_INFO, "%s: %s(bool)\n", + cmd->def->name, opt->def->name); + } break; case VSH_OT_STRING: case VSH_OT_INT: + if (report) { + vshDebug(ctl, VSH_ERR_INFO, "%s: %s(optdata): %s\n", + cmd->def->name, opt->def->name, NULLSTR(val)); + } + opt->data = g_strdup(val); break; case VSH_OT_ARGV: + if (report) { + vshDebug(ctl, VSH_ERR_INFO, "%s: %s(argv: %zu): %s\n", + cmd->def->name, opt->def->name, opt->nargv, NULLSTR(val)); + } + VIR_EXPAND_N(opt->argv, opt->nargv, 2); /* VIR_EXPAND_N updates count */ opt->nargv--; @@ -1538,7 +1554,7 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser, vshCmd **partial) goto syntaxError; if (tk != VSH_TK_ARG) { if (partial) { - vshCmdOptAssign(cmd, opt, tkdata); + vshCmdOptAssign(ctl, cmd, opt, tkdata, !partial); VIR_FREE(tkdata); } else { vshError(ctl, @@ -1576,15 +1592,8 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser, vshCmd **partial) } if (opt) { - vshCmdOptAssign(cmd, opt, tkdata); + vshCmdOptAssign(ctl, cmd, opt, tkdata, !partial); VIR_FREE(tkdata); - - if (!partial) - vshDebug(ctl, VSH_ERR_INFO, "%s: %s(%s): %s\n", - cmd->def->name, - opt->def->name, - opt->def->type != VSH_OT_BOOL ? _("optdata") : _("bool"), - opt->def->type != VSH_OT_BOOL ? opt->data : _("(none)")); } } -- 2.44.0