Make -machine/-enable-kvm options merge into a single list