Rebase on qemu.org master branch.

Signed-off-by: Oleg Girko <oleg.girko@jolla.com>