From 450fb75c478aa4134bc1e6b1655791c0a39ad141 Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Thu, 17 Mar 2011 19:42:07 -0300 Subject: kvm: create kvmclock when one of the flags are present kvmclock presence can be signalled by two different flags. So for device creation, we have to test for both. Signed-off-by: Glauber Costa Signed-off-by: Avi Kivity --- hw/kvmclock.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/kvmclock.c b/hw/kvmclock.c index b6ceddfba..004c4add8 100644 --- a/hw/kvmclock.c +++ b/hw/kvmclock.c @@ -103,7 +103,11 @@ static SysBusDeviceInfo kvmclock_info = { void kvmclock_create(void) { if (kvm_enabled() && - first_cpu->cpuid_kvm_features & (1ULL << KVM_FEATURE_CLOCKSOURCE)) { + first_cpu->cpuid_kvm_features & ((1ULL << KVM_FEATURE_CLOCKSOURCE) +#ifdef KVM_FEATURE_CLOCKSOURCE2 + || (1ULL << KVM_FEATURE_CLOCKSOURCE2) +#endif + )) { sysbus_create_simple("kvmclock", -1, NULL); } } -- cgit v1.2.3