From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=54313 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q0Lta-0001w8-JV for qemu-devel@nongnu.org; Thu, 17 Mar 2011 18:42:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q0LtZ-0002jW-Fk for qemu-devel@nongnu.org; Thu, 17 Mar 2011 18:42:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6046) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q0LtZ-0002jM-48 for qemu-devel@nongnu.org; Thu, 17 Mar 2011 18:42:17 -0400 From: Glauber Costa Date: Thu, 17 Mar 2011 19:42:07 -0300 Message-Id: <1300401727-5235-4-git-send-email-glommer@redhat.com> In-Reply-To: <1300401727-5235-1-git-send-email-glommer@redhat.com> References: <1300401727-5235-1-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH 3/3] don't create kvmclock when one of the flags are present. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kvm@vger.kernel.org Cc: mtosatti@redhat.com, qemu-devel@nongnu.org, avi@redhat.com kvmclock presence can be signalled by two different flags. So for device creation, we have to test for both. Signed-off-by: Glauber Costa --- 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.2.3