Something like this works for me. Did test each patch individualy as well. Had to do a fix to xenDaemonDomainLookupByID as it's behaviour did not reflect the documentation. As this is the only time it is called with uuid=NULL that I can see, I included this in the same patch.