adjustment provides VIRT_POK conditional
Merge branch 'virt-cpu' into virt-bsp