No need to keep two separate conditions. A slight juggling of return
values is needed to accomodate virDomainObjWaitUntil.