3c3
< # Copyright (c) 2013 ARM Limited
---
> # Copyright (c) 2013, 2015 ARM Limited
1025,1026c1025
< have_kvm = conf.CheckHeader('linux/kvm.h', '<>') and \
< conf.CheckTypeSize('struct kvm_xsave', '#include <linux/kvm.h>') != 0
---
> have_kvm = conf.CheckHeader('linux/kvm.h', '<>')
1030a1030,1035
> # x86 needs support for xsave. We test for the structure here since we
> # won't be able to run new tests by the time we know which ISA we're
> # targeting.
> have_kvm_xsave = conf.CheckTypeSize('struct kvm_xsave',
> '#include <linux/kvm.h>') != 0
>
1033,1036d1037
< isa_comp_table = {
< "arm" : ( "armv7l" ),
< "x86" : ( "x86_64" ),
< }
1044c1045,1048
< return host_isa in isa_comp_table.get(isa, [])
---
> if not have_posix_timers:
> print "Warning: Can not enable KVM, host seems to lack support " \
> "for POSIX timers"
> return False
1045a1050,1054
> if isa == "arm":
> return host_isa == "armv7l"
> elif isa == "x86":
> if host_isa != "x86_64":
> return False
1046a1056,1064
> if not have_kvm_xsave:
> print "KVM on x86 requires xsave support in kernel headers."
> return False
>
> return True
> else:
> return False
>
>
1360,1363d1377
< elif not have_posix_timers:
< print "Warning: Can not enable KVM, host seems to lack support " \
< "for POSIX timers"
< env['USE_KVM'] = False