From patchwork Wed Jan 29 17:11:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 3552811 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DCC939F382 for ; Wed, 29 Jan 2014 17:12:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E112220181 for ; Wed, 29 Jan 2014 17:12:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F1FB920160 for ; Wed, 29 Jan 2014 17:12:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752079AbaA2RLg (ORCPT ); Wed, 29 Jan 2014 12:11:36 -0500 Received: from mail-ee0-f41.google.com ([74.125.83.41]:52086 "EHLO mail-ee0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751702AbaA2RLf (ORCPT ); Wed, 29 Jan 2014 12:11:35 -0500 Received: by mail-ee0-f41.google.com with SMTP id e49so1065696eek.28 for ; Wed, 29 Jan 2014 09:11:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=YYjQ3Y06UQL4pYXNpRE/kHsACikr61jvMUdH5MroAtI=; b=qCiZ4RRXNb/ZkBSTX6pXIUAVHbutSDqy8laC70ZjjSBOgVOjAk+uVEm+kTlFoqk2im ViEuocS/c4FWuwEh3qcl73xKXbG+oa890qxLHiSdIh1ERcDnLjTnAsxPTme6bhPhX091 VmJOYf76p3y81F8hQDZaz/EdGWkQMotR/6Say+GY3mC1tYLLEh31MEyW1kAw8MWpgQJH 1AA/IVs5f7j9YvJ/8uqyXWoC36v7m/ylM7OgSI8ecpXyrBagwPdd73VIu2qvWaggnyOc k+nXfYfepeTXCi7MaN1dl2LIDI7Ml+XsjLmL15Qt46qYeGWT0kSKtkg32giQPSOr4DXF xcqQ== X-Received: by 10.14.8.131 with SMTP id 3mr68277eer.111.1391015493492; Wed, 29 Jan 2014 09:11:33 -0800 (PST) Received: from playground.lan (net-2-35-197-229.cust.vodafonedsl.it. [2.35.197.229]) by mx.google.com with ESMTPSA id w4sm11207831eef.20.2014.01.29.09.11.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Jan 2014 09:11:32 -0800 (PST) From: Paolo Bonzini To: linux-kernel@vger.kernel.org Cc: kvm@vger.kernel.org, gleb@kernel.org, Vadim Rozenfeld Subject: [PATCH] kvm: x86: move KVM_CAP_HYPERV_TIME outside #ifdef Date: Wed, 29 Jan 2014 18:11:27 +0100 Message-Id: <1391015487-1404-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Self explanatory. Reported-by: Radim Krcmar Cc: Vadim Rozenfeld Signed-off-by: Paolo Bonzini --- arch/x86/kvm/x86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 34d0d610aa8a..39c28f09dfd5 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -2616,10 +2616,10 @@ int kvm_dev_ioctl_check_extension(long ext) case KVM_CAP_GET_TSC_KHZ: case KVM_CAP_KVMCLOCK_CTRL: case KVM_CAP_READONLY_MEM: + case KVM_CAP_HYPERV_TIME: #ifdef CONFIG_KVM_DEVICE_ASSIGNMENT case KVM_CAP_ASSIGN_DEV_IRQ: case KVM_CAP_PCI_2_3: - case KVM_CAP_HYPERV_TIME: #endif r = 1; break;