GitLab

commit 625422f6 upstream.

This reverts commit e098223b

,
which has a dependency on other commits being reverted.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>