Given the simplifications to the code in the previous patches, this
is now very simple to do.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>