Index: /trunk/doc/manual/en_US/man_VBoxManage-controlvm.xml =================================================================== --- /trunk/doc/manual/en_US/man_VBoxManage-controlvm.xml (revision 92533) +++ /trunk/doc/manual/en_US/man_VBoxManage-controlvm.xml (revision 92534) @@ -972,5 +972,5 @@ runtime to specify the name of the file in which to log the trace. Otherwise, use the VBoxManage modifyvm - --nictracefileN=filename + --nic-trace-fileN=filename command to specify the name of the file. @@ -1300,5 +1300,5 @@ - Also see the option description in + Also see the option description in . @@ -1326,5 +1326,5 @@ is the standard RDP port, 3389. - Also see the option description + Also see the option description in . @@ -1335,5 +1335,5 @@ specified host network interface. - Also see the option + Also see the option description in . Index: /trunk/doc/manual/en_US/man_VBoxManage-dhcpserver.xml =================================================================== --- /trunk/doc/manual/en_US/man_VBoxManage-dhcpserver.xml (revision 92533) +++ /trunk/doc/manual/en_US/man_VBoxManage-dhcpserver.xml (revision 92534) @@ -276,5 +276,5 @@ --interface=ifname The host only interface name. This would be same value - as you would use for the VBoxManage modifyvm --hostonlyadapter + as you would use for the VBoxManage modifyvm --host-only-adapter option when configuring a VM to use a host-only network. The value can also be found in the Name row in VBoxManage list hostonlyifs. Index: /trunk/doc/manual/en_US/man_VBoxManage-modifyvm.xml =================================================================== --- /trunk/doc/manual/en_US/man_VBoxManage-modifyvm.xml (revision 92533) +++ /trunk/doc/manual/en_US/man_VBoxManage-modifyvm.xml (revision 92534) @@ -46,8 +46,8 @@ --groups= group [,group...] --description=description - --ostype=OS-type - --iconfile=filename + --os-type=OS-type + --icon-file=filename --memory=size-in-MB - --pagefusion= + --page-fusion= on off @@ -62,18 +62,18 @@ off - --hardwareuuid=UUID + --hardware-uuid=UUID --cpus=CPU-count - --cpuhotplug= - on - off - - --plugcpu=CPU-ID - --unplugcpu=CPU-ID - --cpuexecutioncap=number + --cpu-hotplug= + on + off + + --plug-cpu=CPU-ID + --unplug-cpu=CPU-ID + --cpu-execution-cap=number --pae= on off - --longmode= + --long-mode= on off @@ -121,5 +121,5 @@ off - --triplefaultreset= + --triple-fault-reset= on off @@ -133,5 +133,5 @@ off - --paravirtprovider= + --paravirt-provider= none default @@ -141,18 +141,18 @@ kvm - --paravirtdebug= key=value [,key=value...] - --nestedpaging= - on - off - - --largepages= - on - off - - --vtxvpid= - on - off - - --vtxux= + --paravirt-debug= key=value [,key=value...] + --nested-paging= + on + off + + --large-pages= + on + off + + --vtx-vpid= + on + off + + --vtx-ux= on off @@ -166,9 +166,9 @@ off - --accelerate3d= - on - off - - --accelerate2dvideo= + --accelerate-3d= + on + off + + --accelerate-2d-video= on off @@ -194,26 +194,26 @@ location - --bioslogofadein= - on - off - - --bioslogofadeout= - on - off - - --bioslogodisplaytime=msec - --bioslogoimagepath=pathname - --biosbootmenu= + --bios-logo-fade-in= + on + off + + --bios-logo-fade-out= + on + off + + --bios-logo-display-time=msec + --bios-logo-image-path=pathname + --bios-boot-menu= disabled menuonly messageandmenu - --biosapic= + --bios-apic= disabled apic x2apic - --biossystemtimeoffset=msec - --biospxedebug= + --bios-system-time-offset=msec + --bios-pxe-debug= on off @@ -230,5 +230,5 @@ net - --rtcuseutc= + --rtc-use-utc= on off @@ -240,5 +240,5 @@ vboxsvga - --snapshotfolder= + --snapshot-folder= default pathname @@ -250,6 +250,6 @@ efi64 - --guestmemoryballoon=size-in-MB - --defaultfrontend= + --guest-memory-balloon=size-in-MB + --default-frontend= default name @@ -284,5 +284,5 @@ natnetwork - --nictypeN= + --nic-typeN= Am79C970A Am79C973 @@ -292,38 +292,38 @@ virtio - --cableconnectedN= - on - off - - --nictraceN= - on - off - - --nictracefileN=filename - --nicpropertyN=name= value - --nicspeedN=kbps - --nicbootprioN=priority - --nicpromiscN= + --cable-connectedN= + on + off + + --nic-traceN= + on + off + + --nic-trace-fileN=filename + --nic-propertyN=name= value + --nic-speedN=kbps + --nic-boot-prioN=priority + --nic-promiscN= deny allow-vms allow-all - --nicbandwidthgroupN= + --nic-bandwidth-groupN= none name - --bridgeadapterN= + --bridge-adapterN= none device-name - --hostonlyadapterN= + --host-only-adapterN= none device-name - --hostonlynetN=network-name + --host-only-netN=network-name --intnetN=network-name --nat-networkN=network-name - --nicgenericdrvN=driver-name - --macaddressN= + --nic-generic-drvN=driver-name + --mac-addressN= auto MAC-address @@ -337,35 +337,35 @@ vmname - --natnetN= + --nat-netN= network default - --natpfN= + --nat-pfN= [rule-name],tcp udp,[host-IP],hostport,[guest-IP],guestport - --natpfN=delete=rule-name - --nattftpprefixN=prefix - --nattftpfileN=filename - --nattftpserverN=IP-address - --natbindipN=IP-address - --natdnspassdomainN= - on - off - - --natdnsproxyN= - on - off - - --natdnshostresolverN= - on - off - - --natlocalhostreachableN= - on - off - - --natsettingsN=[mtu],[socksnd],[sockrcv],[tcpsnd],[tcprcv] - --nataliasmodeN= + --nat-pfN=delete=rule-name + --nat-tftp-prefixN=prefix + --nat-tftp-fileN=filename + --nat-tftp-serverN=IP-address + --nat-bind-ipN=IP-address + --nat-dns-pass-domainN= + on + off + + --nat-dns-proxyN= + on + off + + --nat-dns-host-resolverN= + on + off + + --nat-localhostreachableN= + on + off + + --nat-settingsN=[mtu],[socksnd],[sockrcv],[tcpsnd],[tcprcv] + --nat-alias-modeN= default [log],[proxyonly],[sameports] @@ -393,5 +393,5 @@ IO-base IRQ - --uartmodeN= + --uart-modeN= disconnected server pipe @@ -402,10 +402,10 @@ device-name - --uarttypeN= + --uart-typeN= 16450 16550A 16750 - --lptmodeN=device-name + --lpt-modeN=device-name --lptN= off @@ -421,10 +421,10 @@ coreaudio - --audiocontroller= + --audio-controller= ac97 hda sb16 - --audiocodec= + --audio-codec= stac9700 ad1980 @@ -432,9 +432,9 @@ sb16 - --audioin= - on - off - - --audioout= + --audio-in= + on + off + + --audio-out= on off @@ -449,5 +449,5 @@ The implementation is not finished, so postpone documenting until it actually is ready for users. --> - --draganddrop= + --drag-and-drop= disabled hosttoguest @@ -455,18 +455,18 @@ bidirectional - --monitorcount=number - --usbehci= - on - off - - --usbohci= - on - off - - --usbxhci= - on - off - - --usbrename=old-name new-name + --monitor-count=number + --usb-ehci= + on + off + + --usb-ohci= + on + off + + --usb-xhci= + on + off + + --usb-rename=old-name new-name @@ -481,15 +481,15 @@ off - --recordingscreens= + --recording-screens= all screen-ID [screen-ID...] - --recordingfile=filename - --recordingmaxsize=MB - --recordingmaxtime=msec - --recordingopts= key=value [,key=value...] - --recordingvideofps=fps - --recordingvideorate=rate - --recordingvideores=width height + --recording-file=filename + --recording-max-size=MB + --recording-max-time=msec + --recording-opts= key=value [,key=value...] + --recording-video-fps=fps + --recording-video-rate=rate + --recording-video-res=width height @@ -504,33 +504,33 @@ off - --vrdeproperty=property-name= property-value - --vrdeextpack= + --vrde-property=property-name= property-value + --vrde-extpack= default name - --vrdeport=port - --vrdeaddress=hostip - --vrdeauthtype= + --vrde-port=port + --vrde-address=hostip + --vrde-auth-type= null external guest - --vrdeauthlibrary= + --vrde-auth-library= default name - --vrdemulticon= - on - off - - --vrdereusecon= - on - off - - --vrdevideochannel= - on - off - - --vrdevideochannelquality=percent + --vrde-multi-con= + on + off + + --vrde-reuse-con= + on + off + + --vrde-video-channel= + on + off + + --vrde-video-channel-quality=percent @@ -545,11 +545,11 @@ off - --teleporterport=port - --teleporteraddress= + --teleporter-port=port + --teleporter-address= address empty - --teleporterpassword=password - --teleporterpasswordfile= + --teleporter-password=password + --teleporter-password-file= filename stdin @@ -558,5 +558,5 @@ --cpuid-set=leaf:subleaf eax ebx ecx edx --cpuid-remove=leaf:subleaf - --cpuidremoveall + --cpuid-remove-all @@ -584,5 +584,5 @@ vmname - --usbcardreader= + --usb-card-reader= on off @@ -614,6 +614,6 @@ vmname - --pciattach=host-PCI-address@guest-PCI-bus-address - --pcidetach=host-PCI-address + --pci-attach=host-PCI-address@guest-PCI-bus-address + --pci-detach=host-PCI-address @@ -685,5 +685,5 @@ - + Specifies the guest operating system (OS) information for @@ -693,5 +693,5 @@ - + Specifies the path to the VM icon file in PNG format @@ -709,5 +709,5 @@ - + Enables or disables the Page Fusion feature, which is @@ -740,5 +740,5 @@ - + Specifies the Universally Unique Identifier (UUID) to @@ -763,5 +763,5 @@ - + Enables or disables CPU hot-plugging. When enabled, you @@ -771,5 +771,5 @@ - + Adds a virtual CPU to the VM. @@ -784,5 +784,5 @@ - + Removes a virtual CPU from the VM. @@ -815,5 +815,5 @@ - + Enables or disables long mode. See @@ -906,5 +906,5 @@ - + Enables or disables the resetting of the guest VM instead @@ -938,5 +938,5 @@ - + Specifies one of the following paravirtualization @@ -973,5 +973,5 @@ - + Specifies debugging properties that are specific to the @@ -981,5 +981,5 @@ - + Enables or disables the nested paging feature in the @@ -991,5 +991,5 @@ - + Enables or disables the hypervisor's use of large pages, @@ -1001,5 +1001,5 @@ - + Enables or disables the use of the tagged TLB (VPID) @@ -1010,5 +1010,5 @@ - + Enables or disables the use of unrestricted guest mode for @@ -1128,5 +1128,5 @@ - + Specifies whether the BIOS logo fades in on VM startup. By @@ -1135,5 +1135,5 @@ - + Specifies whether the BIOS logo fades out on VM startup. @@ -1141,5 +1141,5 @@ - + Specifies the amount of time in milliseconds that the BIOS @@ -1148,5 +1148,5 @@ - + Replaces the existing BIOS logo with a different image. @@ -1158,5 +1158,5 @@ - + Specifies whether the BIOS permits you to select a @@ -1181,5 +1181,5 @@ - + Specifies the APIC level of the firmware. Valid values @@ -1201,5 +1201,5 @@ - + Specifies the time offset in milliseconds of the guest VM @@ -1210,5 +1210,5 @@ - + Enables or disables additional debugging output when using @@ -1248,5 +1248,5 @@ - + Specifies whether the real-time clock (RTC) uses @@ -1263,5 +1263,5 @@ - + Specifies the name of the VM's snapshot storage folder. If @@ -1282,5 +1282,5 @@ - + Specifies the size of the guest memory balloon. The guest @@ -1294,5 +1294,5 @@ - + Specifies the default frontend to use when starting the @@ -1393,5 +1393,5 @@ - + Identifies the type of networking hardware that @@ -1428,5 +1428,5 @@ - + Temporarily disconnects a virtual network interface, as if @@ -1437,5 +1437,5 @@ - + Enables or disables network tracing for the specified @@ -1444,5 +1444,5 @@ - + Specifies the absolute path of the file in which to write @@ -1452,9 +1452,9 @@ - + Enables you to set property values and pass them to rarely used network backends. To use this option, you must also - use the option. + use the option. These properties are specific to the backend engine and @@ -1465,5 +1465,5 @@ - + Specifies the throughput rate in kilobits per second for @@ -1475,5 +1475,5 @@ - + Assigns a priority to each NIC that determines the order @@ -1491,5 +1491,5 @@ - + Enables you to specify whether to deny or allow @@ -1514,5 +1514,5 @@ - + Adds or removes a bandwidth group assignment to the @@ -1534,5 +1534,5 @@ - + Specifies the host interface to use for the specified @@ -1544,5 +1544,5 @@ - + Specifies which host-only networking interface to use for @@ -1574,5 +1574,5 @@ - + Enables you to access rarely used networking sub-modes, @@ -1583,5 +1583,5 @@ - + Specifies the MAC address of the specified network adapter @@ -1601,5 +1601,5 @@ - + Specifies the IP address range to use for this network. @@ -1610,5 +1610,5 @@ - + Specifies the NAT port-forwarding rule to use. See @@ -1617,5 +1617,5 @@ - + Specifies the NAT port-forwarding rule to delete. See @@ -1624,5 +1624,5 @@ - + Specifies a prefix to use for the built-in TFTP server. @@ -1633,5 +1633,5 @@ - + Specifies the name of the TFT boot file. See @@ -1640,5 +1640,5 @@ - + Specifies the address of the TFTP server from which to @@ -1647,5 +1647,5 @@ - + Specifies an alternate IP address to which the NAT engine @@ -1657,5 +1657,5 @@ - + Specifies whether the built-in DHCP server passes the @@ -1664,5 +1664,5 @@ - + Specifies whether the NAT engine is the proxy for all @@ -1672,5 +1672,5 @@ - + Specifies whether the NAT engine uses the host system's @@ -1680,5 +1680,5 @@ - + Specifies whether the NAT engine allows traffic from the guest directed to @@ -1687,5 +1687,5 @@ - + Specifies values for tuning NAT performance. See @@ -1694,5 +1694,5 @@ - + Specifies the behavior of the NAT engine core as follows: @@ -1758,5 +1758,5 @@ - + Specifies how &product-name; connects the specified @@ -1843,5 +1843,5 @@ - + Configures the UART type for the specified virtual serial @@ -1853,5 +1853,5 @@ - + Specifies the device name of the parallel port to use. @@ -1889,5 +1889,5 @@ - + Specifies the audio controller to be used with the VM. @@ -1898,5 +1898,5 @@ - + Specifies the audio codec to be used with the VM. Valid @@ -1907,5 +1907,5 @@ - + Specifies whether to enable or disable audio capture from @@ -1914,5 +1914,5 @@ - + Specifies whether to enable or disable audio playback from @@ -1936,5 +1936,5 @@ - + Specifies how to use the drag and drop feature between the @@ -1951,5 +1951,5 @@ - + Enables you to configure multiple monitors. See @@ -1958,5 +1958,5 @@ - + Enables or disables the VM's virtual USB 1.1 controller. @@ -1965,5 +1965,5 @@ - + Enables or disables the VM's virtual USB 2.0 controller. @@ -1972,5 +1972,5 @@ - + Enables or disables the VM's virtual USB 3.0 controller. @@ -1980,5 +1980,5 @@ - + Rename's the VM's virtual USB controller from @@ -2006,5 +2006,5 @@ - + Enables you to specify the VM screens to record. The @@ -2015,5 +2015,5 @@ - + Specifies the name of the file in which to save the @@ -2022,5 +2022,5 @@ - + Specifies the maximum size of the recorded video file in @@ -2031,5 +2031,5 @@ - + Specifies the maximum amount of time to record in seconds. @@ -2040,5 +2040,5 @@ - + Specifies additional video-recording properties as a @@ -2052,5 +2052,5 @@ - + Specifies the maximum number of video frames per second @@ -2062,5 +2062,5 @@ - + Specifies the bit rate of the video in kilobits per @@ -2071,5 +2071,5 @@ - + Specifies the video resolution (width and height) of the @@ -2094,5 +2094,5 @@ - + port is the port or port range @@ -2102,10 +2102,10 @@ RDP port. - Also see the option + Also see the option description. - + IP-address is the IP address of @@ -2114,10 +2114,10 @@ host network interface at that IP address. - Also see the option + Also see the option description. - + Specifies whether the VRDP video channel is on or off. @@ -2128,5 +2128,5 @@ - + Specifies a value between 10% and 100%, inclusive, that @@ -2138,5 +2138,5 @@ - + Enables or disables the video downscale protection @@ -2165,5 +2165,5 @@ - + Disables the display VRDE server feature. @@ -2172,10 +2172,10 @@ to reenable the display feature, specify the VBoxManage modifyvm - --vrdeproperty=Client/DisableDisplay= command. + --vrde-property=Client/DisableDisplay= command. See . - + Disables the input VRDE server feature. @@ -2183,5 +2183,5 @@ - + Disables the audio VRDE server feature. @@ -2189,5 +2189,5 @@ - + Disables the USB VRDE server feature. @@ -2195,5 +2195,5 @@ - + Disables the clipboard VRDE server feature. To reenable @@ -2203,5 +2203,5 @@ - + Disables the upstream audio VRDE server feature. To @@ -2211,5 +2211,5 @@ - + Disables the RDP device redirection for smart cards VRDE @@ -2219,5 +2219,5 @@ - + Enables the 3D redirection VRDE server feature. To disable @@ -2226,5 +2226,5 @@ - + Specifies the following information that is required for a @@ -2250,5 +2250,5 @@ - + Specifies the absolute path to the server certificate. See @@ -2257,5 +2257,5 @@ - + Specifies the absolute path to the server private key. See @@ -2264,5 +2264,5 @@ - + Specifies the absolute path to the CA self-signed @@ -2271,5 +2271,5 @@ - + Specifies the audio connection mode or the path to the @@ -2296,5 +2296,5 @@ - + Specifies the absolute path to the audio log file. @@ -2302,5 +2302,5 @@ - + Specifies the library to use to access the VM remotely. @@ -2314,5 +2314,5 @@ - + port is the port or port range @@ -2327,5 +2327,5 @@ the available ports from the list. Only one machine can use a given port at a time. For example, the - option + option specifies that server can bind to one of following ports: 5000, 5010, @@ -2334,5 +2334,5 @@ - + Specifies the IP address of the host network interface to @@ -2346,13 +2346,13 @@ Only IPv4: Use the - option. + option. Only IPv6: Use the - option. + option. Both IPv6 and IPv4: - Use the + Use the option. This is the default value. @@ -2360,5 +2360,5 @@ - + Specify whether to use authorization and how to perform @@ -2382,5 +2382,5 @@ - + Specifies the library to use for RDP authentication. The @@ -2391,5 +2391,5 @@ - + Enables or disables the multiple connections VRDE server @@ -2399,5 +2399,5 @@ - + Specifies how the VRDE server behaves when multiple @@ -2411,5 +2411,5 @@ - + Enables video redirection if supported by the VRDE server. @@ -2418,5 +2418,5 @@ - + Specifies the image quality for video redirection as a @@ -2449,5 +2449,5 @@ - + Specifies the port on which the VM listens to receive a @@ -2459,5 +2459,5 @@ - + Specifies the IP address on which the VM listens to @@ -2472,5 +2472,5 @@ - + Specifies the password to use for authentication. When @@ -2481,5 +2481,5 @@ - + Specifies a file that contains the password to use for @@ -2539,5 +2539,5 @@ - + @@ -2591,5 +2591,5 @@ - + Enables or disables the USB card reader interface. @@ -2634,5 +2634,5 @@ - + Attaches the specified PCI network controller on the host @@ -2643,5 +2643,5 @@ - + Detaches the specified PCI network controller from the Index: /trunk/doc/manual/en_US/user_AdvancedTopics.xml =================================================================== --- /trunk/doc/manual/en_US/user_AdvancedTopics.xml (revision 92533) +++ /trunk/doc/manual/en_US/user_AdvancedTopics.xml (revision 92534) @@ -819,5 +819,5 @@ -$ VBoxManage modifyvm VM-name --cpuhotplug on +$ VBoxManage modifyvm VM-name --cpu-hotplug on @@ -830,11 +830,11 @@ When the VM is off, you can then add and remove virtual CPUs with - the VBoxManage modifyvm --plugcpu and - VBoxManage modifyvm --unplugcpu commands, which + the VBoxManage modifyvm --plug-cpu and + VBoxManage modifyvm --unplug-cpu commands, which take the number of the virtual CPU as a parameter, as follows: -$ VBoxManage modifyvm VM-name --plugcpu 3 -$ VBoxManage modifyvm VM-name --unplugcpu 3 +$ VBoxManage modifyvm VM-name --plug-cpu 3 +$ VBoxManage modifyvm VM-name --unplug-cpu 3 @@ -5934,5 +5934,5 @@ -VBoxManage modifyvm VM-name --vrdeproperty VNCPassword=secret +VBoxManage modifyvm VM-name --vrde-property VNCPassword=secret @@ -6874,5 +6874,5 @@ -$ VBoxManage modifyvm VM-name --paravirtdebug "enabled=1" +$ VBoxManage modifyvm VM-name --paravirt-debug "enabled=1" @@ -6884,5 +6884,5 @@ $ VBoxManage modifyvm VM-name \ ---paravirtdebug "enabled=1,address=192.168.32.1,port=55000" +--paravirt-debug "enabled=1,address=192.168.32.1,port=55000" Index: /trunk/doc/manual/en_US/user_BasicConcepts.xml =================================================================== --- /trunk/doc/manual/en_US/user_BasicConcepts.xml (revision 92533) +++ /trunk/doc/manual/en_US/user_BasicConcepts.xml (revision 92534) @@ -1326,5 +1326,5 @@ accuracy and performance of guest OSes. The options available are documented under the - option in + option in . For further details on the paravirtualization providers, see @@ -2023,5 +2023,5 @@ ports. For the latter, see for information on the , - and + and options. Index: /trunk/doc/manual/en_US/user_Frontends.xml =================================================================== --- /trunk/doc/manual/en_US/user_Frontends.xml (revision 92533) +++ /trunk/doc/manual/en_US/user_Frontends.xml (revision 92534) @@ -67,5 +67,5 @@ The port can be changed either in the Display settings of the graphical - user interface or with the option of + user interface or with the option of the VBoxManage modifyvm command. You can specify a comma-separated list of ports or ranges of ports. Use a @@ -73,5 +73,5 @@ will bind to one of the available ports from the specified list. For example, VBoxManage modifyvm - VM-name --vrdeport + VM-name --vrde-port 5000,5010-5012 configures the server to bind to one of the ports 5000, 5010, 5011, or 5012. See @@ -585,5 +585,5 @@ authenticated. For this, use the VBoxManage modifyvm command with the - option. See + option. See . The following methods of authentication are available: @@ -684,5 +684,5 @@ -VBoxManage modifyvm VM-name --vrdeauthtype external +VBoxManage modifyvm VM-name --vrde-auth-type external @@ -861,5 +861,5 @@ -vboxmanage modifyvm VM-name --vrdeproperty "Security/Method=negotiate" +vboxmanage modifyvm VM-name --vrde-property "Security/Method=negotiate" @@ -910,11 +910,11 @@ vboxmanage modifyvm VM-name \ - --vrdeproperty "Security/CACertificate=path/ca_cert.pem" + --vrde-property "Security/CACertificate=path/ca_cert.pem" vboxmanage modifyvm VM-name \ - --vrdeproperty "Security/ServerCertificate=path/server_cert.pem" + --vrde-property "Security/ServerCertificate=path/server_cert.pem" vboxmanage modifyvm VM-name \ - --vrdeproperty "Security/ServerPrivateKey=path/server_key_private.pem" + --vrde-property "Security/ServerPrivateKey=path/server_key_private.pem" @@ -947,5 +947,5 @@ -VBoxManage modifyvm VM-name --vrdemulticon on +VBoxManage modifyvm VM-name --vrde-multi-con on @@ -1015,5 +1015,5 @@ -VBoxManage modifyvm VM-name --vrdevideochannel on +VBoxManage modifyvm VM-name --vrde-video-channel on @@ -1024,5 +1024,5 @@ -VBoxManage modifyvm VM-name --vrdevideochannelquality 75 +VBoxManage modifyvm VM-name --vrde-video-channel-quality 75 @@ -1041,10 +1041,10 @@ -$ VBoxManage modifyvm VM-name --vrdeproperty Client/DisableDisplay=1 -$ VBoxManage modifyvm VM-name --vrdeproperty Client/DisableInput=1 -$ VBoxManage modifyvm VM-name --vrdeproperty Client/DisableUSB=1 -$ VBoxManage modifyvm VM-name --vrdeproperty Client/DisableAudio=1 -$ VBoxManage modifyvm VM-name --vrdeproperty Client/DisableClipboard=1 -$ VBoxManage modifyvm VM-name --vrdeproperty Client/DisableUpstreamAudio=1 +$ VBoxManage modifyvm VM-name --vrde-property Client/DisableDisplay=1 +$ VBoxManage modifyvm VM-name --vrde-property Client/DisableInput=1 +$ VBoxManage modifyvm VM-name --vrde-property Client/DisableUSB=1 +$ VBoxManage modifyvm VM-name --vrde-property Client/DisableAudio=1 +$ VBoxManage modifyvm VM-name --vrde-property Client/DisableClipboard=1 +$ VBoxManage modifyvm VM-name --vrde-property Client/DisableUpstreamAudio=1 @@ -1053,5 +1053,5 @@ -$ VBoxManage modifyvm VM-name --vrdeproperty Client/DisableDisplay= +$ VBoxManage modifyvm VM-name --vrde-property Client/DisableDisplay= @@ -1140,5 +1140,5 @@ -VBoxManage modifyvm targetvmname --teleporter on --teleporterport port +VBoxManage modifyvm targetvmname --teleporter on --teleporter-port port Index: /trunk/doc/manual/en_US/user_GuestAdditions.xml =================================================================== --- /trunk/doc/manual/en_US/user_GuestAdditions.xml (revision 92533) +++ /trunk/doc/manual/en_US/user_GuestAdditions.xml (revision 92534) @@ -2193,8 +2193,8 @@ - Memory ballooning does not work with large pages enabled. - To turn off large pages support for a VM, run + Memory ballooning does not work well with large pages + enabled. To turn off large pages support for a VM, run VBoxManage modifyvm - vmname --largepages + vmname --large-pages off @@ -2261,5 +2261,5 @@ -VBoxManage modifyvm "VM name" --guestmemoryballoon n +VBoxManage modifyvm "VM name" --guest-memory-balloon n @@ -2368,5 +2368,5 @@ -VBoxManage modifyvm "VM name" --pagefusion on +VBoxManage modifyvm "VM name" --page-fusion on Index: /trunk/doc/manual/en_US/user_Networking.xml =================================================================== --- /trunk/doc/manual/en_US/user_Networking.xml (revision 92533) +++ /trunk/doc/manual/en_US/user_Networking.xml (revision 92534) @@ -561,5 +561,5 @@ guestssh is purely descriptive and will be auto-generated if omitted. The number after - denotes the network card, as with other + denotes the network card, as with other VBoxManage commands. @@ -1272,14 +1272,14 @@ VBoxManage modifyvm "VM 01 on host 1" --nic<x> generic - VBoxManage modifyvm "VM 01 on host 1" --nicgenericdrv<x> UDPTunnel - VBoxManage modifyvm "VM 01 on host 1" --nicproperty<x> dest=10.0.0.2 - VBoxManage modifyvm "VM 01 on host 1" --nicproperty<x> sport=10001 - VBoxManage modifyvm "VM 01 on host 1" --nicproperty<x> dport=10002 + VBoxManage modifyvm "VM 01 on host 1" --nic-generic-drv<x> UDPTunnel + VBoxManage modifyvm "VM 01 on host 1" --nic-property<x> dest=10.0.0.2 + VBoxManage modifyvm "VM 01 on host 1" --nic-property<x> sport=10001 + VBoxManage modifyvm "VM 01 on host 1" --nic-property<x> dport=10002 VBoxManage modifyvm "VM 02 on host 2" --nic<y> generic - VBoxManage modifyvm "VM 02 on host 2" --nicgenericdrv<y> UDPTunnel - VBoxManage modifyvm "VM 02 on host 2" --nicproperty<y> dest=10.0.0.1 - VBoxManage modifyvm "VM 02 on host 2" --nicproperty<y> sport=10002 - VBoxManage modifyvm "VM 02 on host 2" --nicproperty<y> dport=10001 + VBoxManage modifyvm "VM 02 on host 2" --nic-generic-drv<y> UDPTunnel + VBoxManage modifyvm "VM 02 on host 2" --nic-property<y> dest=10.0.0.1 + VBoxManage modifyvm "VM 02 on host 2" --nic-property<y> sport=10002 + VBoxManage modifyvm "VM 02 on host 2" --nic-property<y> dport=10001 @@ -1353,5 +1353,5 @@ VBoxManage modifyvm "VM name" --nic<x> generic -VBoxManage modifyvm "VM name" --nicgenericdrv<x> VDE +VBoxManage modifyvm "VM name" --nic-generic-drv<x> VDE @@ -1359,5 +1359,5 @@ -VBoxManage modifyvm "VM name" --nicproperty<x> network=/tmp/switch1 +VBoxManage modifyvm "VM name" --nic-property<x> network=/tmp/switch1 @@ -1366,5 +1366,5 @@ -VBoxManage modifyvm "VM name" --nicproperty<x> network=/tmp/switch1[<n>] +VBoxManage modifyvm "VM name" --nic-property<x> network=/tmp/switch1[<n>] Index: /trunk/doc/manual/en_US/user_Technical.xml =================================================================== --- /trunk/doc/manual/en_US/user_Technical.xml (revision 92533) +++ /trunk/doc/manual/en_US/user_Technical.xml (revision 92534) @@ -908,5 +908,5 @@ and overhead. This can yield a performance improvement of up to 5%. To enable this feature for a VM, you use the - VBoxManage modifyvm --largepages command. + VBoxManage modifyvm --large-pages command. See . @@ -929,6 +929,6 @@ To enable these features for a VM, you use the - VBoxManage modifyvm --vtxvpid and - VBoxManage modifyvm --largepages commands. + VBoxManage modifyvm --vtx-vpid and + VBoxManage modifyvm --large-pages commands. See . Index: /trunk/doc/manual/en_US/user_VBoxManage.xml =================================================================== --- /trunk/doc/manual/en_US/user_VBoxManage.xml (revision 92533) +++ /trunk/doc/manual/en_US/user_VBoxManage.xml (revision 92534) @@ -744,7 +744,6 @@ 0 means port 3389, the standard port for RDP. See the description for the - --vrdeport option in - . + --vrde-port option in + . @@ -767,7 +766,6 @@ 0 means port 3389, the standard port for RDP. See the description for the - --vrdeport option in - . + --vrde-port option in + . @@ -779,8 +777,6 @@ specified, the server will accept connections only on the specified host network interface. See the description for - the --vrdeaddress option - in - . + the --vrde-address option + in . Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h (revision 92533) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h (revision 92534) @@ -75,4 +75,20 @@ } #endif + +/** + * Defines an option with two variants, producing two RTGETOPTDEF entries. + * + * This is mainly for replacing character-soup option names like + * --natlocalhostreachable and --biossystemtimeoffset with more easily parsed + * ones, like --nat-localhost-reachable and --bios-system-time-offset, without + * removing the legacy name. + */ +#define OPT2(a_pszWordDashWord, a_pszWordSoup, a_chOptOrValue, a_fFlags) \ + { a_pszWordDashWord, a_chOptOrValue, a_fFlags }, \ + { a_pszWordSoup, a_chOptOrValue, a_fFlags } + +/** A single option variant of OPT2 for better looking tables. */ +#define OPT1(a_pszOption, a_chOptOrValue, a_fFlags) \ + { a_pszOption, a_chOptOrValue, a_fFlags } Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (revision 92533) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (revision 92534) @@ -93,7 +93,6 @@ MODIFYVM_UNPLUGCPU, MODIFYVM_SETCPUID, - MODIFYVM_SETCPUID_OLD, // legacy (not yet deprecated) MODIFYVM_DELCPUID, - MODIFYVM_DELCPUID_OLD, // legacy (not yet deprecated) + MODIFYVM_DELCPUID_OLD, // legacy, different syntax from MODIFYVM_DELCPUID MODIFYVM_DELALLCPUID, MODIFYVM_GRAPHICSCONTROLLER, @@ -255,207 +254,202 @@ static const RTGETOPTDEF g_aModifyVMOptions[] = { -/** @todo Convert to dash separated names like --triple-fault-reset! Please - * do that for all new options as we don't need more character soups - * around VirtualBox - typedefs more than covers that demand! */ - { "--name", MODIFYVM_NAME, RTGETOPT_REQ_STRING }, - { "--groups", MODIFYVM_GROUPS, RTGETOPT_REQ_STRING }, - { "--description", MODIFYVM_DESCRIPTION, RTGETOPT_REQ_STRING }, - { "--ostype", MODIFYVM_OSTYPE, RTGETOPT_REQ_STRING }, - { "--iconfile", MODIFYVM_ICONFILE, RTGETOPT_REQ_STRING }, - { "--memory", MODIFYVM_MEMORY, RTGETOPT_REQ_UINT32 }, - { "--pagefusion", MODIFYVM_PAGEFUSION, RTGETOPT_REQ_BOOL_ONOFF }, - { "--vram", MODIFYVM_VRAM, RTGETOPT_REQ_UINT32 }, - { "--firmware", MODIFYVM_FIRMWARE, RTGETOPT_REQ_STRING }, - { "--acpi", MODIFYVM_ACPI, RTGETOPT_REQ_BOOL_ONOFF }, - { "--ioapic", MODIFYVM_IOAPIC, RTGETOPT_REQ_BOOL_ONOFF }, - { "--pae", MODIFYVM_PAE, RTGETOPT_REQ_BOOL_ONOFF }, - { "--longmode", MODIFYVM_LONGMODE, RTGETOPT_REQ_BOOL_ONOFF }, - { "--cpuid-portability-level", MODIFYVM_CPUID_PORTABILITY, RTGETOPT_REQ_UINT32 }, - { "--triplefaultreset", MODIFYVM_TFRESET, RTGETOPT_REQ_BOOL_ONOFF }, - { "--apic", MODIFYVM_APIC, RTGETOPT_REQ_BOOL_ONOFF }, - { "--x2apic", MODIFYVM_X2APIC, RTGETOPT_REQ_BOOL_ONOFF }, - { "--paravirtprovider", MODIFYVM_PARAVIRTPROVIDER, RTGETOPT_REQ_STRING }, - { "--paravirtdebug", MODIFYVM_PARAVIRTDEBUG, RTGETOPT_REQ_STRING }, - { "--hwvirtex", MODIFYVM_HWVIRTEX, RTGETOPT_REQ_BOOL_ONOFF }, - { "--nestedpaging", MODIFYVM_NESTEDPAGING, RTGETOPT_REQ_BOOL_ONOFF }, - { "--largepages", MODIFYVM_LARGEPAGES, RTGETOPT_REQ_BOOL_ONOFF }, - { "--vtxvpid", MODIFYVM_VTXVPID, RTGETOPT_REQ_BOOL_ONOFF }, - { "--vtxux", MODIFYVM_VTXUX, RTGETOPT_REQ_BOOL_ONOFF }, - { "--virt-vmsave-vmload", MODIFYVM_VIRT_VMSAVE_VMLOAD, RTGETOPT_REQ_BOOL_ONOFF }, - { "--ibpb-on-vm-exit", MODIFYVM_IBPB_ON_VM_EXIT, RTGETOPT_REQ_BOOL_ONOFF }, - { "--ibpb-on-vm-entry", MODIFYVM_IBPB_ON_VM_ENTRY, RTGETOPT_REQ_BOOL_ONOFF }, - { "--spec-ctrl", MODIFYVM_SPEC_CTRL, RTGETOPT_REQ_BOOL_ONOFF }, - { "--l1d-flush-on-sched", MODIFYVM_L1D_FLUSH_ON_SCHED, RTGETOPT_REQ_BOOL_ONOFF }, - { "--l1d-flush-on-vm-entry", MODIFYVM_L1D_FLUSH_ON_VM_ENTRY, RTGETOPT_REQ_BOOL_ONOFF }, - { "--mds-clear-on-sched", MODIFYVM_MDS_CLEAR_ON_SCHED, RTGETOPT_REQ_BOOL_ONOFF }, - { "--mds-clear-on-vm-entry", MODIFYVM_MDS_CLEAR_ON_VM_ENTRY, RTGETOPT_REQ_BOOL_ONOFF }, - { "--nested-hw-virt", MODIFYVM_NESTED_HW_VIRT, RTGETOPT_REQ_BOOL_ONOFF }, - { "--cpuid-set", MODIFYVM_SETCPUID, RTGETOPT_REQ_UINT32_OPTIONAL_PAIR | RTGETOPT_FLAG_HEX }, - { "--cpuid-remove", MODIFYVM_DELCPUID, RTGETOPT_REQ_UINT32_OPTIONAL_PAIR | RTGETOPT_FLAG_HEX }, - { "--cpuidset", MODIFYVM_SETCPUID_OLD, RTGETOPT_REQ_UINT32 | RTGETOPT_FLAG_HEX }, /* legacy */ - { "--cpuidremove", MODIFYVM_DELCPUID_OLD, RTGETOPT_REQ_UINT32 | RTGETOPT_FLAG_HEX }, /* legacy */ - { "--cpuidremoveall", MODIFYVM_DELALLCPUID, RTGETOPT_REQ_NOTHING}, - { "--cpus", MODIFYVM_CPUS, RTGETOPT_REQ_UINT32 }, - { "--cpuhotplug", MODIFYVM_CPUHOTPLUG, RTGETOPT_REQ_BOOL_ONOFF }, - { "--cpu-profile", MODIFYVM_CPU_PROFILE, RTGETOPT_REQ_STRING }, - { "--plugcpu", MODIFYVM_PLUGCPU, RTGETOPT_REQ_UINT32 }, - { "--unplugcpu", MODIFYVM_UNPLUGCPU, RTGETOPT_REQ_UINT32 }, - { "--cpuexecutioncap", MODIFYVM_CPU_EXECTUION_CAP, RTGETOPT_REQ_UINT32 }, - { "--rtcuseutc", MODIFYVM_RTCUSEUTC, RTGETOPT_REQ_BOOL_ONOFF }, - { "--graphicscontroller", MODIFYVM_GRAPHICSCONTROLLER, RTGETOPT_REQ_STRING }, - { "--monitorcount", MODIFYVM_MONITORCOUNT, RTGETOPT_REQ_UINT32 }, - { "--accelerate3d", MODIFYVM_ACCELERATE3D, RTGETOPT_REQ_BOOL_ONOFF }, + OPT1("--name", MODIFYVM_NAME, RTGETOPT_REQ_STRING), + OPT1("--groups", MODIFYVM_GROUPS, RTGETOPT_REQ_STRING), + OPT1("--description", MODIFYVM_DESCRIPTION, RTGETOPT_REQ_STRING), + OPT2("--os-type", "--ostype", MODIFYVM_OSTYPE, RTGETOPT_REQ_STRING), + OPT2("--icon-file", "--iconfile", MODIFYVM_ICONFILE, RTGETOPT_REQ_STRING), + OPT1("--memory", MODIFYVM_MEMORY, RTGETOPT_REQ_UINT32), + OPT2("--page-fusion", "--pagefusion", MODIFYVM_PAGEFUSION, RTGETOPT_REQ_BOOL_ONOFF), + OPT1("--vram", MODIFYVM_VRAM, RTGETOPT_REQ_UINT32), + OPT1("--firmware", MODIFYVM_FIRMWARE, RTGETOPT_REQ_STRING), + OPT1("--acpi", MODIFYVM_ACPI, RTGETOPT_REQ_BOOL_ONOFF), + OPT1("--ioapic", MODIFYVM_IOAPIC, RTGETOPT_REQ_BOOL_ONOFF), + OPT1("--pae", MODIFYVM_PAE, RTGETOPT_REQ_BOOL_ONOFF), + OPT2("--long-mode", "--longmode", MODIFYVM_LONGMODE, RTGETOPT_REQ_BOOL_ONOFF), + OPT1("--cpuid-portability-level", MODIFYVM_CPUID_PORTABILITY, RTGETOPT_REQ_UINT32), + OPT2("--triple-fault-reset", "--triplefaultreset", MODIFYVM_TFRESET, RTGETOPT_REQ_BOOL_ONOFF), + OPT1("--apic", MODIFYVM_APIC, RTGETOPT_REQ_BOOL_ONOFF), + OPT1("--x2apic", MODIFYVM_X2APIC, RTGETOPT_REQ_BOOL_ONOFF), + OPT2("--paravirt-provider", "--paravirtprovider", MODIFYVM_PARAVIRTPROVIDER, RTGETOPT_REQ_STRING), + OPT2("--paravirt-debug", "--paravirtdebug", MODIFYVM_PARAVIRTDEBUG, RTGETOPT_REQ_STRING), + OPT1("--hwvirtex", MODIFYVM_HWVIRTEX, RTGETOPT_REQ_BOOL_ONOFF), + OPT2("--nested-paging", "--nestedpaging", MODIFYVM_NESTEDPAGING, RTGETOPT_REQ_BOOL_ONOFF), + OPT2("--large-pages", "--largepages", MODIFYVM_LARGEPAGES, RTGETOPT_REQ_BOOL_ONOFF), + OPT2("--vtx-vpid", "--vtxvpid", MODIFYVM_VTXVPID, RTGETOPT_REQ_BOOL_ONOFF), + OPT2("--vtx-ux", "--vtxux", MODIFYVM_VTXUX, RTGETOPT_REQ_BOOL_ONOFF), + OPT1("--virt-vmsave-vmload", MODIFYVM_VIRT_VMSAVE_VMLOAD, RTGETOPT_REQ_BOOL_ONOFF), + OPT1("--ibpb-on-vm-exit", MODIFYVM_IBPB_ON_VM_EXIT, RTGETOPT_REQ_BOOL_ONOFF), + OPT1("--ibpb-on-vm-entry", MODIFYVM_IBPB_ON_VM_ENTRY, RTGETOPT_REQ_BOOL_ONOFF), + OPT1("--spec-ctrl", MODIFYVM_SPEC_CTRL, RTGETOPT_REQ_BOOL_ONOFF), + OPT1("--l1d-flush-on-sched", MODIFYVM_L1D_FLUSH_ON_SCHED, RTGETOPT_REQ_BOOL_ONOFF), + OPT1("--l1d-flush-on-vm-entry", MODIFYVM_L1D_FLUSH_ON_VM_ENTRY, RTGETOPT_REQ_BOOL_ONOFF), + OPT1("--mds-clear-on-sched", MODIFYVM_MDS_CLEAR_ON_SCHED, RTGETOPT_REQ_BOOL_ONOFF), + OPT1("--mds-clear-on-vm-entry", MODIFYVM_MDS_CLEAR_ON_VM_ENTRY, RTGETOPT_REQ_BOOL_ONOFF), + OPT1("--nested-hw-virt", MODIFYVM_NESTED_HW_VIRT, RTGETOPT_REQ_BOOL_ONOFF), + OPT2("--cpuid-set", "--cpuidset", MODIFYVM_SETCPUID, RTGETOPT_REQ_UINT32_OPTIONAL_PAIR | RTGETOPT_FLAG_HEX), + OPT1("--cpuid-remove", MODIFYVM_DELCPUID, RTGETOPT_REQ_UINT32_OPTIONAL_PAIR | RTGETOPT_FLAG_HEX), + OPT1("--cpuidremove", MODIFYVM_DELCPUID_OLD, RTGETOPT_REQ_UINT32 | RTGETOPT_FLAG_HEX), /* legacy - syntax differs */ + OPT2("--cpuid-remove-all", "--cpuidremoveall", MODIFYVM_DELALLCPUID, RTGETOPT_REQ_NOTHING), + OPT1("--cpus", MODIFYVM_CPUS, RTGETOPT_REQ_UINT32), + OPT2("--cpu-hotplug", "--cpuhotplug", MODIFYVM_CPUHOTPLUG, RTGETOPT_REQ_BOOL_ONOFF), + OPT1("--cpu-profile", MODIFYVM_CPU_PROFILE, RTGETOPT_REQ_STRING), + OPT2("--plug-cpu", "--plugcpu", MODIFYVM_PLUGCPU, RTGETOPT_REQ_UINT32), + OPT2("--unplug-cpu", "--unplugcpu", MODIFYVM_UNPLUGCPU, RTGETOPT_REQ_UINT32), + OPT2("--cpu-execution-cap", "--cpuexecutioncap", MODIFYVM_CPU_EXECTUION_CAP, RTGETOPT_REQ_UINT32), + OPT2("--rtc-use-utc", "--rtcuseutc", MODIFYVM_RTCUSEUTC, RTGETOPT_REQ_BOOL_ONOFF), + OPT2("--graphicscontroller", "--graphicscontroller", MODIFYVM_GRAPHICSCONTROLLER, RTGETOPT_REQ_STRING), + OPT2("--monitor-count", "--monitorcount", MODIFYVM_MONITORCOUNT, RTGETOPT_REQ_UINT32), + OPT2("--accelerate-3d", "--accelerate3d", MODIFYVM_ACCELERATE3D, RTGETOPT_REQ_BOOL_ONOFF), #ifdef VBOX_WITH_VIDEOHWACCEL - { "--accelerate2dvideo", MODIFYVM_ACCELERATE2DVIDEO, RTGETOPT_REQ_BOOL_ONOFF }, + OPT2("--accelerate-2d-video", "--accelerate2dvideo", MODIFYVM_ACCELERATE2DVIDEO, RTGETOPT_REQ_BOOL_ONOFF), #endif - { "--bioslogofadein", MODIFYVM_BIOSLOGOFADEIN, RTGETOPT_REQ_BOOL_ONOFF }, - { "--bioslogofadeout", MODIFYVM_BIOSLOGOFADEOUT, RTGETOPT_REQ_BOOL_ONOFF }, - { "--bioslogodisplaytime", MODIFYVM_BIOSLOGODISPLAYTIME, RTGETOPT_REQ_UINT32 }, - { "--bioslogoimagepath", MODIFYVM_BIOSLOGOIMAGEPATH, RTGETOPT_REQ_STRING }, - { "--biosbootmenu", MODIFYVM_BIOSBOOTMENU, RTGETOPT_REQ_STRING }, - { "--biossystemtimeoffset", MODIFYVM_BIOSSYSTEMTIMEOFFSET, RTGETOPT_REQ_INT64 }, - { "--biosapic", MODIFYVM_BIOSAPIC, RTGETOPT_REQ_STRING }, - { "--biospxedebug", MODIFYVM_BIOSPXEDEBUG, RTGETOPT_REQ_BOOL_ONOFF }, - { "--system-uuid-le", MODIFYVM_SYSTEMUUIDLE, RTGETOPT_REQ_BOOL_ONOFF }, - { "--boot", MODIFYVM_BOOT, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX }, - { "--hda", MODIFYVM_HDA, RTGETOPT_REQ_STRING }, /* deprecated */ - { "--hdb", MODIFYVM_HDB, RTGETOPT_REQ_STRING }, /* deprecated */ - { "--hdd", MODIFYVM_HDD, RTGETOPT_REQ_STRING }, /* deprecated */ - { "--idecontroller", MODIFYVM_IDECONTROLLER, RTGETOPT_REQ_STRING }, /* deprecated */ - { "--sataportcount", MODIFYVM_SATAPORTCOUNT, RTGETOPT_REQ_UINT32 }, /* deprecated */ - { "--sataport", MODIFYVM_SATAPORT, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX }, /* deprecated */ - { "--sata", MODIFYVM_SATA, RTGETOPT_REQ_STRING }, /* deprecated */ - { "--scsiport", MODIFYVM_SCSIPORT, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX }, /* deprecated */ - { "--scsitype", MODIFYVM_SCSITYPE, RTGETOPT_REQ_STRING }, /* deprecated */ - { "--scsi", MODIFYVM_SCSI, RTGETOPT_REQ_STRING }, /* deprecated */ - { "--dvdpassthrough", MODIFYVM_DVDPASSTHROUGH, RTGETOPT_REQ_STRING }, /* deprecated */ - { "--dvd", MODIFYVM_DVD, RTGETOPT_REQ_STRING }, /* deprecated */ - { "--floppy", MODIFYVM_FLOPPY, RTGETOPT_REQ_STRING }, /* deprecated */ - { "--nictracefile", MODIFYVM_NICTRACEFILE, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX }, - { "--nictrace", MODIFYVM_NICTRACE, RTGETOPT_REQ_BOOL_ONOFF | RTGETOPT_FLAG_INDEX }, - { "--nicproperty", MODIFYVM_NICPROPERTY, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX }, - { "--nictype", MODIFYVM_NICTYPE, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX }, - { "--nicspeed", MODIFYVM_NICSPEED, RTGETOPT_REQ_UINT32 | RTGETOPT_FLAG_INDEX }, - { "--nicbootprio", MODIFYVM_NICBOOTPRIO, RTGETOPT_REQ_UINT32 | RTGETOPT_FLAG_INDEX }, - { "--nicpromisc", MODIFYVM_NICPROMISC, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX }, - { "--nicbandwidthgroup", MODIFYVM_NICBWGROUP, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX }, - { "--nic", MODIFYVM_NIC, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX }, - { "--cableconnected", MODIFYVM_CABLECONNECTED, RTGETOPT_REQ_BOOL_ONOFF | RTGETOPT_FLAG_INDEX }, - { "--bridgeadapter", MODIFYVM_BRIDGEADAPTER, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX }, - { "--hostonlyadapter", MODIFYVM_HOSTONLYADAPTER, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX }, + OPT2("--bios-logo-fade-in", "--bioslogofadein", MODIFYVM_BIOSLOGOFADEIN, RTGETOPT_REQ_BOOL_ONOFF), + OPT2("--bios-logo-fade-out", "--bioslogofadeout", MODIFYVM_BIOSLOGOFADEOUT, RTGETOPT_REQ_BOOL_ONOFF), + OPT2("--bios-logo-display-time", "--bioslogodisplaytime", MODIFYVM_BIOSLOGODISPLAYTIME, RTGETOPT_REQ_UINT32), + OPT2("--bios-logo-image-path", "--bioslogoimagepath", MODIFYVM_BIOSLOGOIMAGEPATH, RTGETOPT_REQ_STRING), + OPT2("--bios-boot-menu", "--biosbootmenu", MODIFYVM_BIOSBOOTMENU, RTGETOPT_REQ_STRING), + OPT2("--bios-system-time-offset", "--biossystemtimeoffset", MODIFYVM_BIOSSYSTEMTIMEOFFSET, RTGETOPT_REQ_INT64), + OPT2("--bios-apic", "--biosapic", MODIFYVM_BIOSAPIC, RTGETOPT_REQ_STRING), + OPT2("--bios-pxe-debug", "--biospxedebug", MODIFYVM_BIOSPXEDEBUG, RTGETOPT_REQ_BOOL_ONOFF), + OPT2("--system-uuid-le", "--system-uuid-le", MODIFYVM_SYSTEMUUIDLE, RTGETOPT_REQ_BOOL_ONOFF), + OPT1("--boot", MODIFYVM_BOOT, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX), + OPT1("--hda", MODIFYVM_HDA, RTGETOPT_REQ_STRING), /* deprecated */ + OPT1("--hdb", MODIFYVM_HDB, RTGETOPT_REQ_STRING), /* deprecated */ + OPT1("--hdd", MODIFYVM_HDD, RTGETOPT_REQ_STRING), /* deprecated */ + OPT2("--idec-ontroller", "--idecontroller", MODIFYVM_IDECONTROLLER, RTGETOPT_REQ_STRING), /* deprecated */ + OPT2("--sata-port-count", "--sataportcount", MODIFYVM_SATAPORTCOUNT, RTGETOPT_REQ_UINT32), /* deprecated */ + OPT2("--sata-port", "--sataport", MODIFYVM_SATAPORT, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX), /* deprecated */ + OPT1("--sata", MODIFYVM_SATA, RTGETOPT_REQ_STRING), /* deprecated */ + OPT2("--scsi-port", "--scsiport", MODIFYVM_SCSIPORT, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX), /* deprecated */ + OPT2("--scsi-type", "--scsitype", MODIFYVM_SCSITYPE, RTGETOPT_REQ_STRING), /* deprecated */ + OPT1("--scsi", MODIFYVM_SCSI, RTGETOPT_REQ_STRING), /* deprecated */ + OPT2("--dvd-pass-through", "--dvdpassthrough", MODIFYVM_DVDPASSTHROUGH, RTGETOPT_REQ_STRING), /* deprecated */ + OPT1("--dvd", MODIFYVM_DVD, RTGETOPT_REQ_STRING), /* deprecated */ + OPT1("--floppy", MODIFYVM_FLOPPY, RTGETOPT_REQ_STRING), /* deprecated */ + OPT2("--nic-trace-file", "--nictracefile", MODIFYVM_NICTRACEFILE, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX), + OPT2("--nic-trace", "--nictrace", MODIFYVM_NICTRACE, RTGETOPT_REQ_BOOL_ONOFF | RTGETOPT_FLAG_INDEX), + OPT2("--nic-property", "--nicproperty", MODIFYVM_NICPROPERTY, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX), + OPT2("--nic-type", "--nictype", MODIFYVM_NICTYPE, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX), + OPT2("--nic-speed", "--nicspeed", MODIFYVM_NICSPEED, RTGETOPT_REQ_UINT32 | RTGETOPT_FLAG_INDEX), + OPT2("--nic-boot-prio", "--nicbootprio", MODIFYVM_NICBOOTPRIO, RTGETOPT_REQ_UINT32 | RTGETOPT_FLAG_INDEX), + OPT2("--nic-promisc", "--nicpromisc", MODIFYVM_NICPROMISC, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX), + OPT2("--nic-bandwidth-group", "--nicbandwidthgroup", MODIFYVM_NICBWGROUP, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX), + OPT1("--nic", MODIFYVM_NIC, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX), + OPT2("--cable-connected", "--cableconnected", MODIFYVM_CABLECONNECTED, RTGETOPT_REQ_BOOL_ONOFF | RTGETOPT_FLAG_INDEX), + OPT2("--bridge-adapter", "--bridgeadapter", MODIFYVM_BRIDGEADAPTER, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX), + OPT2("--host-only-adapter", "--hostonlyadapter", MODIFYVM_HOSTONLYADAPTER, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX), #ifdef VBOX_WITH_VMNET - { "--hostonlynet", MODIFYVM_HOSTONLYNET, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX }, -#endif /* VBOX_WITH_VMNET */ - { "--intnet", MODIFYVM_INTNET, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX }, - { "--nicgenericdrv", MODIFYVM_GENERICDRV, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX }, - { "--nat-network", MODIFYVM_NATNETWORKNAME, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX }, - { "--natnetwork", MODIFYVM_NATNETWORKNAME, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX }, /* deprecated */ - { "--natnet", MODIFYVM_NATNET, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX }, - { "--natbindip", MODIFYVM_NATBINDIP, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX }, - { "--natsettings", MODIFYVM_NATSETTINGS, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX }, - { "--natpf", MODIFYVM_NATPF, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX }, - { "--nataliasmode", MODIFYVM_NATALIASMODE, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX }, - { "--nattftpprefix", MODIFYVM_NATTFTPPREFIX, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX }, - { "--nattftpfile", MODIFYVM_NATTFTPFILE, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX }, - { "--nattftpserver", MODIFYVM_NATTFTPSERVER, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX }, - { "--natdnspassdomain", MODIFYVM_NATDNSPASSDOMAIN, RTGETOPT_REQ_BOOL_ONOFF | RTGETOPT_FLAG_INDEX }, - { "--natdnsproxy", MODIFYVM_NATDNSPROXY, RTGETOPT_REQ_BOOL_ONOFF | RTGETOPT_FLAG_INDEX }, - { "--natdnshostresolver", MODIFYVM_NATDNSHOSTRESOLVER, RTGETOPT_REQ_BOOL_ONOFF | RTGETOPT_FLAG_INDEX }, - { "--natlocalhostreachable", MODIFYVM_NATLOCALHOSTREACHABLE, RTGETOPT_REQ_BOOL_ONOFF | RTGETOPT_FLAG_INDEX }, - { "--macaddress", MODIFYVM_MACADDRESS, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX }, - { "--mouse", MODIFYVM_HIDPTR, RTGETOPT_REQ_STRING }, - { "--keyboard", MODIFYVM_HIDKBD, RTGETOPT_REQ_STRING }, - { "--uartmode", MODIFYVM_UARTMODE, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX }, - { "--uarttype", MODIFYVM_UARTTYPE, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX }, - { "--uart", MODIFYVM_UART, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX }, + OPT2("--host-only-net", "--hostonlynet", MODIFYVM_HOSTONLYNET, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX), +#endif + OPT1("--intnet", MODIFYVM_INTNET, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX), + OPT2("--nic-generic-drv", "--nicgenericdrv", MODIFYVM_GENERICDRV, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX), + OPT2("--nat-network", "--natnetwork", MODIFYVM_NATNETWORKNAME, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX), + OPT2("--nat-net", "--natnet", MODIFYVM_NATNET, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX), + OPT2("--nat-bind-ip", "--natbindip", MODIFYVM_NATBINDIP, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX), + OPT2("--nat-settings", "--natsettings", MODIFYVM_NATSETTINGS, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX), + OPT2("--nat-pf", "--natpf", MODIFYVM_NATPF, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX), + OPT2("--nat-alias-mode", "--nataliasmode", MODIFYVM_NATALIASMODE, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX), + OPT2("--nat-tftp-prefix", "--nattftpprefix", MODIFYVM_NATTFTPPREFIX, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX), + OPT2("--nat-tftp-file", "--nattftpfile", MODIFYVM_NATTFTPFILE, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX), + OPT2("--nat-tftp-server", "--nattftpserver", MODIFYVM_NATTFTPSERVER, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX), + OPT2("--nat-dns-pass-domain", "--natdnspassdomain", MODIFYVM_NATDNSPASSDOMAIN, RTGETOPT_REQ_BOOL_ONOFF | RTGETOPT_FLAG_INDEX), + OPT2("--nat-dns-proxy", "--natdnsproxy", MODIFYVM_NATDNSPROXY, RTGETOPT_REQ_BOOL_ONOFF | RTGETOPT_FLAG_INDEX), + OPT2("--nat-dns-host-resolver", "--natdnshostresolver", MODIFYVM_NATDNSHOSTRESOLVER, RTGETOPT_REQ_BOOL_ONOFF | RTGETOPT_FLAG_INDEX), + OPT2("--nat-localhostreachable", "--natlocalhostreachable", MODIFYVM_NATLOCALHOSTREACHABLE, RTGETOPT_REQ_BOOL_ONOFF | RTGETOPT_FLAG_INDEX), + OPT2("--mac-address", "--macaddress", MODIFYVM_MACADDRESS, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX), + OPT1("--mouse", MODIFYVM_HIDPTR, RTGETOPT_REQ_STRING), + OPT1("--keyboard", MODIFYVM_HIDKBD, RTGETOPT_REQ_STRING), + OPT2("--uart-mode", "--uartmode", MODIFYVM_UARTMODE, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX), + OPT2("--uart-type", "--uarttype", MODIFYVM_UARTTYPE, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX), + OPT1("--uart", MODIFYVM_UART, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX), #if defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS) - { "--lptmode", MODIFYVM_LPTMODE, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX }, - { "--lpt", MODIFYVM_LPT, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX }, + OPT2("--lpt-mode", "--lptmode", MODIFYVM_LPTMODE, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX), + OPT1("--lpt", MODIFYVM_LPT, RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX), #endif - { "--guestmemoryballoon", MODIFYVM_GUESTMEMORYBALLOON, RTGETOPT_REQ_UINT32 }, - { "--audiocontroller", MODIFYVM_AUDIOCONTROLLER, RTGETOPT_REQ_STRING }, - { "--audiocodec", MODIFYVM_AUDIOCODEC, RTGETOPT_REQ_STRING }, - { "--audio", MODIFYVM_AUDIO, RTGETOPT_REQ_STRING }, - { "--audioin", MODIFYVM_AUDIOIN, RTGETOPT_REQ_BOOL_ONOFF }, - { "--audioout", MODIFYVM_AUDIOOUT, RTGETOPT_REQ_BOOL_ONOFF }, + OPT2("--guest-memory-balloon", "--guestmemoryballoon", MODIFYVM_GUESTMEMORYBALLOON, RTGETOPT_REQ_UINT32), + OPT2("--audio-controller", "--audiocontroller", MODIFYVM_AUDIOCONTROLLER, RTGETOPT_REQ_STRING), + OPT2("--audio-codec", "--audiocodec", MODIFYVM_AUDIOCODEC, RTGETOPT_REQ_STRING), + OPT1("--audio", MODIFYVM_AUDIO, RTGETOPT_REQ_STRING), + OPT2("--audio-in", "--audioin", MODIFYVM_AUDIOIN, RTGETOPT_REQ_BOOL_ONOFF), + OPT2("--audio-out", "--audioout", MODIFYVM_AUDIOOUT, RTGETOPT_REQ_BOOL_ONOFF), #ifdef VBOX_WITH_SHARED_CLIPBOARD - { "--clipboard-mode", MODIFYVM_CLIPBOARD_MODE, RTGETOPT_REQ_STRING }, - { "--clipboard", MODIFYVM_CLIPBOARD_MODE, RTGETOPT_REQ_STRING }, /* deprecated */ + OPT1("--clipboard-mode", MODIFYVM_CLIPBOARD_MODE, RTGETOPT_REQ_STRING), + OPT1("--clipboard", MODIFYVM_CLIPBOARD_MODE, RTGETOPT_REQ_STRING), /* deprecated */ # ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS - { "--clipboard-file-transfers", MODIFYVM_CLIPBOARD_FILE_TRANSFERS, RTGETOPT_REQ_STRING }, + OPT1("--clipboard-file-transfers", MODIFYVM_CLIPBOARD_FILE_TRANSFERS, RTGETOPT_REQ_STRING), # endif #endif - { "--draganddrop", MODIFYVM_DRAGANDDROP, RTGETOPT_REQ_STRING }, - { "--vrdpport", MODIFYVM_VRDPPORT, RTGETOPT_REQ_STRING }, /* deprecated */ - { "--vrdpaddress", MODIFYVM_VRDPADDRESS, RTGETOPT_REQ_STRING }, /* deprecated */ - { "--vrdpauthtype", MODIFYVM_VRDPAUTHTYPE, RTGETOPT_REQ_STRING }, /* deprecated */ - { "--vrdpmulticon", MODIFYVM_VRDPMULTICON, RTGETOPT_REQ_BOOL_ONOFF }, /* deprecated */ - { "--vrdpreusecon", MODIFYVM_VRDPREUSECON, RTGETOPT_REQ_BOOL_ONOFF }, /* deprecated */ - { "--vrdpvideochannel", MODIFYVM_VRDPVIDEOCHANNEL, RTGETOPT_REQ_BOOL_ONOFF }, /* deprecated */ - { "--vrdpvideochannelquality", MODIFYVM_VRDPVIDEOCHANNELQUALITY, RTGETOPT_REQ_STRING }, /* deprecated */ - { "--vrdp", MODIFYVM_VRDP, RTGETOPT_REQ_BOOL_ONOFF }, /* deprecated */ - { "--vrdeproperty", MODIFYVM_VRDEPROPERTY, RTGETOPT_REQ_STRING }, - { "--vrdeport", MODIFYVM_VRDEPORT, RTGETOPT_REQ_STRING }, - { "--vrdeaddress", MODIFYVM_VRDEADDRESS, RTGETOPT_REQ_STRING }, - { "--vrdeauthtype", MODIFYVM_VRDEAUTHTYPE, RTGETOPT_REQ_STRING }, - { "--vrdeauthlibrary", MODIFYVM_VRDEAUTHLIBRARY, RTGETOPT_REQ_STRING }, - { "--vrdemulticon", MODIFYVM_VRDEMULTICON, RTGETOPT_REQ_BOOL_ONOFF }, - { "--vrdereusecon", MODIFYVM_VRDEREUSECON, RTGETOPT_REQ_BOOL_ONOFF }, - { "--vrdevideochannel", MODIFYVM_VRDEVIDEOCHANNEL, RTGETOPT_REQ_BOOL_ONOFF }, - { "--vrdevideochannelquality", MODIFYVM_VRDEVIDEOCHANNELQUALITY, RTGETOPT_REQ_STRING }, - { "--vrdeextpack", MODIFYVM_VRDE_EXTPACK, RTGETOPT_REQ_STRING }, - { "--vrde", MODIFYVM_VRDE, RTGETOPT_REQ_BOOL_ONOFF }, - { "--usbrename", MODIFYVM_USBRENAME, RTGETOPT_REQ_STRING }, - { "--usbxhci", MODIFYVM_USBXHCI, RTGETOPT_REQ_BOOL_ONOFF }, - { "--usbehci", MODIFYVM_USBEHCI, RTGETOPT_REQ_BOOL_ONOFF }, - { "--usbohci", MODIFYVM_USBOHCI, RTGETOPT_REQ_BOOL_ONOFF }, - { "--usb", MODIFYVM_USBOHCI, RTGETOPT_REQ_BOOL_ONOFF }, /* deprecated */ - { "--snapshotfolder", MODIFYVM_SNAPSHOTFOLDER, RTGETOPT_REQ_STRING }, - { "--teleporter", MODIFYVM_TELEPORTER_ENABLED, RTGETOPT_REQ_BOOL_ONOFF }, - { "--teleporterenabled", MODIFYVM_TELEPORTER_ENABLED, RTGETOPT_REQ_BOOL_ONOFF }, /* deprecated */ - { "--teleporterport", MODIFYVM_TELEPORTER_PORT, RTGETOPT_REQ_UINT32 }, - { "--teleporteraddress", MODIFYVM_TELEPORTER_ADDRESS, RTGETOPT_REQ_STRING }, - { "--teleporterpassword", MODIFYVM_TELEPORTER_PASSWORD, RTGETOPT_REQ_STRING }, - { "--teleporterpasswordfile", MODIFYVM_TELEPORTER_PASSWORD_FILE, RTGETOPT_REQ_STRING }, - { "--tracing-enabled", MODIFYVM_TRACING_ENABLED, RTGETOPT_REQ_BOOL_ONOFF }, - { "--tracing-config", MODIFYVM_TRACING_CONFIG, RTGETOPT_REQ_STRING }, - { "--tracing-allow-vm-access", MODIFYVM_TRACING_ALLOW_VM_ACCESS, RTGETOPT_REQ_BOOL_ONOFF }, - { "--hardwareuuid", MODIFYVM_HARDWARE_UUID, RTGETOPT_REQ_STRING }, - { "--hpet", MODIFYVM_HPET, RTGETOPT_REQ_BOOL_ONOFF }, - { "--iocache", MODIFYVM_IOCACHE, RTGETOPT_REQ_BOOL_ONOFF }, - { "--iocachesize", MODIFYVM_IOCACHESIZE, RTGETOPT_REQ_UINT32 }, - { "--chipset", MODIFYVM_CHIPSET, RTGETOPT_REQ_STRING }, + OPT2("--drag-and-drop", "--draganddrop", MODIFYVM_DRAGANDDROP, RTGETOPT_REQ_STRING), + OPT2("--vrdp-port", "--vrdpport", MODIFYVM_VRDPPORT, RTGETOPT_REQ_STRING), /* deprecated */ + OPT2("--vrdp-address", "--vrdpaddress", MODIFYVM_VRDPADDRESS, RTGETOPT_REQ_STRING), /* deprecated */ + OPT2("--vrdp-auth-type", "--vrdpauthtype", MODIFYVM_VRDPAUTHTYPE, RTGETOPT_REQ_STRING), /* deprecated */ + OPT2("--vrdp-multi-con", "--vrdpmulticon", MODIFYVM_VRDPMULTICON, RTGETOPT_REQ_BOOL_ONOFF), /* deprecated */ + OPT2("--vrdp-reuse-con", "--vrdpreusecon", MODIFYVM_VRDPREUSECON, RTGETOPT_REQ_BOOL_ONOFF), /* deprecated */ + OPT2("--vrdp-video-channel", "--vrdpvideochannel", MODIFYVM_VRDPVIDEOCHANNEL, RTGETOPT_REQ_BOOL_ONOFF), /* deprecated */ + OPT2("--vrdp-video-channel-quality", "--vrdpvideochannelquality",MODIFYVM_VRDPVIDEOCHANNELQUALITY, RTGETOPT_REQ_STRING), /* deprecated */ + OPT1("--vrdp", MODIFYVM_VRDP, RTGETOPT_REQ_BOOL_ONOFF), /* deprecated */ + OPT2("--vrde-property", "--vrdeproperty", MODIFYVM_VRDEPROPERTY, RTGETOPT_REQ_STRING), + OPT2("--vrde-port", "--vrdeport", MODIFYVM_VRDEPORT, RTGETOPT_REQ_STRING), + OPT2("--vrde-address", "--vrdeaddress", MODIFYVM_VRDEADDRESS, RTGETOPT_REQ_STRING), + OPT2("--vrde-auth-type", "--vrdeauthtype", MODIFYVM_VRDEAUTHTYPE, RTGETOPT_REQ_STRING), + OPT2("--vrde-auth-library", "--vrdeauthlibrary", MODIFYVM_VRDEAUTHLIBRARY, RTGETOPT_REQ_STRING), + OPT2("--vrde-multi-con", "--vrdemulticon", MODIFYVM_VRDEMULTICON, RTGETOPT_REQ_BOOL_ONOFF), + OPT2("--vrde-reuse-con", "--vrdereusecon", MODIFYVM_VRDEREUSECON, RTGETOPT_REQ_BOOL_ONOFF), + OPT2("--vrde-video-channel", "--vrdevideochannel", MODIFYVM_VRDEVIDEOCHANNEL, RTGETOPT_REQ_BOOL_ONOFF), + OPT2("--vrde-video-channel-quality", "--vrdevideochannelquality",MODIFYVM_VRDEVIDEOCHANNELQUALITY, RTGETOPT_REQ_STRING), + OPT2("--vrde-extpack", "--vrdeextpack", MODIFYVM_VRDE_EXTPACK, RTGETOPT_REQ_STRING), + OPT1("--vrde", MODIFYVM_VRDE, RTGETOPT_REQ_BOOL_ONOFF), + OPT2("--usb-rename", "--usbrename", MODIFYVM_USBRENAME, RTGETOPT_REQ_STRING), + OPT2("--usb-xhci", "--usbxhci", MODIFYVM_USBXHCI, RTGETOPT_REQ_BOOL_ONOFF), + OPT2("--usb-ehci", "--usbehci", MODIFYVM_USBEHCI, RTGETOPT_REQ_BOOL_ONOFF), + OPT2("--usb-ohci", "--usbohci", MODIFYVM_USBOHCI, RTGETOPT_REQ_BOOL_ONOFF), + OPT1("--usb", MODIFYVM_USBOHCI, RTGETOPT_REQ_BOOL_ONOFF), /* deprecated */ + OPT2("--snapshot-folder", "--snapshotfolder", MODIFYVM_SNAPSHOTFOLDER, RTGETOPT_REQ_STRING), + OPT1("--teleporter", MODIFYVM_TELEPORTER_ENABLED, RTGETOPT_REQ_BOOL_ONOFF), + OPT2("--teleporter-enabled", "--teleporterenabled", MODIFYVM_TELEPORTER_ENABLED, RTGETOPT_REQ_BOOL_ONOFF), /* deprecated */ + OPT2("--teleporter-port", "--teleporterport", MODIFYVM_TELEPORTER_PORT, RTGETOPT_REQ_UINT32), + OPT2("--teleporter-address", "--teleporteraddress", MODIFYVM_TELEPORTER_ADDRESS, RTGETOPT_REQ_STRING), + OPT2("--teleporter-password", "--teleporterpassword", MODIFYVM_TELEPORTER_PASSWORD, RTGETOPT_REQ_STRING), + OPT2("--teleporter-password-file", "--teleporterpasswordfile", MODIFYVM_TELEPORTER_PASSWORD_FILE, RTGETOPT_REQ_STRING), + OPT1("--tracing-enabled", MODIFYVM_TRACING_ENABLED, RTGETOPT_REQ_BOOL_ONOFF), + OPT1("--tracing-config", MODIFYVM_TRACING_CONFIG, RTGETOPT_REQ_STRING), + OPT1("--tracing-allow-vm-access", MODIFYVM_TRACING_ALLOW_VM_ACCESS, RTGETOPT_REQ_BOOL_ONOFF), + OPT2("--hardware-uuid", "--hardwareuuid", MODIFYVM_HARDWARE_UUID, RTGETOPT_REQ_STRING), + OPT1("--hpet", MODIFYVM_HPET, RTGETOPT_REQ_BOOL_ONOFF), + OPT1("--iocache", MODIFYVM_IOCACHE, RTGETOPT_REQ_BOOL_ONOFF), + OPT2("--iocache-size", "--iocachesize", MODIFYVM_IOCACHESIZE, RTGETOPT_REQ_UINT32), + OPT1("--chipset", MODIFYVM_CHIPSET, RTGETOPT_REQ_STRING), #if defined(VBOX_WITH_IOMMU_AMD) || defined(VBOX_WITH_IOMMU_INTEL) - { "--iommu", MODIFYVM_IOMMU, RTGETOPT_REQ_STRING }, + OPT1("--iommu", MODIFYVM_IOMMU, RTGETOPT_REQ_STRING), #endif #if defined(VBOX_WITH_TPM) - { "--tpm-type", MODIFYVM_TPM_TYPE, RTGETOPT_REQ_STRING }, - { "--tpm-location", MODIFYVM_TPM_LOCATION, RTGETOPT_REQ_STRING }, + OPT1("--tpm-type", MODIFYVM_TPM_TYPE, RTGETOPT_REQ_STRING), + OPT1("--tpm-location", MODIFYVM_TPM_LOCATION, RTGETOPT_REQ_STRING), #endif #ifdef VBOX_WITH_RECORDING - { "--recording", MODIFYVM_RECORDING, RTGETOPT_REQ_BOOL_ONOFF }, - { "--recordingscreens", MODIFYVM_RECORDING_SCREENS, RTGETOPT_REQ_STRING }, - { "--recordingfile", MODIFYVM_RECORDING_FILENAME, RTGETOPT_REQ_STRING }, - { "--recordingmaxtime", MODIFYVM_RECORDING_MAXTIME, RTGETOPT_REQ_INT32 }, - { "--recordingmaxsize", MODIFYVM_RECORDING_MAXSIZE, RTGETOPT_REQ_INT32 }, - { "--recordingopts", MODIFYVM_RECORDING_OPTIONS, RTGETOPT_REQ_STRING }, - { "--recordingoptions", MODIFYVM_RECORDING_OPTIONS, RTGETOPT_REQ_STRING }, - { "--recordingvideores", MODIFYVM_RECORDING_VIDEO_RES, RTGETOPT_REQ_STRING }, - { "--recordingvideoresolution", MODIFYVM_RECORDING_VIDEO_RES, RTGETOPT_REQ_STRING }, - { "--recordingvideorate", MODIFYVM_RECORDING_VIDEO_RATE, RTGETOPT_REQ_UINT32 }, - { "--recordingvideofps", MODIFYVM_RECORDING_VIDEO_FPS, RTGETOPT_REQ_UINT32 }, + OPT1("--recording", MODIFYVM_RECORDING, RTGETOPT_REQ_BOOL_ONOFF), + OPT2("--recording-screens", "--recordingscreens", MODIFYVM_RECORDING_SCREENS, RTGETOPT_REQ_STRING), + OPT2("--recording-file", "--recordingfile", MODIFYVM_RECORDING_FILENAME, RTGETOPT_REQ_STRING), + OPT2("--recording-max-time", "--recordingmaxtime", MODIFYVM_RECORDING_MAXTIME, RTGETOPT_REQ_INT32), + OPT2("--recording-max-size", "--recordingmaxsize", MODIFYVM_RECORDING_MAXSIZE, RTGETOPT_REQ_INT32), + OPT2("--recording-opts", "--recordingopts", MODIFYVM_RECORDING_OPTIONS, RTGETOPT_REQ_STRING), + OPT2("--recording-options", "--recordingoptions", MODIFYVM_RECORDING_OPTIONS, RTGETOPT_REQ_STRING), + OPT2("--recording-video-res", "--recordingvideores", MODIFYVM_RECORDING_VIDEO_RES, RTGETOPT_REQ_STRING), + OPT2("--recording-video-resolution", "--recordingvideoresolution",MODIFYVM_RECORDING_VIDEO_RES, RTGETOPT_REQ_STRING), + OPT2("--recording-video-rate", "--recordingvideorate", MODIFYVM_RECORDING_VIDEO_RATE, RTGETOPT_REQ_UINT32), + OPT2("--recording-video-fps", "--recordingvideofps", MODIFYVM_RECORDING_VIDEO_FPS, RTGETOPT_REQ_UINT32), #endif - { "--autostart-enabled", MODIFYVM_AUTOSTART_ENABLED, RTGETOPT_REQ_BOOL_ONOFF }, - { "--autostart-delay", MODIFYVM_AUTOSTART_DELAY, RTGETOPT_REQ_UINT32 }, - { "--autostop-type", MODIFYVM_AUTOSTOP_TYPE, RTGETOPT_REQ_STRING }, + OPT1("--autostart-enabled", MODIFYVM_AUTOSTART_ENABLED, RTGETOPT_REQ_BOOL_ONOFF), + OPT1("--autostart-delay", MODIFYVM_AUTOSTART_DELAY, RTGETOPT_REQ_UINT32), + OPT1("--autostop-type", MODIFYVM_AUTOSTOP_TYPE, RTGETOPT_REQ_STRING), #ifdef VBOX_WITH_PCI_PASSTHROUGH - { "--pciattach", MODIFYVM_ATTACH_PCI, RTGETOPT_REQ_STRING }, - { "--pcidetach", MODIFYVM_DETACH_PCI, RTGETOPT_REQ_STRING }, + OPT2("--pci-attach", "--pciattach", MODIFYVM_ATTACH_PCI, RTGETOPT_REQ_STRING), + OPT2("--pci-detach", "--pcidetach", MODIFYVM_DETACH_PCI, RTGETOPT_REQ_STRING), #endif #ifdef VBOX_WITH_USB_CARDREADER - { "--usbcardreader", MODIFYVM_USBCARDREADER, RTGETOPT_REQ_BOOL_ONOFF }, + OPT2("--usb-card-reader", "--usbcardreader", MODIFYVM_USBCARDREADER, RTGETOPT_REQ_BOOL_ONOFF), #endif - { "--defaultfrontend", MODIFYVM_DEFAULTFRONTEND, RTGETOPT_REQ_STRING }, - { "--vm-process-priority", MODIFYVM_VMPROC_PRIORITY, RTGETOPT_REQ_STRING }, + OPT2("--default-frontend", "--defaultfrontend", MODIFYVM_DEFAULTFRONTEND, RTGETOPT_REQ_STRING), + OPT1("--vm-process-priority", MODIFYVM_VMPROC_PRIORITY, RTGETOPT_REQ_STRING), }; @@ -793,5 +787,4 @@ case MODIFYVM_SETCPUID: - case MODIFYVM_SETCPUID_OLD: { uint32_t const idx = c == MODIFYVM_SETCPUID ? ValueUnion.PairU32.uFirst : ValueUnion.u32;