hypervisor/kvm: revert 7b7d2e5e27bd7ffd01d9a5595642e9a9f4054c78.
Merge branch 'feature-kvm-opts'