Virt patch which had to be backed-out is enabled again, along with the patch to fix the compilation issues.
Zbigniew Jędrzejewski-Szmek