Changeset 92534 in vbox

Timestamp:

Nov 21, 2021 5:32:22 PM (3 years ago)

Author:

vboxsync

Message:

VBoxManage: Dashified the modifyvm options, the leaving the wordsoup options for legacy reasons of course.

Location:

trunk

Files:

• doc/manual/en_US/man_VBoxManage-controlvm.xml (modified) (4 diffs)
• doc/manual/en_US/man_VBoxManage-dhcpserver.xml (modified) (1 diff)
• doc/manual/en_US/man_VBoxManage-modifyvm.xml (modified) (137 diffs)
• doc/manual/en_US/user_AdvancedTopics.xml (modified) (5 diffs)
• doc/manual/en_US/user_BasicConcepts.xml (modified) (2 diffs)
• doc/manual/en_US/user_Frontends.xml (modified) (12 diffs)
• doc/manual/en_US/user_GuestAdditions.xml (modified) (3 diffs)
• doc/manual/en_US/user_Networking.xml (modified) (5 diffs)
• doc/manual/en_US/user_Technical.xml (modified) (2 diffs)
• doc/manual/en_US/user_VBoxManage.xml (modified) (3 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManage.h (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (3 diffs)

trunk/doc/manual/en_US/man_VBoxManage-controlvm.xml

@@ -972 +972 @@
         runtime to specify the name of the file in which to log the
         trace. Otherwise, use the <command>VBoxManage modifyvm
-        --nictracefile<replaceable>N</replaceable>=<replaceable>filename</replaceable></command>
+        --nic-trace-file<replaceable>N</replaceable>=<replaceable>filename</replaceable></command>
         command to specify the name of the file.
       </para>
@@ -1300 +1300 @@
       </para>
       <para>
-        Also see the <option>--vrdeport</option> option description in
+        Also see the <option>--vrde-port</option> option description in
         <xref linkend="vboxmanage-modifyvm" />.
       </para>
@@ -1326 +1326 @@
             is the standard RDP port, <literal>3389</literal>.
           </para><para>
-            Also see the <option>--vrdeport</option> option description
+            Also see the <option>--vrde-port</option> option description
             in <xref linkend="vboxmanage-modifyvm" />.
           </para></listitem>
@@ -1335 +1335 @@
             specified host network interface.
           </para><para>
-            Also see the <option>--vrdeaddress</option> option
+            Also see the <option>--vrde-address</option> option
             description in <xref linkend="vboxmanage-modifyvm" />.
           </para></listitem>

trunk/doc/manual/en_US/man_VBoxManage-dhcpserver.xml

@@ -276 +276 @@
           <term>--interface=<replaceable>ifname</replaceable></term>
           <listitem><para>The host only interface name.  This would be same value
-            as you would use for the <command>VBoxManage modifyvm --hostonlyadapter</command>
+            as you would use for the <command>VBoxManage modifyvm --host-only-adapter</command>
             option when configuring a VM to use a host-only network.  The value
             can also be found in the Name row in <command>VBoxManage list hostonlyifs</command>.

trunk/doc/manual/en_US/man_VBoxManage-modifyvm.xml

@@ -46 +46 @@
       <arg>--groups= <arg choice="plain"><replaceable>group</replaceable> [,<replaceable>group</replaceable>...]</arg></arg>
       <arg>--description=<replaceable>description</replaceable></arg>
-      <arg>--ostype=<replaceable>OS-type</replaceable></arg>
-      <arg>--iconfile=<replaceable>filename</replaceable></arg>
+      <arg>--os-type=<replaceable>OS-type</replaceable></arg>
+      <arg>--icon-file=<replaceable>filename</replaceable></arg>
       <arg>--memory=<replaceable>size-in-MB</replaceable></arg>
-      <arg>--pagefusion=<group choice="plain">
+      <arg>--page-fusion=<group choice="plain">
           <arg choice="plain">on</arg>
           <arg choice="plain">off</arg>
@@ -62 +62 @@
           <arg choice="plain">off</arg>
         </group></arg>
-      <arg>--hardwareuuid=<replaceable>UUID</replaceable></arg>
+      <arg>--hardware-uuid=<replaceable>UUID</replaceable></arg>
       <arg>--cpus=<replaceable>CPU-count</replaceable></arg>
-      <arg>--cpuhotplug=<group choice="plain">
-          <arg choice="plain">on</arg>
-          <arg choice="plain">off</arg>
-        </group></arg>
-      <arg>--plugcpu=<replaceable>CPU-ID</replaceable></arg>
-      <arg>--unplugcpu=<replaceable>CPU-ID</replaceable></arg>
-      <arg>--cpuexecutioncap=<replaceable>number</replaceable></arg>
+      <arg>--cpu-hotplug=<group choice="plain">
+          <arg choice="plain">on</arg>
+          <arg choice="plain">off</arg>
+        </group></arg>
+      <arg>--plug-cpu=<replaceable>CPU-ID</replaceable></arg>
+      <arg>--unplug-cpu=<replaceable>CPU-ID</replaceable></arg>
+      <arg>--cpu-execution-cap=<replaceable>number</replaceable></arg>
       <arg>--pae=<group choice="plain">
           <arg choice="plain">on</arg>
           <arg choice="plain">off</arg>
         </group></arg>
-      <arg>--longmode=<group choice="plain">
+      <arg>--long-mode=<group choice="plain">
           <arg choice="plain">on</arg>
           <arg choice="plain">off</arg>
@@ -121 +121 @@
           <arg choice="plain">off</arg>
         </group></arg>
-      <arg>--triplefaultreset=<group choice="plain">
+      <arg>--triple-fault-reset=<group choice="plain">
           <arg choice="plain">on</arg>
           <arg choice="plain">off</arg>
@@ -133 +133 @@
           <arg choice="plain">off</arg>
         </group></arg>
-      <arg>--paravirtprovider=<group choice="plain">
+      <arg>--paravirt-provider=<group choice="plain">
           <arg choice="plain">none</arg>
           <arg choice="plain">default</arg>
@@ -141 +141 @@
           <arg choice="plain">kvm</arg>
         </group></arg>
-      <arg>--paravirtdebug= <arg choice="plain"><replaceable>key</replaceable>=<replaceable>value</replaceable> [,<replaceable>key</replaceable>=<replaceable>value</replaceable>...]</arg></arg>
-      <arg>--nestedpaging=<group choice="plain">
-          <arg choice="plain">on</arg>
-          <arg choice="plain">off</arg>
-        </group></arg>
-      <arg>--largepages=<group choice="plain">
-          <arg choice="plain">on</arg>
-          <arg choice="plain">off</arg>
-        </group></arg>
-      <arg>--vtxvpid=<group choice="plain">
-          <arg choice="plain">on</arg>
-          <arg choice="plain">off</arg>
-        </group></arg>
-      <arg>--vtxux=<group choice="plain">
+      <arg>--paravirt-debug= <arg choice="plain"><replaceable>key</replaceable>=<replaceable>value</replaceable> [,<replaceable>key</replaceable>=<replaceable>value</replaceable>...]</arg></arg>
+      <arg>--nested-paging=<group choice="plain">
+          <arg choice="plain">on</arg>
+          <arg choice="plain">off</arg>
+        </group></arg>
+      <arg>--large-pages=<group choice="plain">
+          <arg choice="plain">on</arg>
+          <arg choice="plain">off</arg>
+        </group></arg>
+      <arg>--vtx-vpid=<group choice="plain">
+          <arg choice="plain">on</arg>
+          <arg choice="plain">off</arg>
+        </group></arg>
+      <arg>--vtx-ux=<group choice="plain">
           <arg choice="plain">on</arg>
           <arg choice="plain">off</arg>
@@ -166 +166 @@
           <arg choice="plain">off</arg>
         </group></arg>
-      <arg>--accelerate3d=<group choice="plain">
-          <arg choice="plain">on</arg>
-          <arg choice="plain">off</arg>
-        </group></arg>
-      <arg>--accelerate2dvideo=<group choice="plain">
+      <arg>--accelerate-3d=<group choice="plain">
+          <arg choice="plain">on</arg>
+          <arg choice="plain">off</arg>
+        </group></arg>
+      <arg>--accelerate-2d-video=<group choice="plain">
           <arg choice="plain">on</arg>
           <arg choice="plain">off</arg>
@@ -194 +194 @@
           <arg choice="plain"><replaceable>location</replaceable></arg>
         </group></arg>
-      <arg>--bioslogofadein=<group choice="plain">
-          <arg choice="plain">on</arg>
-          <arg choice="plain">off</arg>
-        </group></arg>
-      <arg>--bioslogofadeout=<group choice="plain">
-          <arg choice="plain">on</arg>
-          <arg choice="plain">off</arg>
-        </group></arg>
-      <arg>--bioslogodisplaytime=<replaceable>msec</replaceable></arg>
-      <arg>--bioslogoimagepath=<replaceable>pathname</replaceable></arg>
-      <arg>--biosbootmenu=<group choice="plain">
+      <arg>--bios-logo-fade-in=<group choice="plain">
+          <arg choice="plain">on</arg>
+          <arg choice="plain">off</arg>
+        </group></arg>
+      <arg>--bios-logo-fade-out=<group choice="plain">
+          <arg choice="plain">on</arg>
+          <arg choice="plain">off</arg>
+        </group></arg>
+      <arg>--bios-logo-display-time=<replaceable>msec</replaceable></arg>
+      <arg>--bios-logo-image-path=<replaceable>pathname</replaceable></arg>
+      <arg>--bios-boot-menu=<group choice="plain">
           <arg choice="plain">disabled</arg>
           <arg choice="plain">menuonly</arg>
           <arg choice="plain">messageandmenu</arg>
         </group></arg>
-      <arg>--biosapic=<group choice="plain">
+      <arg>--bios-apic=<group choice="plain">
           <arg choice="plain">disabled</arg>
           <arg choice="plain">apic</arg>
           <arg choice="plain">x2apic</arg>
         </group></arg>
-      <arg>--biossystemtimeoffset=<replaceable>msec</replaceable></arg>
-      <arg>--biospxedebug=<group choice="plain">
+      <arg>--bios-system-time-offset=<replaceable>msec</replaceable></arg>
+      <arg>--bios-pxe-debug=<group choice="plain">
           <arg choice="plain">on</arg>
           <arg choice="plain">off</arg>
@@ -230 +230 @@
           <arg choice="plain">net</arg>
         </group></arg>
-      <arg>--rtcuseutc=<group choice="plain">
+      <arg>--rtc-use-utc=<group choice="plain">
           <arg choice="plain">on</arg>
           <arg choice="plain">off</arg>
@@ -240 +240 @@
           <arg choice="plain">vboxsvga</arg>
         </group></arg>
-      <arg>--snapshotfolder=<group choice="plain">
+      <arg>--snapshot-folder=<group choice="plain">
           <arg choice="plain">default</arg>
           <arg choice="plain"><replaceable>pathname</replaceable></arg>
@@ -250 +250 @@
           <arg choice="plain">efi64</arg>
         </group></arg>
-      <arg>--guestmemoryballoon=<replaceable>size-in-MB</replaceable></arg>
-      <arg>--defaultfrontend=<group choice="plain">
+      <arg>--guest-memory-balloon=<replaceable>size-in-MB</replaceable></arg>
+      <arg>--default-frontend=<group choice="plain">
           <arg choice="plain">default</arg>
           <arg choice="plain"><replaceable>name</replaceable></arg>
@@ -284 +284 @@
           <arg choice="plain">natnetwork</arg>
         </group></arg>
-      <arg>--nictype<replaceable>N</replaceable>=<group choice="plain">
+      <arg>--nic-type<replaceable>N</replaceable>=<group choice="plain">
           <arg choice="plain">Am79C970A</arg>
           <arg choice="plain">Am79C973</arg>
@@ -292 +292 @@
           <arg choice="plain">virtio</arg>
         </group></arg>
-      <arg>--cableconnected<replaceable>N</replaceable>=<group choice="plain">
-          <arg choice="plain">on</arg>
-          <arg choice="plain">off</arg>
-        </group></arg>
-      <arg>--nictrace<replaceable>N</replaceable>=<group choice="plain">
-          <arg choice="plain">on</arg>
-          <arg choice="plain">off</arg>
-        </group></arg>
-      <arg>--nictracefile<replaceable>N</replaceable>=<replaceable>filename</replaceable></arg>
-      <arg>--nicproperty<replaceable>N</replaceable>=<replaceable>name</replaceable>= <arg><replaceable>value</replaceable></arg></arg>
-      <arg>--nicspeed<replaceable>N</replaceable>=<replaceable>kbps</replaceable></arg>
-      <arg>--nicbootprio<replaceable>N</replaceable>=<replaceable>priority</replaceable></arg>
-      <arg>--nicpromisc<replaceable>N</replaceable>=<group choice="plain">
+      <arg>--cable-connected<replaceable>N</replaceable>=<group choice="plain">
+          <arg choice="plain">on</arg>
+          <arg choice="plain">off</arg>
+        </group></arg>
+      <arg>--nic-trace<replaceable>N</replaceable>=<group choice="plain">
+          <arg choice="plain">on</arg>
+          <arg choice="plain">off</arg>
+        </group></arg>
+      <arg>--nic-trace-file<replaceable>N</replaceable>=<replaceable>filename</replaceable></arg>
+      <arg>--nic-property<replaceable>N</replaceable>=<replaceable>name</replaceable>= <arg><replaceable>value</replaceable></arg></arg>
+      <arg>--nic-speed<replaceable>N</replaceable>=<replaceable>kbps</replaceable></arg>
+      <arg>--nic-boot-prio<replaceable>N</replaceable>=<replaceable>priority</replaceable></arg>
+      <arg>--nic-promisc<replaceable>N</replaceable>=<group choice="plain">
           <arg choice="plain">deny</arg>
           <arg choice="plain">allow-vms</arg>
           <arg choice="plain">allow-all</arg>
         </group></arg>
-      <arg>--nicbandwidthgroup<replaceable>N</replaceable>=<group choice="plain">
+      <arg>--nic-bandwidth-group<replaceable>N</replaceable>=<group choice="plain">
           <arg choice="plain">none</arg>
           <arg choice="plain"><replaceable>name</replaceable></arg>
         </group></arg>
-      <arg>--bridgeadapter<replaceable>N</replaceable>=<group choice="plain">
+      <arg>--bridge-adapter<replaceable>N</replaceable>=<group choice="plain">
           <arg choice="plain">none</arg>
           <arg choice="plain"><replaceable>device-name</replaceable></arg>
         </group></arg>
-      <arg>--hostonlyadapter<replaceable>N</replaceable>=<group choice="plain">
+      <arg>--host-only-adapter<replaceable>N</replaceable>=<group choice="plain">
           <arg choice="plain">none</arg>
           <arg choice="plain"><replaceable>device-name</replaceable></arg>
         </group></arg>
-      <arg>--hostonlynet<replaceable>N</replaceable>=<replaceable>network-name</replaceable></arg>
+      <arg>--host-only-net<replaceable>N</replaceable>=<replaceable>network-name</replaceable></arg>
       <arg>--intnet<replaceable>N</replaceable>=<replaceable>network-name</replaceable></arg>
       <arg>--nat-network<replaceable>N</replaceable>=<replaceable>network-name</replaceable></arg>
-      <arg>--nicgenericdrv<replaceable>N</replaceable>=<replaceable>driver-name</replaceable></arg>
-      <arg>--macaddress<replaceable>N</replaceable>=<group choice="plain">
+      <arg>--nic-generic-drv<replaceable>N</replaceable>=<replaceable>driver-name</replaceable></arg>
+      <arg>--mac-address<replaceable>N</replaceable>=<group choice="plain">
           <arg choice="plain">auto</arg>
           <arg choice="plain"><replaceable>MAC-address</replaceable></arg>
@@ -337 +337 @@
         <arg choice="plain"><replaceable>vmname</replaceable></arg>
       </group>
-      <arg>--natnet<replaceable>N</replaceable>=<group choice="plain">
+      <arg>--nat-net<replaceable>N</replaceable>=<group choice="plain">
           <arg choice="plain"><replaceable>network</replaceable></arg>
           <arg choice="plain">default</arg>
         </group></arg>
-      <arg>--natpf<replaceable>N</replaceable>=<group choice="plain">
+      <arg>--nat-pf<replaceable>N</replaceable>=<group choice="plain">
           <arg choice="plain">[<replaceable>rule-name</replaceable>],tcp</arg>
           <arg choice="plain">udp,[<replaceable>host-IP</replaceable>],<replaceable>hostport</replaceable>,[<replaceable>guest-IP</replaceable>],<replaceable>guestport</replaceable></arg>
         </group></arg>
-      <arg>--natpf<replaceable>N</replaceable>=delete=<replaceable>rule-name</replaceable></arg>
-      <arg>--nattftpprefix<replaceable>N</replaceable>=<replaceable>prefix</replaceable></arg>
-      <arg>--nattftpfile<replaceable>N</replaceable>=<replaceable>filename</replaceable></arg>
-      <arg>--nattftpserver<replaceable>N</replaceable>=<replaceable>IP-address</replaceable></arg>
-      <arg>--natbindip<replaceable>N</replaceable>=<replaceable>IP-address</replaceable></arg>
-      <arg>--natdnspassdomain<replaceable>N</replaceable>=<group choice="plain">
-          <arg choice="plain">on</arg>
-          <arg choice="plain">off</arg>
-        </group></arg>
-      <arg>--natdnsproxy<replaceable>N</replaceable>=<group choice="plain">
-          <arg choice="plain">on</arg>
-          <arg choice="plain">off</arg>
-        </group></arg>
-      <arg>--natdnshostresolver<replaceable>N</replaceable>=<group choice="plain">
-          <arg choice="plain">on</arg>
-          <arg choice="plain">off</arg>
-        </group></arg>
-      <arg>--natlocalhostreachable<replaceable>N</replaceable>=<group choice="plain">
-          <arg choice="plain">on</arg>
-          <arg choice="plain">off</arg>
-        </group></arg>
-      <arg>--natsettings<replaceable>N</replaceable>=[<replaceable>mtu</replaceable>],[<replaceable>socksnd</replaceable>],[<replaceable>sockrcv</replaceable>],[<replaceable>tcpsnd</replaceable>],[<replaceable>tcprcv</replaceable>]</arg>
-      <arg>--nataliasmode<replaceable>N</replaceable>=<group choice="plain">
+      <arg>--nat-pf<replaceable>N</replaceable>=delete=<replaceable>rule-name</replaceable></arg>
+      <arg>--nat-tftp-prefix<replaceable>N</replaceable>=<replaceable>prefix</replaceable></arg>
+      <arg>--nat-tftp-file<replaceable>N</replaceable>=<replaceable>filename</replaceable></arg>
+      <arg>--nat-tftp-server<replaceable>N</replaceable>=<replaceable>IP-address</replaceable></arg>
+      <arg>--nat-bind-ip<replaceable>N</replaceable>=<replaceable>IP-address</replaceable></arg>
+      <arg>--nat-dns-pass-domain<replaceable>N</replaceable>=<group choice="plain">
+          <arg choice="plain">on</arg>
+          <arg choice="plain">off</arg>
+        </group></arg>
+      <arg>--nat-dns-proxy<replaceable>N</replaceable>=<group choice="plain">
+          <arg choice="plain">on</arg>
+          <arg choice="plain">off</arg>
+        </group></arg>
+      <arg>--nat-dns-host-resolver<replaceable>N</replaceable>=<group choice="plain">
+          <arg choice="plain">on</arg>
+          <arg choice="plain">off</arg>
+        </group></arg>
+      <arg>--nat-localhostreachable<replaceable>N</replaceable>=<group choice="plain">
+          <arg choice="plain">on</arg>
+          <arg choice="plain">off</arg>
+        </group></arg>
+      <arg>--nat-settings<replaceable>N</replaceable>=[<replaceable>mtu</replaceable>],[<replaceable>socksnd</replaceable>],[<replaceable>sockrcv</replaceable>],[<replaceable>tcpsnd</replaceable>],[<replaceable>tcprcv</replaceable>]</arg>
+      <arg>--nat-alias-mode<replaceable>N</replaceable>=<group choice="plain">
           <arg choice="plain">default</arg>
           <arg choice="plain">[log],[proxyonly],[sameports]</arg>
@@ -393 +393 @@
           <arg choice="plain"><replaceable>IO-base</replaceable> <replaceable>IRQ</replaceable></arg>
         </group></arg>
-      <arg>--uartmode<replaceable>N</replaceable>=<group choice="plain">
+      <arg>--uart-mode<replaceable>N</replaceable>=<group choice="plain">
           <arg choice="plain">disconnected</arg>
           <arg choice="plain">server <replaceable>pipe</replaceable></arg>
@@ -402 +402 @@
           <arg choice="plain"><replaceable>device-name</replaceable></arg>
         </group></arg>
-      <arg>--uarttype<replaceable>N</replaceable>=<group choice="plain">
+      <arg>--uart-type<replaceable>N</replaceable>=<group choice="plain">
           <arg choice="plain">16450</arg>
           <arg choice="plain">16550A</arg>
           <arg choice="plain">16750</arg>
         </group></arg>
-      <arg>--lptmode<replaceable>N</replaceable>=<replaceable>device-name</replaceable></arg>
+      <arg>--lpt-mode<replaceable>N</replaceable>=<replaceable>device-name</replaceable></arg>
       <arg>--lpt<replaceable>N</replaceable>=<group choice="plain">
           <arg choice="plain">off</arg>
@@ -421 +421 @@
           <arg choice="plain">coreaudio</arg>
         </group></arg>
-      <arg>--audiocontroller=<group choice="plain">
+      <arg>--audio-controller=<group choice="plain">
           <arg choice="plain">ac97</arg>
           <arg choice="plain">hda</arg>
           <arg choice="plain">sb16</arg>
         </group></arg>
-      <arg>--audiocodec=<group choice="plain">
+      <arg>--audio-codec=<group choice="plain">
           <arg choice="plain">stac9700</arg>
           <arg choice="plain">ad1980</arg>
@@ -432 +432 @@
           <arg choice="plain">sb16</arg>
         </group></arg>
-      <arg>--audioin=<group choice="plain">
-          <arg choice="plain">on</arg>
-          <arg choice="plain">off</arg>
-        </group></arg>
-      <arg>--audioout=<group choice="plain">
+      <arg>--audio-in=<group choice="plain">
+          <arg choice="plain">on</arg>
+          <arg choice="plain">off</arg>
+        </group></arg>
+      <arg>--audio-out=<group choice="plain">
           <arg choice="plain">on</arg>
           <arg choice="plain">off</arg>
@@ -449 +449 @@
 The implementation is not finished, so postpone documenting until it
 actually is ready for users. -->
-      <arg>--draganddrop=<group choice="plain">
+      <arg>--drag-and-drop=<group choice="plain">
           <arg choice="plain">disabled</arg>
           <arg choice="plain">hosttoguest</arg>
@@ -455 +455 @@
           <arg choice="plain">bidirectional</arg>
         </group></arg>
-      <arg>--monitorcount=<replaceable>number</replaceable></arg>
-      <arg>--usbehci=<group choice="plain">
-          <arg choice="plain">on</arg>
-          <arg choice="plain">off</arg>
-        </group></arg>
-      <arg>--usbohci=<group choice="plain">
-          <arg choice="plain">on</arg>
-          <arg choice="plain">off</arg>
-        </group></arg>
-      <arg>--usbxhci=<group choice="plain">
-          <arg choice="plain">on</arg>
-          <arg choice="plain">off</arg>
-        </group></arg>
-      <arg>--usbrename=<replaceable>old-name</replaceable> <replaceable>new-name</replaceable></arg>
+      <arg>--monitor-count=<replaceable>number</replaceable></arg>
+      <arg>--usb-ehci=<group choice="plain">
+          <arg choice="plain">on</arg>
+          <arg choice="plain">off</arg>
+        </group></arg>
+      <arg>--usb-ohci=<group choice="plain">
+          <arg choice="plain">on</arg>
+          <arg choice="plain">off</arg>
+        </group></arg>
+      <arg>--usb-xhci=<group choice="plain">
+          <arg choice="plain">on</arg>
+          <arg choice="plain">off</arg>
+        </group></arg>
+      <arg>--usb-rename=<replaceable>old-name</replaceable> <replaceable>new-name</replaceable></arg>
     </cmdsynopsis>
 
@@ -481 +481 @@
           <arg choice="plain">off</arg>
         </group></arg>
-      <arg>--recordingscreens=<group choice="plain">
+      <arg>--recording-screens=<group choice="plain">
           <arg choice="plain">all</arg>
           <arg choice="plain"><replaceable>screen-ID</replaceable> [<replaceable>screen-ID</replaceable>...]</arg>
         </group></arg>
-      <arg>--recordingfile=<replaceable>filename</replaceable></arg>
-      <arg>--recordingmaxsize=<replaceable>MB</replaceable></arg>
-      <arg>--recordingmaxtime=<replaceable>msec</replaceable></arg>
-      <arg>--recordingopts= <arg choice="plain"><replaceable>key</replaceable>=<replaceable>value</replaceable> [,<replaceable>key</replaceable>=<replaceable>value</replaceable>...]</arg></arg>
-      <arg>--recordingvideofps=<replaceable>fps</replaceable></arg>
-      <arg>--recordingvideorate=<replaceable>rate</replaceable></arg>
-      <arg>--recordingvideores=<replaceable>width</replaceable> <replaceable>height</replaceable></arg>
+      <arg>--recording-file=<replaceable>filename</replaceable></arg>
+      <arg>--recording-max-size=<replaceable>MB</replaceable></arg>
+      <arg>--recording-max-time=<replaceable>msec</replaceable></arg>
+      <arg>--recording-opts= <arg choice="plain"><replaceable>key</replaceable>=<replaceable>value</replaceable> [,<replaceable>key</replaceable>=<replaceable>value</replaceable>...]</arg></arg>
+      <arg>--recording-video-fps=<replaceable>fps</replaceable></arg>
+      <arg>--recording-video-rate=<replaceable>rate</replaceable></arg>
+      <arg>--recording-video-res=<replaceable>width</replaceable> <replaceable>height</replaceable></arg>
     </cmdsynopsis>
 
@@ -504 +504 @@
           <arg choice="plain">off</arg>
         </group></arg>
-      <arg>--vrdeproperty=<replaceable>property-name</replaceable>= <arg><replaceable>property-value</replaceable></arg></arg>
-      <arg>--vrdeextpack=<group choice="plain">
+      <arg>--vrde-property=<replaceable>property-name</replaceable>= <arg><replaceable>property-value</replaceable></arg></arg>
+      <arg>--vrde-extpack=<group choice="plain">
           <arg choice="plain">default</arg>
           <arg choice="plain"><replaceable>name</replaceable></arg>
         </group></arg>
-      <arg>--vrdeport=<replaceable>port</replaceable></arg>
-      <arg>--vrdeaddress=<replaceable>hostip</replaceable></arg>
-      <arg>--vrdeauthtype=<group choice="plain">
+      <arg>--vrde-port=<replaceable>port</replaceable></arg>
+      <arg>--vrde-address=<replaceable>hostip</replaceable></arg>
+      <arg>--vrde-auth-type=<group choice="plain">
           <arg choice="plain">null</arg>
           <arg choice="plain">external</arg>
           <arg choice="plain">guest</arg>
         </group></arg>
-      <arg>--vrdeauthlibrary=<group choice="plain">
+      <arg>--vrde-auth-library=<group choice="plain">
           <arg choice="plain">default</arg>
           <arg choice="plain"><replaceable>name</replaceable></arg>
         </group></arg>
-      <arg>--vrdemulticon=<group choice="plain">
-          <arg choice="plain">on</arg>
-          <arg choice="plain">off</arg>
-        </group></arg>
-      <arg>--vrdereusecon=<group choice="plain">
-          <arg choice="plain">on</arg>
-          <arg choice="plain">off</arg>
-        </group></arg>
-      <arg>--vrdevideochannel=<group choice="plain">
-          <arg choice="plain">on</arg>
-          <arg choice="plain">off</arg>
-        </group></arg>
-      <arg>--vrdevideochannelquality=<replaceable>percent</replaceable></arg>
+      <arg>--vrde-multi-con=<group choice="plain">
+          <arg choice="plain">on</arg>
+          <arg choice="plain">off</arg>
+        </group></arg>
+      <arg>--vrde-reuse-con=<group choice="plain">
+          <arg choice="plain">on</arg>
+          <arg choice="plain">off</arg>
+        </group></arg>
+      <arg>--vrde-video-channel=<group choice="plain">
+          <arg choice="plain">on</arg>
+          <arg choice="plain">off</arg>
+        </group></arg>
+      <arg>--vrde-video-channel-quality=<replaceable>percent</replaceable></arg>
     </cmdsynopsis>
 
@@ -545 +545 @@
           <arg choice="plain">off</arg>
         </group></arg>
-      <arg>--teleporterport=<replaceable>port</replaceable></arg>
-      <arg>--teleporteraddress=<group choice="plain">
+      <arg>--teleporter-port=<replaceable>port</replaceable></arg>
+      <arg>--teleporter-address=<group choice="plain">
           <arg choice="plain"><replaceable>address</replaceable></arg>
           <arg choice="plain">empty</arg>
         </group></arg>
-      <arg>--teleporterpassword=<replaceable>password</replaceable></arg>
-      <arg>--teleporterpasswordfile=<group choice="plain">
+      <arg>--teleporter-password=<replaceable>password</replaceable></arg>
+      <arg>--teleporter-password-file=<group choice="plain">
           <arg choice="plain"><replaceable>filename</replaceable></arg>
           <arg choice="plain">stdin</arg>
@@ -558 +558 @@
       <arg>--cpuid-set=<replaceable>leaf</replaceable><arg>:<replaceable>subleaf</replaceable></arg> <replaceable>eax</replaceable>&nbsp;<replaceable>ebx</replaceable>&nbsp;<replaceable>ecx</replaceable>&nbsp;<replaceable>edx</replaceable></arg>
       <arg>--cpuid-remove=<replaceable>leaf</replaceable><arg>:<replaceable>subleaf</replaceable></arg></arg>
-      <arg>--cpuidremoveall</arg>
+      <arg>--cpuid-remove-all</arg>
     </cmdsynopsis>
 
@@ -584 +584 @@
         <arg choice="plain"><replaceable>vmname</replaceable></arg>
       </group>
-      <arg>--usbcardreader=<group choice="plain">
+      <arg>--usb-card-reader=<group choice="plain">
           <arg choice="plain">on</arg>
           <arg choice="plain">off</arg>
@@ -614 +614 @@
         <arg choice="plain"><replaceable>vmname</replaceable></arg>
       </group>
-      <arg>--pciattach=<replaceable>host-PCI-address</replaceable><arg>@<replaceable>guest-PCI-bus-address</replaceable></arg></arg>
-      <arg>--pcidetach=<replaceable>host-PCI-address</replaceable></arg>
+      <arg>--pci-attach=<replaceable>host-PCI-address</replaceable><arg>@<replaceable>guest-PCI-bus-address</replaceable></arg></arg>
+      <arg>--pci-detach=<replaceable>host-PCI-address</replaceable></arg>
     </cmdsynopsis>
   </refsynopsisdiv>
@@ -685 +685 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--ostype=<replaceable>OS-type</replaceable></option></term>
+          <term><option>--os-type=<replaceable>OS-type</replaceable></option></term>
           <listitem><para>
               Specifies the guest operating system (OS) information for
@@ -693 +693 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--iconfile=<replaceable>filename</replaceable></option></term>
+          <term><option>--icon-file=<replaceable>filename</replaceable></option></term>
           <listitem><para>
               Specifies the path to the VM icon file in PNG format
@@ -709 +709 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--pagefusion=on | off</option></term>
+          <term><option>--page-fusion=on | off</option></term>
           <listitem><para>
               Enables or disables the Page Fusion feature, which is
@@ -740 +740 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--hardwareuuid=<replaceable>uuid</replaceable></option></term>
+          <term><option>--hardware-uuid=<replaceable>uuid</replaceable></option></term>
           <listitem><para>
               Specifies the Universally Unique Identifier (UUID) to
@@ -763 +763 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--cpuhotplug=on | off</option></term>
+          <term><option>--cpu-hotplug=on | off</option></term>
           <listitem><para>
               Enables or disables CPU hot-plugging. When enabled, you
@@ -771 +771 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--plugcpu=<replaceable>CPU-ID</replaceable></option></term>
+          <term><option>--plug-cpu=<replaceable>CPU-ID</replaceable></option></term>
           <listitem><para>
               Adds a virtual CPU to the VM.
@@ -784 +784 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--unplugcpu=<replaceable>CPU-ID</replaceable></option></term>
+          <term><option>--unplug-cpu=<replaceable>CPU-ID</replaceable></option></term>
           <listitem><para>
               Removes a virtual CPU from the VM.
@@ -815 +815 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--longmode=on | off</option></term>
+          <term><option>--long-mode=on | off</option></term>
           <listitem><para>
               Enables or disables long mode. See
@@ -906 +906 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--triplefaultreset=on | off</option></term>
+          <term><option>--triple-fault-reset=on | off</option></term>
           <listitem><para>
               Enables or disables the resetting of the guest VM instead
@@ -938 +938 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--paravirtprovider=none | default | legacy | minimal | hyperv | kvm</option></term>
+          <term><option>--paravirt-provider=none | default | legacy | minimal | hyperv | kvm</option></term>
           <listitem><para>
               Specifies one of the following paravirtualization
@@ -973 +973 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--paravirtdebug=<replaceable>property</replaceable>=<replaceable>value</replaceable></option></term>
+          <term><option>--paravirt-debug=<replaceable>property</replaceable>=<replaceable>value</replaceable></option></term>
           <listitem><para>
               Specifies debugging properties that are specific to the
@@ -981 +981 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--nestedpaging=on | off</option></term>
+          <term><option>--nested-paging=on | off</option></term>
           <listitem><para>
               Enables or disables the nested paging feature in the
@@ -991 +991 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--largepages=on | off</option></term>
+          <term><option>--large-pages=on | off</option></term>
           <listitem><para>
               Enables or disables the hypervisor's use of large pages,
@@ -1001 +1001 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--vtxvpid=on | off</option></term>
+          <term><option>--vtx-vpid=on | off</option></term>
           <listitem><para>
               Enables or disables the use of the tagged TLB (VPID)
@@ -1010 +1010 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--vtxux=on | off</option></term>
+          <term><option>--vtx-ux=on | off</option></term>
           <listitem><para>
               Enables or disables the use of unrestricted guest mode for
@@ -1128 +1128 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--bioslogofadein=on | off</option></term>
+          <term><option>--bios-logo-fade-in=on | off</option></term>
           <listitem><para>
               Specifies whether the BIOS logo fades in on VM startup. By
@@ -1135 +1135 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--bioslogofadeout=on | off</option></term>
+          <term><option>--bios-logo-fade-out=on | off</option></term>
           <listitem><para>
               Specifies whether the BIOS logo fades out on VM startup.
@@ -1141 +1141 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--bioslogodisplaytime=<replaceable>msec</replaceable></option></term>
+          <term><option>--bios-logo-display-time=<replaceable>msec</replaceable></option></term>
           <listitem><para>
               Specifies the amount of time in milliseconds that the BIOS
@@ -1148 +1148 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--bioslogoimagepath=<replaceable>pathname</replaceable></option></term>
+          <term><option>--bios-logo-image-path=<replaceable>pathname</replaceable></option></term>
           <listitem><para>
               Replaces the existing BIOS logo with a different image.
@@ -1158 +1158 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--biosbootmenu=disabled | menuonly | messageandmenu</option></term>
+          <term><option>--bios-boot-menu=disabled | menuonly | messageandmenu</option></term>
           <listitem><para>
               Specifies whether the BIOS permits you to select a
@@ -1181 +1181 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--biosapic=x2apic | apic | disabled</option></term>
+          <term><option>--bios-apic=x2apic | apic | disabled</option></term>
           <listitem><para>
               Specifies the APIC level of the firmware. Valid values
@@ -1201 +1201 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--biossystemtimeoffset=<replaceable>msec</replaceable></option></term>
+          <term><option>--bios-system-time-offset=<replaceable>msec</replaceable></option></term>
           <listitem><para>
               Specifies the time offset in milliseconds of the guest VM
@@ -1210 +1210 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--biospxedebug=on | off</option></term>
+          <term><option>--bios-pxe-debug=on | off</option></term>
           <listitem><para>
               Enables or disables additional debugging output when using
@@ -1248 +1248 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--rtcuseutc=on | off</option></term>
+          <term><option>--rtc-use-utc=on | off</option></term>
           <listitem><para>
               Specifies whether the real-time clock (RTC) uses
@@ -1263 +1263 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--snapshotfolder=default | <replaceable>pathname</replaceable></option></term>
+          <term><option>--snapshot-folder=default | <replaceable>pathname</replaceable></option></term>
           <listitem><para>
               Specifies the name of the VM's snapshot storage folder. If
@@ -1282 +1282 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--guestmemoryballoon=<replaceable>size</replaceable></option></term>
+          <term><option>--guest-memory-balloon=<replaceable>size</replaceable></option></term>
           <listitem><para>
               Specifies the size of the guest memory balloon. The guest
@@ -1294 +1294 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--defaultfrontend=default | <replaceable>name</replaceable></option></term>
+          <term><option>--default-frontend=default | <replaceable>name</replaceable></option></term>
           <listitem><para>
               Specifies the default frontend to use when starting the
@@ -1393 +1393 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--nictype<replaceable>N</replaceable>=Am79C970A | Am79C973 | 82540EM | 82543GC | 82545EM | virtio</option></term>
+          <term><option>--nic-type<replaceable>N</replaceable>=Am79C970A | Am79C973 | 82540EM | 82543GC | 82545EM | virtio</option></term>
           <listitem><para>
               Identifies the type of networking hardware that
@@ -1428 +1428 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--cableconnected<replaceable>N</replaceable>=on | off</option></term>
+          <term><option>--cable-connected<replaceable>N</replaceable>=on | off</option></term>
           <listitem><para>
               Temporarily disconnects a virtual network interface, as if
@@ -1437 +1437 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--nictrace<replaceable>N</replaceable>=on | off</option></term>
+          <term><option>--nic-trace<replaceable>N</replaceable>=on | off</option></term>
           <listitem><para>
               Enables or disables network tracing for the specified
@@ -1444 +1444 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--nictracefile<replaceable>N</replaceable>=<replaceable>filename</replaceable></option></term>
+          <term><option>--nic-trace-file<replaceable>N</replaceable>=<replaceable>filename</replaceable></option></term>
           <listitem><para>
               Specifies the absolute path of the file in which to write
@@ -1452 +1452 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--nicproperty<replaceable>N</replaceable>=<replaceable>name</replaceable>=<replaceable>value</replaceable></option></term>
+          <term><option>--nic-property<replaceable>N</replaceable>=<replaceable>name</replaceable>=<replaceable>value</replaceable></option></term>
           <listitem><para>
               Enables you to set property values and pass them to rarely
               used network backends. To use this option, you must also
-              use the <option>--nicgenericdrv</option> option.
+              use the <option>--nic-generic-drv</option> option.
             </para><para>
               These properties are specific to the backend engine and
@@ -1465 +1465 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--nicspeed<replaceable>N</replaceable>=<replaceable>kbps</replaceable></option></term>
+          <term><option>--nic-speed<replaceable>N</replaceable>=<replaceable>kbps</replaceable></option></term>
           <listitem><para>
               Specifies the throughput rate in kilobits per second for
@@ -1475 +1475 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--nicbootprio<replaceable>N</replaceable>=<replaceable>priority</replaceable></option></term>
+          <term><option>--nic-boot-prio<replaceable>N</replaceable>=<replaceable>priority</replaceable></option></term>
           <listitem><para>
               Assigns a priority to each NIC that determines the order
@@ -1491 +1491 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--nicpromisc<replaceable>N</replaceable>=deny | allow-vms | allow-all</option></term>
+          <term><option>--nic-promisc<replaceable>N</replaceable>=deny | allow-vms | allow-all</option></term>
           <listitem><para>
               Enables you to specify whether to deny or allow
@@ -1514 +1514 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--nicbandwidthgroup<replaceable>N</replaceable>=none | <replaceable>name</replaceable></option></term>
+          <term><option>--nic-bandwidth-group<replaceable>N</replaceable>=none | <replaceable>name</replaceable></option></term>
           <listitem><para>
               Adds or removes a bandwidth group assignment to the
@@ -1534 +1534 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--bridgeadapter<replaceable>N</replaceable>=none | <replaceable>device-name</replaceable></option></term>
+          <term><option>--bridge-adapter<replaceable>N</replaceable>=none | <replaceable>device-name</replaceable></option></term>
           <listitem><para>
               Specifies the host interface to use for the specified
@@ -1544 +1544 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--hostonlyadapter<replaceable>N</replaceable>=none | <replaceable>device-name</replaceable></option></term>
+          <term><option>--host-only-adapter<replaceable>N</replaceable>=none | <replaceable>device-name</replaceable></option></term>
           <listitem><para>
               Specifies which host-only networking interface to use for
@@ -1574 +1574 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--nicgenericdrv<replaceable>N</replaceable>=<replaceable>backend-driver</replaceable></option></term>
+          <term><option>--nic-generic-drv<replaceable>N</replaceable>=<replaceable>backend-driver</replaceable></option></term>
           <listitem><para>
               Enables you to access rarely used networking sub-modes,
@@ -1583 +1583 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--macaddress<replaceable>N</replaceable>=auto | <replaceable>MAC-address</replaceable></option></term>
+          <term><option>--mac-address<replaceable>N</replaceable>=auto | <replaceable>MAC-address</replaceable></option></term>
           <listitem><para>
               Specifies the MAC address of the specified network adapter
@@ -1601 +1601 @@
       <variablelist>
         <varlistentry>
-          <term><option>--natnet<replaceable>N</replaceable>=default | <replaceable>network</replaceable></option></term>
+          <term><option>--nat-net<replaceable>N</replaceable>=default | <replaceable>network</replaceable></option></term>
           <listitem><para>
               Specifies the IP address range to use for this network.
@@ -1610 +1610 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--natpf<replaceable>N</replaceable>=[<replaceable>name</replaceable>],tcp | udp,[<replaceable>host-IP</replaceable>],<replaceable>hostport</replaceable>,[<replaceable>guest-IP</replaceable>],<replaceable>guestport</replaceable></option></term>
+          <term><option>--nat-pf<replaceable>N</replaceable>=[<replaceable>name</replaceable>],tcp | udp,[<replaceable>host-IP</replaceable>],<replaceable>hostport</replaceable>,[<replaceable>guest-IP</replaceable>],<replaceable>guestport</replaceable></option></term>
           <listitem><para>
               Specifies the NAT port-forwarding rule to use. See
@@ -1617 +1617 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--natpf<replaceable>N</replaceable>=delete <replaceable>name</replaceable></option></term>
+          <term><option>--nat-pf<replaceable>N</replaceable>=delete <replaceable>name</replaceable></option></term>
           <listitem><para>
               Specifies the NAT port-forwarding rule to delete. See
@@ -1624 +1624 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--nattftpprefix<replaceable>N</replaceable>=<replaceable>prefix</replaceable></option></term>
+          <term><option>--nat-tftp-prefix<replaceable>N</replaceable>=<replaceable>prefix</replaceable></option></term>
           <listitem><para>
               Specifies a prefix to use for the built-in TFTP server.
@@ -1633 +1633 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--nattftpfile<replaceable>N</replaceable>=<replaceable>boot-file</replaceable></option></term>
+          <term><option>--nat-tftp-file<replaceable>N</replaceable>=<replaceable>boot-file</replaceable></option></term>
           <listitem><para>
               Specifies the name of the TFT boot file. See
@@ -1640 +1640 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--nattftpserver<replaceable>N</replaceable>=<replaceable>tftp-server</replaceable></option></term>
+          <term><option>--nat-tftp-server<replaceable>N</replaceable>=<replaceable>tftp-server</replaceable></option></term>
           <listitem><para>
               Specifies the address of the TFTP server from which to
@@ -1647 +1647 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--natbindip<replaceable>N</replaceable>=<replaceable>IP-address</replaceable></option></term>
+          <term><option>--nat-bind-ip<replaceable>N</replaceable>=<replaceable>IP-address</replaceable></option></term>
           <listitem><para>
               Specifies an alternate IP address to which the NAT engine
@@ -1657 +1657 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--natdnspassdomain<replaceable>N</replaceable>=on | off</option></term>
+          <term><option>--nat-dns-pass-domain<replaceable>N</replaceable>=on | off</option></term>
           <listitem><para>
               Specifies whether the built-in DHCP server passes the
@@ -1664 +1664 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--natdnsproxy<replaceable>N</replaceable>=on | off</option></term>
+          <term><option>--nat-dns-proxy<replaceable>N</replaceable>=on | off</option></term>
           <listitem><para>
               Specifies whether the NAT engine is the proxy for all
@@ -1672 +1672 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--natdnshostresolver<replaceable>N</replaceable>=on | off</option></term>
+          <term><option>--nat-dns-host-resolver<replaceable>N</replaceable>=on | off</option></term>
           <listitem><para>
               Specifies whether the NAT engine uses the host system's
@@ -1680 +1680 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--natlocalhostreachable<replaceable>N</replaceable>=on | off</option></term>
+          <term><option>--nat-localhostreachable<replaceable>N</replaceable>=on | off</option></term>
           <listitem><para>
               Specifies whether the NAT engine allows traffic from the guest directed to
@@ -1687 +1687 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--natsettings<replaceable>N</replaceable>=[<replaceable>mtu</replaceable>],[<replaceable>socksnd</replaceable>],[<replaceable>sockrcv</replaceable>],[<replaceable>tcpsnd</replaceable>],[<replaceable>tcprcv</replaceable>]</option></term>
+          <term><option>--nat-settings<replaceable>N</replaceable>=[<replaceable>mtu</replaceable>],[<replaceable>socksnd</replaceable>],[<replaceable>sockrcv</replaceable>],[<replaceable>tcpsnd</replaceable>],[<replaceable>tcprcv</replaceable>]</option></term>
           <listitem><para>
               Specifies values for tuning NAT performance. See
@@ -1694 +1694 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--nataliasmode<replaceable>N</replaceable>=default | [log],[proxyonly],[sameports]</option></term>
+          <term><option>--nat-alias-mode<replaceable>N</replaceable>=default | [log],[proxyonly],[sameports]</option></term>
           <listitem><para>
               Specifies the behavior of the NAT engine core as follows:
@@ -1758 +1758 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--uartmode<replaceable>N</replaceable>=<replaceable>mode</replaceable></option></term>
+          <term><option>--uart-mode<replaceable>N</replaceable>=<replaceable>mode</replaceable></option></term>
           <listitem><para>
               Specifies how &product-name; connects the specified
@@ -1843 +1843 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--uarttype<replaceable>N</replaceable>=<replaceable>UART-type</replaceable></option></term>
+          <term><option>--uart-type<replaceable>N</replaceable>=<replaceable>UART-type</replaceable></option></term>
           <listitem><para>
               Configures the UART type for the specified virtual serial
@@ -1853 +1853 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--lptmode<replaceable>N</replaceable>=<replaceable>device-name</replaceable></option></term>
+          <term><option>--lpt-mode<replaceable>N</replaceable>=<replaceable>device-name</replaceable></option></term>
           <listitem><para>
               Specifies the device name of the parallel port to use.
@@ -1889 +1889 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--audiocontroller=<replaceable>controller-type</replaceable></option></term>
+          <term><option>--audio-controller=<replaceable>controller-type</replaceable></option></term>
           <listitem><para>
               Specifies the audio controller to be used with the VM.
@@ -1898 +1898 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--audiocodec=<replaceable>codec-type</replaceable></option></term>
+          <term><option>--audio-codec=<replaceable>codec-type</replaceable></option></term>
           <listitem><para>
               Specifies the audio codec to be used with the VM. Valid
@@ -1907 +1907 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--audioin=on|off</option></term>
+          <term><option>--audio-in=on|off</option></term>
           <listitem><para>
               Specifies whether to enable or disable audio capture from
@@ -1914 +1914 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--audioout=on|off</option></term>
+          <term><option>--audio-out=on|off</option></term>
           <listitem><para>
               Specifies whether to enable or disable audio playback from
@@ -1936 +1936 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--draganddrop=<replaceable>value</replaceable></option></term>
+          <term><option>--drag-and-drop=<replaceable>value</replaceable></option></term>
           <listitem><para>
               Specifies how to use the drag and drop feature between the
@@ -1951 +1951 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--monitorcount=<replaceable>count</replaceable></option></term>
+          <term><option>--monitor-count=<replaceable>count</replaceable></option></term>
           <listitem><para>
               Enables you to configure multiple monitors. See
@@ -1958 +1958 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--usbohci=on | off</option></term>
+          <term><option>--usb-ohci=on | off</option></term>
           <listitem><para>
               Enables or disables the VM's virtual USB 1.1 controller.
@@ -1965 +1965 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--usbehci=on | off</option></term>
+          <term><option>--usb-ehci=on | off</option></term>
           <listitem><para>
               Enables or disables the VM's virtual USB 2.0 controller.
@@ -1972 +1972 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--usbxhci=on | off</option></term>
+          <term><option>--usb-xhci=on | off</option></term>
           <listitem><para>
               Enables or disables the VM's virtual USB 3.0 controller.
@@ -1980 +1980 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--usbrename=<replaceable>old-name</replaceable> <replaceable>new-name</replaceable></option></term>
+          <term><option>--usb-rename=<replaceable>old-name</replaceable> <replaceable>new-name</replaceable></option></term>
           <listitem><para>
               Rename's the VM's virtual USB controller from
@@ -2006 +2006 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--recordingscreens=all | <replaceable>screen-ID</replaceable></option></term>
+          <term><option>--recording-screens=all | <replaceable>screen-ID</replaceable></option></term>
           <listitem><para>
               Enables you to specify the VM screens to record. The
@@ -2015 +2015 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--recordingfile=<replaceable>filename</replaceable></option></term>
+          <term><option>--recording-file=<replaceable>filename</replaceable></option></term>
           <listitem><para>
               Specifies the name of the file in which to save the
@@ -2022 +2022 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--recordingmaxsize=<replaceable>MB</replaceable></option></term>
+          <term><option>--recording-max-size=<replaceable>MB</replaceable></option></term>
           <listitem><para>
               Specifies the maximum size of the recorded video file in
@@ -2031 +2031 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--recordingmaxtime=<replaceable>seconds</replaceable></option></term>
+          <term><option>--recording-max-time=<replaceable>seconds</replaceable></option></term>
           <listitem><para>
               Specifies the maximum amount of time to record in seconds.
@@ -2040 +2040 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--recordingopts=<replaceable>keyword</replaceable>=<replaceable>value</replaceable></option></term>
+          <term><option>--recording-opts=<replaceable>keyword</replaceable>=<replaceable>value</replaceable></option></term>
           <listitem><para>
               Specifies additional video-recording properties as a
@@ -2052 +2052 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--recordingvideofps=<replaceable>fps</replaceable></option></term>
+          <term><option>--recording-video-fps=<replaceable>fps</replaceable></option></term>
           <listitem><para>
               Specifies the maximum number of video frames per second
@@ -2062 +2062 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--recordingvideorate=<replaceable>bit-rate</replaceable></option></term>
+          <term><option>--recording-video-rate=<replaceable>bit-rate</replaceable></option></term>
           <listitem><para>
               Specifies the bit rate of the video in kilobits per
@@ -2071 +2071 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--recordingvideores=<replaceable>width</replaceable>x<replaceable>height</replaceable></option></term>
+          <term><option>--recording-video-res=<replaceable>width</replaceable>x<replaceable>height</replaceable></option></term>
           <listitem><para>
               Specifies the video resolution (width and height) of the
@@ -2094 +2094 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--vrdeproperty=TCP/Ports=<replaceable>port</replaceable></option></term>
+          <term><option>--vrde-property=TCP/Ports=<replaceable>port</replaceable></option></term>
           <listitem><para>
               <replaceable>port</replaceable> is the port or port range
@@ -2102 +2102 @@
               RDP port.
             </para><para>
-              Also see the <option>--vrdeport</option> option
+              Also see the <option>--vrde-port</option> option
               description.
             </para></listitem>
         </varlistentry>
         <varlistentry>
-          <term><option>--vrdeproperty=TCP/Address=<replaceable>IP-address</replaceable></option></term>
+          <term><option>--vrde-property=TCP/Address=<replaceable>IP-address</replaceable></option></term>
           <listitem><para>
               <replaceable>IP-address</replaceable> is the IP address of
@@ -2114 +2114 @@
               host network interface at that IP address.
             </para><para>
-              Also see the <option>--vrdeaddress</option> option
+              Also see the <option>--vrde-address</option> option
               description.
             </para></listitem>
         </varlistentry>
         <varlistentry>
-          <term><option>--vrdeproperty=VideoChannel/Enabled=<replaceable>value</replaceable></option></term>
+          <term><option>--vrde-property=VideoChannel/Enabled=<replaceable>value</replaceable></option></term>
           <listitem><para>
               Specifies whether the VRDP video channel is on or off.
@@ -2128 +2128 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--vrdeproperty=Quality=<replaceable>value</replaceable></option></term>
+          <term><option>--vrde-property=Quality=<replaceable>value</replaceable></option></term>
           <listitem><para>
               Specifies a value between 10% and 100%, inclusive, that
@@ -2138 +2138 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--vrdeproperty=DownscaleProtection=<replaceable>value</replaceable></option></term>
+          <term><option>--vrde-property=DownscaleProtection=<replaceable>value</replaceable></option></term>
           <listitem><para>
               Enables or disables the video downscale protection
@@ -2165 +2165 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--vrdeproperty=Client/DisableDisplay=1</option></term>
+          <term><option>--vrde-property=Client/DisableDisplay=1</option></term>
           <listitem><para>
               Disables the display VRDE server feature.
@@ -2172 +2172 @@
               to reenable the display feature, specify the
               <command>VBoxManage modifyvm
-              --vrdeproperty=Client/DisableDisplay=</command> command.
+              --vrde-property=Client/DisableDisplay=</command> command.
               See <xref linkend="vrde-customization" />.
             </para></listitem>
         </varlistentry>
         <varlistentry>
-          <term><option>--vrdeproperty=DisableInput=1</option></term>
+          <term><option>--vrde-property=DisableInput=1</option></term>
           <listitem><para>
               Disables the input VRDE server feature.
@@ -2183 +2183 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--vrdeproperty=DisableAudio=1</option></term>
+          <term><option>--vrde-property=DisableAudio=1</option></term>
           <listitem><para>
               Disables the audio VRDE server feature.
@@ -2189 +2189 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--vrdeproperty=DisableUSB=1</option></term>
+          <term><option>--vrde-property=DisableUSB=1</option></term>
           <listitem><para>
               Disables the USB VRDE server feature.
@@ -2195 +2195 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--vrdeproperty=Client/DisableClipboard=1</option></term>
+          <term><option>--vrde-property=Client/DisableClipboard=1</option></term>
           <listitem><para>
               Disables the clipboard VRDE server feature. To reenable
@@ -2203 +2203 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--vrdeproperty=DisableUpstreamAudio=1</option></term>
+          <term><option>--vrde-property=DisableUpstreamAudio=1</option></term>
           <listitem><para>
               Disables the upstream audio VRDE server feature. To
@@ -2211 +2211 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--vrdeproperty=Client/DisableRDPDR=1</option></term>
+          <term><option>--vrde-property=Client/DisableRDPDR=1</option></term>
           <listitem><para>
               Disables the RDP device redirection for smart cards VRDE
@@ -2219 +2219 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--vrdeproperty=H3DRedirect/Enabled=1</option></term>
+          <term><option>--vrde-property=H3DRedirect/Enabled=1</option></term>
           <listitem><para>
               Enables the 3D redirection VRDE server feature. To disable
@@ -2226 +2226 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--vrdeproperty=Security/Method=<replaceable>value</replaceable></option></term>
+          <term><option>--vrde-property=Security/Method=<replaceable>value</replaceable></option></term>
           <listitem><para>
               Specifies the following information that is required for a
@@ -2250 +2250 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--vrdeproperty=ServerCertificate=<replaceable>value</replaceable></option></term>
+          <term><option>--vrde-property=ServerCertificate=<replaceable>value</replaceable></option></term>
           <listitem><para>
               Specifies the absolute path to the server certificate. See
@@ -2257 +2257 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--vrdeproperty=ServerPrivateKey=<replaceable>value</replaceable></option></term>
+          <term><option>--vrde-property=ServerPrivateKey=<replaceable>value</replaceable></option></term>
           <listitem><para>
               Specifies the absolute path to the server private key. See
@@ -2264 +2264 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--vrdeproperty=CACertificate=<replaceable>value</replaceable></option></term>
+          <term><option>--vrde-property=CACertificate=<replaceable>value</replaceable></option></term>
           <listitem><para>
               Specifies the absolute path to the CA self-signed
@@ -2271 +2271 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--vrdeproperty Audio/RateCorrectionMode=<replaceable>value</replaceable></option></term>
+          <term><option>--vrde-property Audio/RateCorrectionMode=<replaceable>value</replaceable></option></term>
           <listitem><para>
               Specifies the audio connection mode or the path to the
@@ -2296 +2296 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--vrdeproperty=LogPath=<replaceable>value</replaceable></option></term>
+          <term><option>--vrde-property=LogPath=<replaceable>value</replaceable></option></term>
           <listitem><para>
               Specifies the absolute path to the audio log file.
@@ -2302 +2302 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--vrdeextpack=default | <replaceable>name</replaceable></option></term>
+          <term><option>--vrde-extpack=default | <replaceable>name</replaceable></option></term>
           <listitem><para>
               Specifies the library to use to access the VM remotely.
@@ -2314 +2314 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--vrdeport=default | <replaceable>port</replaceable></option></term>
+          <term><option>--vrde-port=default | <replaceable>port</replaceable></option></term>
           <listitem><para>
               <replaceable>port</replaceable> is the port or port range
@@ -2327 +2327 @@
               the available ports from the list. Only one machine can
               use a given port at a time. For example, the
-              <option>--vrdeport=5000,5010-5012</option> option
+              <option>--vrde-port=5000,5010-5012</option> option
               specifies that server can bind to one of following ports:
               <literal>5000</literal>, <literal>5010</literal>,
@@ -2334 +2334 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--vrdeaddress=<replaceable>IP-address</replaceable></option></term>
+          <term><option>--vrde-address=<replaceable>IP-address</replaceable></option></term>
           <listitem><para>
               Specifies the IP address of the host network interface to
@@ -2346 +2346 @@
               <listitem><para>
                   <emphasis role="bold">Only IPv4:</emphasis> Use the
-                  <option>--vrdeaddress="0.0.0.0"</option> option.
+                  <option>--vrde-address="0.0.0.0"</option> option.
                 </para></listitem>
               <listitem><para>
                   <emphasis role="bold">Only IPv6:</emphasis> Use the
-                  <option>--vrdeaddress="::"</option> option.
+                  <option>--vrde-address="::"</option> option.
                 </para></listitem>
               <listitem><para>
                   <emphasis role="bold">Both IPv6 and IPv4:</emphasis>
-                  Use the <option>--vrdeaddress=&ldquo;&rdquo;</option>
+                  Use the <option>--vrde-address=&ldquo;&rdquo;</option>
                   option. This is the default value.
                 </para></listitem>
@@ -2360 +2360 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--vrdeauthtype=null | external | guest</option></term>
+          <term><option>--vrde-auth-type=null | external | guest</option></term>
           <listitem><para>
               Specify whether to use authorization and how to perform
@@ -2382 +2382 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--vrdeauthlibrary=default | <replaceable>name</replaceable></option></term>
+          <term><option>--vrde-auth-library=default | <replaceable>name</replaceable></option></term>
           <listitem><para>
               Specifies the library to use for RDP authentication. The
@@ -2391 +2391 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--vrdemulticon=on | off</option></term>
+          <term><option>--vrde-multi-con=on | off</option></term>
           <listitem><para>
               Enables or disables the multiple connections VRDE server
@@ -2399 +2399 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--vrdereusecon=on | off</option></term>
+          <term><option>--vrde-reuse-con=on | off</option></term>
           <listitem><para>
               Specifies how the VRDE server behaves when multiple
@@ -2411 +2411 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--vrdevideochannel=on | off</option></term>
+          <term><option>--vrde-video-channel=on | off</option></term>
           <listitem><para>
               Enables video redirection if supported by the VRDE server.
@@ -2418 +2418 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--vrdevideochannelquality=<replaceable>percent</replaceable></option></term>
+          <term><option>--vrde-video-channel-quality=<replaceable>percent</replaceable></option></term>
           <listitem><para>
               Specifies the image quality for video redirection as a
@@ -2449 +2449 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--teleporterport=<replaceable>port</replaceable></option></term>
+          <term><option>--teleporter-port=<replaceable>port</replaceable></option></term>
           <listitem><para>
               Specifies the port on which the VM listens to receive a
@@ -2459 +2459 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--teleporteraddress=<replaceable>IP-address</replaceable></option></term>
+          <term><option>--teleporter-address=<replaceable>IP-address</replaceable></option></term>
           <listitem><para>
               Specifies the IP address on which the VM listens to
@@ -2472 +2472 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--teleporterpassword=<replaceable>password</replaceable></option></term>
+          <term><option>--teleporter-password=<replaceable>password</replaceable></option></term>
           <listitem><para>
               Specifies the password to use for authentication. When
@@ -2481 +2481 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--teleporterpasswordfile=<replaceable>filename</replaceable></option></term>
+          <term><option>--teleporter-password-file=<replaceable>filename</replaceable></option></term>
           <listitem><para>
               Specifies a file that contains the password to use for
@@ -2539 +2539 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--cpuidremoveall</option></term>
+          <term><option>--cpuid-remove-all</option></term>
           <listitem>
             <para>
@@ -2591 +2591 @@
       <variablelist>
         <varlistentry>
-          <term><option>--usbcardreader=on | off</option></term>
+          <term><option>--usb-card-reader=on | off</option></term>
           <listitem><para>
               Enables or disables the USB card reader interface.
@@ -2634 +2634 @@
       <variablelist>
         <varlistentry>
-          <term><option>--pciattach=<replaceable>host-PCI-address</replaceable>[@<replaceable>guest-PCI-bus-address</replaceable>]</option></term>
+          <term><option>--pci-attach=<replaceable>host-PCI-address</replaceable>[@<replaceable>guest-PCI-bus-address</replaceable>]</option></term>
           <listitem><para>
               Attaches the specified PCI network controller on the host
@@ -2643 +2643 @@
         </varlistentry>
         <varlistentry>
-          <term><option>--pcidetach=<replaceable>host-PCI-address</replaceable></option></term>
+          <term><option>--pci-detach=<replaceable>host-PCI-address</replaceable></option></term>
           <listitem><para>
               Detaches the specified PCI network controller from the

trunk/doc/manual/en_US/user_AdvancedTopics.xml

@@ -819 +819 @@
     </para>
 
-<screen>$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --cpuhotplug on</screen>
+<screen>$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --cpu-hotplug on</screen>
 
     <para>
@@ -830 +830 @@
     <para>
       When the VM is off, you can then add and remove virtual CPUs with
-      the <command>VBoxManage modifyvm --plugcpu</command> and
-      <command>VBoxManage modifyvm --unplugcpu</command> commands, which
+      the <command>VBoxManage modifyvm --plug-cpu</command> and
+      <command>VBoxManage modifyvm --unplug-cpu</command> commands, which
       take the number of the virtual CPU as a parameter, as follows:
     </para>
 
-<screen>$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --plugcpu 3
-$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --unplugcpu 3</screen>
+<screen>$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --plug-cpu 3
+$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --unplug-cpu 3</screen>
 
     <para>
@@ -5934 +5934 @@
     </para>
 
-<screen>VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrdeproperty VNCPassword=secret</screen>
+<screen>VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrde-property VNCPassword=secret</screen>
 
     <para>
@@ -6874 +6874 @@
             </para>
 
-<screen>$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --paravirtdebug "enabled=1"</screen>
+<screen>$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --paravirt-debug "enabled=1"</screen>
 
             <para>
@@ -6884 +6884 @@
 
 <screen>$ VBoxManage modifyvm <replaceable>VM-name</replaceable> \
---paravirtdebug "enabled=1,address=192.168.32.1,port=55000"</screen>
+--paravirt-debug "enabled=1,address=192.168.32.1,port=55000"</screen>
 
             <para>

trunk/doc/manual/en_US/user_BasicConcepts.xml

@@ -1326 +1326 @@
             accuracy and performance of guest OSes. The options
             available are documented under the
-            <option>--paravirtprovider</option> option in
+            <option>--paravirt-provider</option> option in
             <xref linkend="vboxmanage-modifyvm" />. For further details
             on the paravirtualization providers, see
@@ -2023 +2023 @@
       ports. For the latter, see <xref linkend="vboxmanage-modifyvm" />
       for information on the <option>--uart</option>,
-      <option>--uartmode</option> and <option>--uarttype</option>
+      <option>--uart-mode</option> and <option>--uart-type</option>
       options.
     </para>

trunk/doc/manual/en_US/user_Frontends.xml

@@ -67 +67 @@
       The port can be changed either in the
       <emphasis role="bold">Display</emphasis> settings of the graphical
-      user interface or with the <option>--vrdeport</option> option of
+      user interface or with the <option>--vrde-port</option> option of
       the <command>VBoxManage modifyvm</command> command. You can
       specify a comma-separated list of ports or ranges of ports. Use a
@@ -73 +73 @@
       will bind to <emphasis>one</emphasis> of the available ports from
       the specified list. For example, <command>VBoxManage modifyvm
-      <replaceable>VM-name</replaceable> --vrdeport
+      <replaceable>VM-name</replaceable> --vrde-port
       5000,5010-5012</command> configures the server to bind to one of
       the ports 5000, 5010, 5011, or 5012. See
@@ -585 +585 @@
         authenticated. For this, use the <command>VBoxManage
         modifyvm</command> command with the
-        <option>--vrdeauthtype</option> option. See
+        <option>--vrde-auth-type</option> option. See
         <xref linkend="vboxmanage-modifyvm" />. The following methods of
         authentication are available:
@@ -684 +684 @@
                   </para>
 
-<screen>VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrdeauthtype external</screen>
+<screen>VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrde-auth-type external</screen>
 
                   <para>
@@ -861 +861 @@
           </para>
 
-<screen>vboxmanage modifyvm <replaceable>VM-name</replaceable> --vrdeproperty "Security/Method=negotiate"</screen>
+<screen>vboxmanage modifyvm <replaceable>VM-name</replaceable> --vrde-property "Security/Method=negotiate"</screen>
 
           <para>
@@ -910 +910 @@
 
 <screen>vboxmanage modifyvm <replaceable>VM-name</replaceable> \
-  --vrdeproperty "Security/CACertificate=path/ca_cert.pem"</screen>
+  --vrde-property "Security/CACertificate=path/ca_cert.pem"</screen>
 
 <screen>vboxmanage modifyvm <replaceable>VM-name</replaceable> \
-  --vrdeproperty "Security/ServerCertificate=path/server_cert.pem"</screen>
+  --vrde-property "Security/ServerCertificate=path/server_cert.pem"</screen>
 
 <screen>vboxmanage modifyvm <replaceable>VM-name</replaceable> \
-  --vrdeproperty "Security/ServerPrivateKey=path/server_key_private.pem"</screen>
+  --vrde-property "Security/ServerPrivateKey=path/server_key_private.pem"</screen>
         </listitem>
 
@@ -947 +947 @@
       </para>
 
-<screen>VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrdemulticon on</screen>
+<screen>VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrde-multi-con on</screen>
 
     </sect2>
@@ -1015 +1015 @@
       </para>
 
-<screen>VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrdevideochannel on</screen>
+<screen>VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrde-video-channel on</screen>
 
       <para>
@@ -1024 +1024 @@
       </para>
 
-<screen>VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrdevideochannelquality 75</screen>
+<screen>VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrde-video-channel-quality 75</screen>
 
     </sect2>
@@ -1041 +1041 @@
       </para>
 
-<screen>$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrdeproperty Client/DisableDisplay=1
-$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrdeproperty Client/DisableInput=1
-$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrdeproperty Client/DisableUSB=1
-$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrdeproperty Client/DisableAudio=1
-$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrdeproperty Client/DisableClipboard=1
-$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrdeproperty Client/DisableUpstreamAudio=1</screen>
+<screen>$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrde-property Client/DisableDisplay=1
+$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrde-property Client/DisableInput=1
+$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrde-property Client/DisableUSB=1
+$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrde-property Client/DisableAudio=1
+$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrde-property Client/DisableClipboard=1
+$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrde-property Client/DisableUpstreamAudio=1</screen>
 
       <para>
@@ -1053 +1053 @@
       </para>
 
-<screen>$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrdeproperty Client/DisableDisplay=</screen>
+<screen>$ VBoxManage modifyvm <replaceable>VM-name</replaceable> --vrde-property Client/DisableDisplay=</screen>
 
     </sect2>
@@ -1140 +1140 @@
         </para>
 
-<screen>VBoxManage modifyvm <replaceable>targetvmname</replaceable> --teleporter on --teleporterport <replaceable>port</replaceable></screen>
+<screen>VBoxManage modifyvm <replaceable>targetvmname</replaceable> --teleporter on --teleporter-port <replaceable>port</replaceable></screen>
 
         <para>

trunk/doc/manual/en_US/user_GuestAdditions.xml

@@ -2193 +2193 @@
           <listitem>
             <para>
-              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
               <command>VBoxManage modifyvm
-              <replaceable>vmname</replaceable> --largepages
+              <replaceable>vmname</replaceable> --large-pages
               off</command>
             </para>
@@ -2261 +2261 @@
       </para>
 
-<screen>VBoxManage modifyvm "VM name" --guestmemoryballoon n</screen>
+<screen>VBoxManage modifyvm "VM name" --guest-memory-balloon n</screen>
 
       <para>
@@ -2368 +2368 @@
       </para>
 
-<screen>VBoxManage modifyvm "VM name" --pagefusion on</screen>
+<screen>VBoxManage modifyvm "VM name" --page-fusion on</screen>
 
       <para>

trunk/doc/manual/en_US/user_Networking.xml

@@ -561 +561 @@
         <literal>guestssh</literal> is purely descriptive and will be
         auto-generated if omitted. The number after
-        <option>--natpf</option> denotes the network card, as with other
+        <option>--nat-pf</option> denotes the network card, as with other
         <command>VBoxManage</command> commands.
       </para>
@@ -1272 +1272 @@
 
 <screen>        VBoxManage modifyvm "VM 01 on host 1" --nic&lt;x&gt; generic
-        VBoxManage modifyvm "VM 01 on host 1" --nicgenericdrv&lt;x&gt; UDPTunnel
-        VBoxManage modifyvm "VM 01 on host 1" --nicproperty&lt;x&gt; dest=10.0.0.2
-        VBoxManage modifyvm "VM 01 on host 1" --nicproperty&lt;x&gt; sport=10001
-        VBoxManage modifyvm "VM 01 on host 1" --nicproperty&lt;x&gt; dport=10002</screen>
+        VBoxManage modifyvm "VM 01 on host 1" --nic-generic-drv&lt;x&gt; UDPTunnel
+        VBoxManage modifyvm "VM 01 on host 1" --nic-property&lt;x&gt; dest=10.0.0.2
+        VBoxManage modifyvm "VM 01 on host 1" --nic-property&lt;x&gt; sport=10001
+        VBoxManage modifyvm "VM 01 on host 1" --nic-property&lt;x&gt; dport=10002</screen>
 
 <screen>        VBoxManage modifyvm "VM 02 on host 2" --nic&lt;y&gt; generic
-        VBoxManage modifyvm "VM 02 on host 2" --nicgenericdrv&lt;y&gt; UDPTunnel
-        VBoxManage modifyvm "VM 02 on host 2" --nicproperty&lt;y&gt; dest=10.0.0.1
-        VBoxManage modifyvm "VM 02 on host 2" --nicproperty&lt;y&gt; sport=10002
-        VBoxManage modifyvm "VM 02 on host 2" --nicproperty&lt;y&gt; dport=10001</screen>
+        VBoxManage modifyvm "VM 02 on host 2" --nic-generic-drv&lt;y&gt; UDPTunnel
+        VBoxManage modifyvm "VM 02 on host 2" --nic-property&lt;y&gt; dest=10.0.0.1
+        VBoxManage modifyvm "VM 02 on host 2" --nic-property&lt;y&gt; sport=10002
+        VBoxManage modifyvm "VM 02 on host 2" --nic-property&lt;y&gt; dport=10001</screen>
 
     <para>
@@ -1353 +1353 @@
 <screen>VBoxManage modifyvm "VM name" --nic&lt;x&gt; generic</screen>
 
-<screen>VBoxManage modifyvm "VM name" --nicgenericdrv&lt;x&gt; VDE</screen>
+<screen>VBoxManage modifyvm "VM name" --nic-generic-drv&lt;x&gt; VDE</screen>
 
         <para>
@@ -1359 +1359 @@
         </para>
 
-<screen>VBoxManage modifyvm "VM name" --nicproperty&lt;x&gt; network=/tmp/switch1</screen>
+<screen>VBoxManage modifyvm "VM name" --nic-property&lt;x&gt; network=/tmp/switch1</screen>
 
         <para>
@@ -1366 +1366 @@
         </para>
 
-<screen>VBoxManage modifyvm "VM name" --nicproperty&lt;x&gt; network=/tmp/switch1[&lt;n&gt;]</screen>
+<screen>VBoxManage modifyvm "VM name" --nic-property&lt;x&gt; network=/tmp/switch1[&lt;n&gt;]</screen>
 
         <para>

trunk/doc/manual/en_US/user_Technical.xml

@@ -908 +908 @@
           and overhead. This can yield a performance improvement of up
           to 5%. To enable this feature for a VM, you use the
-          <command>VBoxManage modifyvm --largepages</command> command.
+          <command>VBoxManage modifyvm --large-pages</command> command.
           See <xref linkend="vboxmanage-modifyvm" />.
         </para>
@@ -929 +929 @@
         <para>
           To enable these features for a VM, you use the
-          <command>VBoxManage modifyvm --vtxvpid</command> and
-          <command>VBoxManage modifyvm --largepages</command> commands.
+          <command>VBoxManage modifyvm --vtx-vpid</command> and
+          <command>VBoxManage modifyvm --large-pages</command> commands.
           See <xref linkend="vboxmanage-modifyvm" />.
         </para>

trunk/doc/manual/en_US/user_VBoxManage.xml

@@ -744 +744 @@
           <computeroutput>0</computeroutput> means port 3389, the
           standard port for RDP. See the description for the
-          <computeroutput>--vrdeport</computeroutput> option in
-          <xref
-        linkend="vboxmanage-modifyvm-vrde" />.
+          <computeroutput>--vrde-port</computeroutput> option in
+          <xref  linkend="vboxmanage-modifyvm-vrde" />.
         </para>
       </listitem>
@@ -767 +766 @@
               <computeroutput>0</computeroutput> means port 3389, the
               standard port for RDP. See the description for the
-              <computeroutput>--vrdeport</computeroutput> option in
-              <xref
-            linkend="vboxmanage-modifyvm-vrde" />.
+              <computeroutput>--vrde-port</computeroutput> option in
+              <xref linkend="vboxmanage-modifyvm-vrde" />.
             </para>
           </listitem>
@@ -779 +777 @@
               specified, the server will accept connections only on the
               specified host network interface. See the description for
-              the <computeroutput>--vrdeaddress</computeroutput> option
-              in
-              <xref
-            linkend="vboxmanage-modifyvm-vrde" />.
+              the <computeroutput>--vrde-address</computeroutput> option
+              in <xref linkend="vboxmanage-modifyvm-vrde" />.
             </para>
           </listitem>

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h

@@ -75 +75 @@
 }
 #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 }
 
 

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -93 +93 @@
     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 +254 @@
 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 +787 @@
 
             case MODIFYVM_SETCPUID:
-            case MODIFYVM_SETCPUID_OLD:
             {
                 uint32_t const idx    = c == MODIFYVM_SETCPUID ?  ValueUnion.PairU32.uFirst  : ValueUnion.u32;