Xen single step upstream sync

dont merge right away, let's review