These fixes resolve an occasional hang and and recv error messages seen when
running with upstream libvirt.
The recv error message is the same one seen in the test run from March 25th on
KVM on Fedora rawhide:
"libvir: Remote error : cannot recv data: Connection reset by peer"