This reverts commit d7234f4d.

Conflicts:

	hw/xen_machine_pv.c

This should have never been committed.
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>