move drive_type/nic_driver to box-ctl.sh.
Merge branch 'fix-virtio-opts'
Merge branch 'master' into fix-virtio-opts
add "cpu_type" to box-ctl.sh.
Merge branch 'fix-virtio-opts'