Re-arrange wait_for_guest_boot to always close socket.

Signed-off-by: Chris Lalancette <clalancette@gmail.com>