Merge remote-tracking branch 'afaerber/qom-cpu' into staging Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> * afaerber/qom-cpu: target-i386: cpu: fix --disable-kvm compilation