github #131: add missing options

2 files changed, 14 insertions, 4 deletions

diff --git a/Completion/Unix/Command/_libvirt b/Completion/Unix/Command/_libvirt
index bd605b9c9..9c10f71e8 100644
--- a/Completion/Unix/Command/_libvirt
+++ b/Completion/Unix/Command/_libvirt
@@ -18,7 +18,7 @@ interact_cmds=(cd echo exit quit connect)
 
 typeset -A dom_opts
 dom_opts=(
-  console " "
+  console --state-running
   destroy " "
   managedsave " "
   reboot " "
@@ -197,7 +197,7 @@ case $state in
       return 1
     fi
     # Allow passing domain without --domain with few of the most used commands
-    if [[ $cmd == (destroy|edit|reboot|reset|start|shutdown) ]]; then
+    if [[ $cmd == (destroy|edit|reboot|reset|start|shutdown|console|guestinfo) ]]; then
       if [[ $words[CURRENT-1] == $cmd ]]; then
         values=( $(_call_program domains "noglob virsh $conn_opt list ${dom_opts[$cmd]:-"--all"} --name") )
         [[ -n $values ]] && _wanted domains expl domain compadd ${=values} && return 0
diff --git a/Completion/Unix/Command/_smartmontools b/Completion/Unix/Command/_smartmontools
index fe6496664..71454cf08 100644
--- a/Completion/Unix/Command/_smartmontools
+++ b/Completion/Unix/Command/_smartmontools
@@ -9,13 +9,23 @@ _arguments -s -S \
     "w[print all words]"
     "(b v)n[suppress printing bits]"
     "(b n)v[print all bits from valid words]"' \
+  '(--json)-j[output as JSON]' \
+  '(-j)--json=-[specify JSON/YAML output format]:: : _values -S "" "output format"
+    "c[compact]"
+    "g[grep/gron]"
+    "o[original]"
+    "s[sorted]"
+    "v[verbose]"
+    "y[YAML]"
+    "i[implemented dev]"
+    "u[unimplemented dev]"' \
   '(H)*'{-g+,--get=}'[get device setting]:setting:(all aam apm lookahead security wcache rcache wcreorder)' \
   '(H -a --all -x --xall -H --health -i --info -c --capabilities -A --attributes --scan --scan-open)'{-a,--all}'[show all SMART information for device]' \
   '(H -x --xall -a --all -H --health -i --info -c --capabilities -A --attributes --scan --scan-open)'{-x,--xall}'[show all information for device]' \
   '(H 1 --scan-open --identify -x --xall -a --all -H --health -i --info -c --capabilities -A --attributes)--scan[scan for devices]' \
   '(H 1 --scan --identify -x --xall -a --all -H --health -i --info -c --capabilities -A --attributes)--scan-open[scan for devices and try to open each device]' \
   '(H -q --quietmode)'{-q+,--quietmode=}'[set smartctl quiet mode]:quiet mode:(errorsonly silent noserial)' \
-  '(H -d --device)'{-d+,--device=}'[specify device type]:device type:(ata scsi nvme sat usbcypress usbjmicron usbprolific usbsunplus marvell areca  3ware hpt megaraid cciss auto test)' \
+  '(H -d --device)'{-d+,--device=}'[specify device type]:device type:(auto test ata scsi nvme sat usbcypress usbjmicron usbprolific usbsunplus sntasmedia sntjmicron sntrealtek marvell megaraid aacraid 3ware areca cciss hpt sssraid intelliprop jmb39x jms56x)' \
   '(H)*'{-T+,--tolerance=}'[specify how tolerant smartctl should be of ATA SMART command failures]:tolerance:(normal conservative permissive verypermissive)' \
   '(H -b --badsum)'{-b+,--badsum=}'[set action if checksum error is detected]:action:(warn exit ignore)' \
   '(H)*'{-r+,--report=}'[report transactions]:transaction type:(ioctl ataioctl scsiioctl nvmeioctl)' \
@@ -28,7 +38,7 @@ _arguments -s -S \
   '(H -c --capabilities)'{-c,--capabilities}'[show device SMART capabilities]' \
   '(H -A --attributes)'{-A,--attributes}'[show device SMART vendor-specific attributes and values]' \
   '(H)*'{-f+,--format=}'[set output format for attributes]:format:(old brief hex,id hex,val hex)' \
-  '(H)*'{-l+,--log=}'[show device log]:log:(error selftest selective directory xerror xselftest background sasphy sataphy scttemp scttempsts scttemphist scttempint scterc devstat ssd gplog smartlog nvmelog)' \
+  '(H)*'{-l+,--log=}'[show device log]:log:(error selftest selective directory xerror xselftest background sasphy sataphy scttemp scttempsts scttemphist scttempint scterc devstat ssd gplog smartlog nvmelog farm)' \
   '(H)*'{-v+,--vendorattribute=}'[set display option for vendor attribute]:vendor attribute:->vendorattrs' \
   '(H -F --firmwarebug)'{-F+,--firmwarebug=}'[use firmware bug workaround]:bug:(none nologdir samsung samsung2 samsung3 xerrorlba swapid)' \
   '(H -P --presets)'{-P+,--presets=}'[specify whether to use drive-specific presets]:preset usage:(use ignore show showall)' \