[patch 6/7] Slightly re-org virt related configs