9 Commits

Author SHA1 Message Date
9b06c430fd Added new subcommand for debugvm
VBoxManage removed "debug" from list of commands in help, leaving only
description for "debugvm" in section "Introspection and guest debugging"
below all of the list, so that it is needed for adding "debugvm" to the
list of available commands manually.

Also "stack", new subcommand was added to "debugvm".
2017-10-08 10:20:27 +02:00
fbdd259cac Added support for usbdevsource command 2017-10-08 09:11:20 +02:00
d79a8bc280 Whitespaces housekeeping 2017-10-08 09:03:11 +02:00
20b1ef9fab Fix for catching usbfilter command 2017-10-08 09:01:25 +02:00
1674acbe92 Aded 'list' for natnetwork command 2017-10-07 19:29:22 +02:00
9b7ab10421 Command modifymedium have now additional option --move 2017-10-07 19:28:22 +02:00
47e3ff6bbe Added more options for storagectl option
options --add and --controller now have additional options:

usb
pcie

for `--add` and

USB
NVMe

for `--controller'.
2017-10-07 19:26:17 +02:00
f81bfe514f Modified 'modifyvm' command
Added new options for modifyvm command:

--apic
--x2apic
--paravirtdebug
--cpu-profile
--biosapic
2017-10-07 19:22:28 +02:00
a78a03286a Changed option '--no-profile' to '--profile' in gustecontrol run command 2017-10-07 19:21:36 +02:00
2 changed files with 93 additions and 26 deletions

View File

@@ -6,7 +6,7 @@ script. However, in some point of time I've decided to rewrite it almost from
scratch. scratch.
Current version of script was written and tested against VBoxManage in version Current version of script was written and tested against VBoxManage in version
5.0.40, and supports all commands (in some extent ;)). 5.1.26, and supports all commands (in some extent ;)).
Unlike other attempts, I've tried to make the script context aware. See the Unlike other attempts, I've tried to make the script context aware. See the
simple session with the VBoxManage command below, to have an idea how it works: simple session with the VBoxManage command below, to have an idea how it works:

View File

@@ -4,6 +4,7 @@
# URL: https://bitbucket.org/gryf/vboxmanage-bash-completion # URL: https://bitbucket.org/gryf/vboxmanage-bash-completion
# URL: https://github.com/gryf/vboxmanage-bash-completion # URL: https://github.com/gryf/vboxmanage-bash-completion
# License: 3-clause BSD-style license (see LICENSE file) # License: 3-clause BSD-style license (see LICENSE file)
# Version: 5.1.26
_VBoxManage() { _VBoxManage() {
local cur prev opts cmd subcommand tmp items name index result local cur prev opts cmd subcommand tmp items name index result
@@ -440,6 +441,10 @@ _VBoxManage() {
sort | \ sort | \
uniq) uniq)
# add debugvm command manually, since it's described differently in
# vboxmanage help
opts="${opts} debugvm"
if [[ ${cur} == "-q" || ${COMP_CWORD} -eq 1 ]] ; then if [[ ${cur} == "-q" || ${COMP_CWORD} -eq 1 ]] ; then
COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
return 0 return 0
@@ -499,6 +504,7 @@ _VBoxManage() {
fi fi
fi fi
;; ;;
checkmediumpwd) checkmediumpwd)
if [[ ${prev} == ${cmd} ]]; then if [[ ${prev} == ${cmd} ]]; then
_hdd_comp _hdd_comp
@@ -625,7 +631,6 @@ _VBoxManage() {
videocapmaxtime videocapmaxsize addencpassword removeencpassword videocapmaxtime videocapmaxsize addencpassword removeencpassword
removeallencpasswords) removeallencpasswords)
_find_item_name 2 _find_item_name 2
subcommand=${COMP_WORDS[$((index+1))]} subcommand=${COMP_WORDS[$((index+1))]}
@@ -702,11 +707,9 @@ _VBoxManage() {
_get_excluded_items "${tmp[@]}" _get_excluded_items "${tmp[@]}"
COMPREPLY=( $(compgen -W "$result" -- ${cur}) ) COMPREPLY=( $(compgen -W "$result" -- ${cur}) )
;; ;;
--removeonsuspend) --removeonsuspend)
COMPREPLY=( $(compgen -W "yes no" -- ${cur}) ) COMPREPLY=( $(compgen -W "yes no" -- ${cur}) )
;; ;;
addencpassword) addencpassword)
tmp=(--host --port --maxdowntime --passwordfile tmp=(--host --port --maxdowntime --passwordfile
--password) --password)
@@ -807,9 +810,9 @@ _VBoxManage() {
fi fi
;; ;;
debugvm) "debugvm")
items=(dumpguestcore info injectnmi log logdest logflags osdetect items=(dumpguestcore info injectnmi log logdest logflags osdetect
osinfo osdmesg getregisters setregisters show statistics) osinfo osdmesg getregisters setregisters show statistics stack)
if [[ ${prev} == ${cmd} ]]; then if [[ ${prev} == ${cmd} ]]; then
_vms_comp runningvms _vms_comp runningvms
else else
@@ -826,7 +829,7 @@ _VBoxManage() {
_get_excluded_items "${items[@]}" _get_excluded_items "${items[@]}"
COMPREPLY=( $(compgen -W "$result" -- ${cur}) ) COMPREPLY=( $(compgen -W "$result" -- ${cur}) )
;; ;;
getregisters|setregisters) getregisters|setregisters|stack)
_get_excluded_items "--cpu" _get_excluded_items "--cpu"
COMPREPLY=( $(compgen -W "$result" -- ${cur}) ) COMPREPLY=( $(compgen -W "$result" -- ${cur}) )
;; ;;
@@ -837,7 +840,7 @@ _VBoxManage() {
COMPREPLY=( $(compgen -W "$result" -- ${cur}) ) COMPREPLY=( $(compgen -W "$result" -- ${cur}) )
;; ;;
statistics) statistics)
items=(--reset --pattern) items=(--reset --pattern --descriptions)
_get_excluded_items "${items[@]}" _get_excluded_items "${items[@]}"
COMPREPLY=( $(compgen -W "$result" -- ${cur}) ) COMPREPLY=( $(compgen -W "$result" -- ${cur}) )
;; ;;
@@ -850,7 +853,6 @@ _VBoxManage() {
COMPREPLY=( $(compgen -W "$result" -- ${cur}) ) COMPREPLY=( $(compgen -W "$result" -- ${cur}) )
;; ;;
esac esac
_get_excluded_items "--descriptions"
COMPREPLY+=( $(compgen -W "$result" -- ${cur}) ) COMPREPLY+=( $(compgen -W "$result" -- ${cur}) )
else else
[[ "${prev}" == "--filename" ]] && \ [[ "${prev}" == "--filename" ]] && \
@@ -921,7 +923,6 @@ _VBoxManage() {
else else
COMPREPLY=( $(compgen -W "--newpassword --oldpassword --cipher COMPREPLY=( $(compgen -W "--newpassword --oldpassword --cipher
--newpasswordid" -- ${cur}) ) --newpasswordid" -- ${cur}) )
fi fi
;; ;;
@@ -1007,7 +1008,7 @@ _VBoxManage() {
case "${subcommand}" in case "${subcommand}" in
run) run)
items=(--exe --timeout --unquoted-args items=(--exe --timeout --unquoted-args
--ignore-operhaned-processes --no-profile --ignore-operhaned-processes --profile
--dos2unix --unix2dos --username --domain --) --dos2unix --unix2dos --username --domain --)
[[ " ${comp_words[@]} " != *" --password "* || [[ " ${comp_words[@]} " != *" --password "* ||
@@ -1035,7 +1036,7 @@ _VBoxManage() {
start) start)
items=(--exe --timeout --unquoted-args items=(--exe --timeout --unquoted-args
--ignore-operhaned-processes --no-profile --ignore-operhaned-processes --profile
--username --domain --passwordfile --password --) --username --domain --passwordfile --password --)
[[ " ${comp_words[@]} " != *" --password "* || [[ " ${comp_words[@]} " != *" --password "* ||
@@ -1246,6 +1247,7 @@ _VBoxManage() {
COMPREPLY=( $(compgen -W "$result" -- ${cur}) ) COMPREPLY=( $(compgen -W "$result" -- ${cur}) )
fi fi
;; ;;
updatega|updateguestadditions|updateadditions) updatega|updateguestadditions|updateadditions)
items=(--source --wait-start) items=(--source --wait-start)
[[ " ${COMP_WORDS[@]} " != *" --verbose "* && [[ " ${COMP_WORDS[@]} " != *" --verbose "* &&
@@ -1258,6 +1260,7 @@ _VBoxManage() {
_get_excluded_items "${items[@]}" _get_excluded_items "${items[@]}"
COMPREPLY=( $(compgen -W "$result" -- ${cur}) ) COMPREPLY=( $(compgen -W "$result" -- ${cur}) )
;; ;;
watch) watch)
items=() items=()
[[ " ${COMP_WORDS[@]} " != *" --verbose "* && [[ " ${COMP_WORDS[@]} " != *" --verbose "* &&
@@ -1271,6 +1274,7 @@ _VBoxManage() {
COMPREPLY=( $(compgen -W "$result" -- ${cur}) ) COMPREPLY=( $(compgen -W "$result" -- ${cur}) )
;; ;;
esac esac
case "${prev}" in case "${prev}" in
close) close)
items=(--verbose) items=(--verbose)
@@ -1469,14 +1473,12 @@ _VBoxManage() {
_get_excluded_items "${items[@]}" _get_excluded_items "${items[@]}"
COMPREPLY=( $(compgen -W "$result" -- ${cur}) ) COMPREPLY=( $(compgen -W "$result" -- ${cur}) )
fi fi
;; ;;
esac esac
else else
[[ ${#COMPREPLY[@]} -eq 0 ]] && \ [[ ${#COMPREPLY[@]} -eq 0 ]] && \
COMPREPLY=( $(compgen -W "${items[*]}" -- ${cur}) ) COMPREPLY=( $(compgen -W "${items[*]}" -- ${cur}) )
fi fi
;; ;;
modifymedium) modifymedium)
@@ -1495,7 +1497,8 @@ _VBoxManage() {
;; ;;
*) *)
_find_item_name 2 _find_item_name 2
items=(--type --autoreset --property --compact --resize) items=(--type --autoreset --property --compact --resize
--move)
_get_excluded_items "${items[@]}" _get_excluded_items "${items[@]}"
COMPREPLY=( $(compgen -W "$result" -- ${cur}) ) COMPREPLY=( $(compgen -W "$result" -- ${cur}) )
case "${prev}" in case "${prev}" in
@@ -1507,6 +1510,9 @@ _VBoxManage() {
--autoreset) --autoreset)
COMPREPLY=( $(compgen -W "on off" -- ${cur}) ) COMPREPLY=( $(compgen -W "on off" -- ${cur}) )
;; ;;
--move)
COMPREPLY=( $(compgen -o dirnames -- ${cur}) )
;;
esac esac
;; ;;
esac esac
@@ -1585,7 +1591,8 @@ _VBoxManage() {
--videocapfile --videocapres --videocaprate --videocapfps --videocapfile --videocapres --videocaprate --videocapfps
--videocapmaxtime --videocapmaxsize --videocapopts --defaultfrontend --videocapmaxtime --videocapmaxsize --videocapopts --defaultfrontend
--cpuid-portability-level --paravirtprovider --audiocodec --usbxhci --cpuid-portability-level --paravirtprovider --audiocodec --usbxhci
--usbrename) --usbrename --apic --x2apic --paravirtdebug --cpu-profile
--biosapic --videocapopts)
if [[ ${prev} == ${cmd} ]]; then if [[ ${prev} == ${cmd} ]]; then
_vms_comp vms _vms_comp vms
@@ -1597,10 +1604,12 @@ _VBoxManage() {
COMPREPLY=() COMPREPLY=()
_group_comp _group_comp
;; ;;
--ostype) --ostype)
COMPREPLY=() COMPREPLY=()
_os_comp _os_comp
;; ;;
--pagefusion|--acpi|--ioapic|--hpet|--triplefaultreset|\ --pagefusion|--acpi|--ioapic|--hpet|--triplefaultreset|\
--hwvirtex|--nestedpaging|--largepages|--vtxvpid|--vtxux|\ --hwvirtex|--nestedpaging|--largepages|--vtxvpid|--vtxux|\
--pae|--longmode|--cpuhotplug|--rtcuseutc|\ --pae|--longmode|--cpuhotplug|--rtcuseutc|\
@@ -1622,73 +1631,89 @@ _VBoxManage() {
--vrdemulticon|--vrdereusecon|--vrdevideochannel|--usb|\ --vrdemulticon|--vrdereusecon|--vrdevideochannel|--usb|\
--usbehci|--teleporter|--tracing-enabled|\ --usbehci|--teleporter|--tracing-enabled|\
--tracing-allow-vm-access|--usbcardreader|\ --tracing-allow-vm-access|--usbcardreader|\
--autostart-enabled|--videocap|--usbxhci) --autostart-enabled|--videocap|--usbxhci|--apic|--x2apic)
COMPREPLY=( $(compgen -W "on off" -- ${cur}) ) COMPREPLY=( $(compgen -W "on off" -- ${cur}) )
;; ;;
--graphicscontroller) --graphicscontroller)
COMPREPLY=( $(compgen -W "none vboxvga vmsvga" \ COMPREPLY=( $(compgen -W "none vboxvga vmsvga" \
-- ${cur}) ) -- ${cur}) )
;; ;;
--firmware) --firmware)
COMPREPLY=( $(compgen -W "bios efi efi32 efi64" \ COMPREPLY=( $(compgen -W "bios efi efi32 efi64" \
-- ${cur}) ) -- ${cur}) )
;; ;;
--chipset) --chipset)
COMPREPLY=( $(compgen -W "ich9 piix3" -- ${cur}) ) COMPREPLY=( $(compgen -W "ich9 piix3" -- ${cur}) )
;; ;;
--biosbootmenu) --biosbootmenu)
COMPREPLY=( $(compgen -W "disabled menuonly COMPREPLY=( $(compgen -W "disabled menuonly
messageandmenu" -- ${cur}) ) messageandmenu" -- ${cur}) )
;; ;;
--boot[1-4]) --boot[1-4])
COMPREPLY=( $(compgen -W "none floppy dvd disk net" \ COMPREPLY=( $(compgen -W "none floppy dvd disk net" \
-- ${cur}) ) -- ${cur}) )
;; ;;
--nic[1-8]) --nic[1-8])
COMPREPLY=( $(compgen -W "none null nat bridged intnet COMPREPLY=( $(compgen -W "none null nat bridged intnet
hostonly generic natnetwork" -- ${cur}) ) hostonly generic natnetwork" -- ${cur}) )
;; ;;
--nictype[1-8]) --nictype[1-8])
COMPREPLY=( $(compgen -W "Am79C970A Am79C973 82540EM COMPREPLY=( $(compgen -W "Am79C970A Am79C973 82540EM
82543GC 82545EM virtio" -- ${cur}) ) 82543GC 82545EM virtio" -- ${cur}) )
;; ;;
--nicpromisc[1-8]) --nicpromisc[1-8])
COMPREPLY=( $(compgen -W "deny allow-vms allow-all" \ COMPREPLY=( $(compgen -W "deny allow-vms allow-all" \
-- ${cur}) ) -- ${cur}) )
;; ;;
--nicbandwidthgroup[1-8]) --nicbandwidthgroup[1-8])
COMPREPLY=() COMPREPLY=()
_bandwidthctl_comp _bandwidthctl_comp
_get_excluded_items "none" _get_excluded_items "none"
COMPREPLY+=( $(compgen -W "$result" -- ${cur}) ) COMPREPLY+=( $(compgen -W "$result" -- ${cur}) )
;; ;;
--bridgeadapter[1-8]) --bridgeadapter[1-8])
COMPREPLY=() COMPREPLY=()
_bridgedif_comp _bridgedif_comp
_get_excluded_items "none" _get_excluded_items "none"
COMPREPLY+=( $(compgen -W "$result" -- ${cur}) ) COMPREPLY+=( $(compgen -W "$result" -- ${cur}) )
;; ;;
--hostonlyadapter[1-8]) --hostonlyadapter[1-8])
COMPREPLY=() COMPREPLY=()
_hostonlyif_comp _hostonlyif_comp
_get_excluded_items "none" _get_excluded_items "none"
COMPREPLY+=( $(compgen -W "$result" -- ${cur}) ) COMPREPLY+=( $(compgen -W "$result" -- ${cur}) )
;; ;;
--intnet[1-8]) --intnet[1-8])
COMPREPLY=() COMPREPLY=()
_intnet_comp _intnet_comp
;; ;;
--nat-network[1-8]) --nat-network[1-8])
COMPREPLY=() COMPREPLY=()
_natnet_comp _natnet_comp
;; ;;
--natnet[1-8]) --natnet[1-8])
COMPREPLY=() COMPREPLY=()
_natnet_comp _natnet_comp
;; ;;
--natpf[1-8]) --natpf[1-8])
COMPREPLY+=( $(compgen -W "delete" -- ${cur}) ) COMPREPLY+=( $(compgen -W "delete" -- ${cur}) )
;; ;;
--nataliasmode[1-8]) --nataliasmode[1-8])
COMPREPLY+=( $(compgen -W "default" -- ${cur}) ) COMPREPLY+=( $(compgen -W "default" -- ${cur}) )
;; ;;
@@ -1696,10 +1721,12 @@ _VBoxManage() {
--macaddress[1-8]) --macaddress[1-8])
COMPREPLY+=( $(compgen -W "auto" -- ${cur}) ) COMPREPLY+=( $(compgen -W "auto" -- ${cur}) )
;; ;;
--mouse) --mouse)
COMPREPLY+=( $(compgen -W "ps2 usb usbtablet COMPREPLY+=( $(compgen -W "ps2 usb usbtablet
usbmultitouch" -- ${cur}) ) usbmultitouch" -- ${cur}) )
;; ;;
--keyboard) --keyboard)
COMPREPLY+=( $(compgen -W "ps2 usb" -- ${cur}) ) COMPREPLY+=( $(compgen -W "ps2 usb" -- ${cur}) )
;; ;;
@@ -1707,10 +1734,12 @@ _VBoxManage() {
--uart[1-2]|--lpt[1-2]) --uart[1-2]|--lpt[1-2])
COMPREPLY+=( $(compgen -W "off" -- ${cur}) ) COMPREPLY+=( $(compgen -W "off" -- ${cur}) )
;; ;;
--uartmode[1-2]) --uartmode[1-2])
COMPREPLY+=( $(compgen -W "disconnected server client COMPREPLY+=( $(compgen -W "disconnected server client
tcpserver tcpclient file" -- ${cur}) ) tcpserver tcpclient file" -- ${cur}) )
;; ;;
--audio) --audio)
COMPREPLY+=( $(compgen -W "none null oss alsa pulse" \ COMPREPLY+=( $(compgen -W "none null oss alsa pulse" \
-- ${cur}) ) -- ${cur}) )
@@ -1729,6 +1758,7 @@ _VBoxManage() {
COMPREPLY+=( $(compgen -W "disabled hosttoguest COMPREPLY+=( $(compgen -W "disabled hosttoguest
guesttohost bidirectional" -- ${cur}) ) guesttohost bidirectional" -- ${cur}) )
;; ;;
--draganddrop) --draganddrop)
COMPREPLY+=( $(compgen -W "disabled hosttoguest" \ COMPREPLY+=( $(compgen -W "disabled hosttoguest" \
-- ${cur}) ) -- ${cur}) )
@@ -1738,23 +1768,36 @@ _VBoxManage() {
--defaultfrontend) --defaultfrontend)
COMPREPLY+=( $(compgen -W "default" -- ${cur}) ) COMPREPLY+=( $(compgen -W "default" -- ${cur}) )
;; ;;
--vrdeauthtype) --vrdeauthtype)
COMPREPLY+=( $(compgen -W "null external guest" \ COMPREPLY+=( $(compgen -W "null external guest" \
-- ${cur}) ) -- ${cur}) )
;; ;;
--paravirtprovider) --paravirtprovider)
COMPREPLY=( $(compgen -W "none default legacy minimal COMPREPLY=( $(compgen -W "none default legacy minimal
hyperv kvm" -- ${cur}) ) hyperv kvm" -- ${cur}) )
;; ;;
--cpuid-portability-level) --cpuid-portability-level)
COMPREPLY=( $(compgen -W "0 1 2 3" -- ${cur}) ) COMPREPLY=( $(compgen -W "0 1 2 3" -- ${cur}) )
;; ;;
--cpu-profile)
COMPREPLY=( $(compgen -W "host 8086 80286 80386" \
-- ${cur}) )
;;
--biosapic)
COMPREPLY=( $(compgen -W "disabled apic x2apic" \
-- ${cur}) )
;;
esac esac
fi fi
;; ;;
natnetwork) natnetwork)
items=(add remove modify start stop) items=(add remove modify start stop list)
subcommand=${COMP_WORDS[2]} subcommand=${COMP_WORDS[2]}
if [[ "${prev}" == "--netname" ]]; then if [[ "${prev}" == "--netname" ]]; then
_natnet_comp _natnet_comp
@@ -1872,6 +1915,7 @@ _VBoxManage() {
[[ ${#COMPREPLY[@]} -eq 0 ]] && \ [[ ${#COMPREPLY[@]} -eq 0 ]] && \
COMPREPLY=( $(compgen -W "${items[*]}" -- ${cur}) ) COMPREPLY=( $(compgen -W "${items[*]}" -- ${cur}) )
;; ;;
showmediuminfo) showmediuminfo)
if [[ ${prev} == ${cmd} ]]; then if [[ ${prev} == ${cmd} ]]; then
COMPREPLY=( $(compgen -W "disk dvd floppy" -- ${cur}) ) COMPREPLY=( $(compgen -W "disk dvd floppy" -- ${cur}) )
@@ -2023,11 +2067,11 @@ _VBoxManage() {
case "${prev}" in case "${prev}" in
--add) --add)
COMPREPLY=( $(compgen -W "ide sata scsi floppy COMPREPLY=( $(compgen -W "ide sata scsi floppy
sas" -- ${cur}) ) sas usb pcie" -- ${cur}) )
;; ;;
--controller) --controller)
COMPREPLY=( $(compgen -W "LSILogic LSILogicSAS BusLogic COMPREPLY=( $(compgen -W "LSILogic LSILogicSAS BusLogic
IntelAHCI PIIX3 PIIX4 ICH6 I82078" -- ${cur}) ) IntelAHCI PIIX3 PIIX4 ICH6 I82078 USB NVMe" -- ${cur}) )
;; ;;
--bootable|--hostiocache) --bootable|--hostiocache)
COMPREPLY=( $(compgen -W "on off" -- ${cur}) ) COMPREPLY=( $(compgen -W "on off" -- ${cur}) )
@@ -2046,7 +2090,7 @@ _VBoxManage() {
fi fi
;; ;;
usbfilte) usbfilter)
if [[ COMP_CWORD -ge 3 ]]; then if [[ COMP_CWORD -ge 3 ]]; then
subcommand="${COMP_WORDS[2]}" subcommand="${COMP_WORDS[2]}"
if [[ $subcommand == "${cmd}" ]]; then if [[ $subcommand == "${cmd}" ]]; then
@@ -2087,6 +2131,29 @@ _VBoxManage() {
fi fi
fi fi
;; ;;
usbdevsource)
if [[ COMP_CWORD -ge 3 ]]; then
subcommand="${COMP_WORDS[2]}"
if [[ $subcommand == "${cmd}" ]]; then
subcommand="${COMP_WORDS[3]}"
fi
fi
if [[ ${prev} == ${cmd} ]]; then
COMPREPLY=( $(compgen -W "add remove" -- ${cur}) )
else
if [[ ${#COMPREPLY[@]} -eq 0 ]]; then
case "${subcommand}" in
add)
local items=(--address --backend)
_get_excluded_items "${items[@]}"
COMPREPLY=( $(compgen -W "$result" -- ${cur}) )
;;
esac
fi
fi
;;
esac esac
} }
complete -o default -F _VBoxManage VBoxManage complete -o default -F _VBoxManage VBoxManage