[PATCH 0/2] Use more of VIR_XPATH_NODE_AUTORESTORE