As we have two guests running, just pass always who we want to send a
message to.  Once there, refactor return_or_event() into wait_command.
Signed-off-by: NJuan Quintela <quintela@redhat.com>
Reviewed-by: NDr. David Alan Gilbert <dgilbert@redhat.com>