[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/9] kvm: create kvmclock when one of the flags are
From: |
Marcelo Tosatti |
Subject: |
[Qemu-devel] [PATCH 4/9] kvm: create kvmclock when one of the flags are present |
Date: |
Mon, 2 May 2011 15:32:40 -0300 |
From: Glauber Costa <address@hidden>
kvmclock presence can be signalled by two different flags. So for
device creation, we have to test for both.
Signed-off-by: Glauber Costa <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
---
hw/kvmclock.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/hw/kvmclock.c b/hw/kvmclock.c
index b6ceddf..004c4ad 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);
}
}
--
1.7.4.4
- [Qemu-devel] [PATCH 0/9] [PULL] qemu-kvm.git uq/master queue, Marcelo Tosatti, 2011/05/02
- [Qemu-devel] [PATCH 9/9] kvm: use qemu_free consistently, Marcelo Tosatti, 2011/05/02
- [Qemu-devel] [PATCH 1/9] kvm: use kernel-provided para_features instead of statically coming up with new capabilities, Marcelo Tosatti, 2011/05/02
- [Qemu-devel] [PATCH 3/9] kvm: add kvmclock to its second bit, Marcelo Tosatti, 2011/05/02
- [Qemu-devel] [PATCH 7/9] kvm: Install specialized interrupt handler, Marcelo Tosatti, 2011/05/02
- [Qemu-devel] [PATCH 8/9] fix crash in migration, 32-bit userspace on 64-bit host, Marcelo Tosatti, 2011/05/02
- [Qemu-devel] [PATCH 2/9] x86: Allow multiple cpu feature matches of lookup_feature, Marcelo Tosatti, 2011/05/02
- [Qemu-devel] [PATCH 6/9] Redirect cpu_interrupt to callback handler, Marcelo Tosatti, 2011/05/02
- [Qemu-devel] [PATCH 4/9] kvm: create kvmclock when one of the flags are present,
Marcelo Tosatti <=
- [Qemu-devel] [PATCH 5/9] Break up user and system cpu_interrupt implementations, Marcelo Tosatti, 2011/05/02
- Re: [Qemu-devel] [PATCH 0/9] [PULL] qemu-kvm.git uq/master queue, Anthony Liguori, 2011/05/02