cli serve: fix a forgetting-to-block bug

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
cli: serve: add '--source-fd X' argument support

This will be easier for xapi to use.

Signed-off-by: David Scott <dave.scott@eu.citrix.com>