[VirtualBox/f25] (5 commits) ...Refactor the patch