Merge branch 'perf'

Signed-off-by: Avi Kivity <avi@redhat.com>