Merge branch 'master' of git://git.qemu.org/qemu into qom-cpu Adapt header include paths. Signed-off-by: Andreas Färber <afaerber@suse.de>