From patchwork Wed Dec 10 16:23:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 5470971 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 C5C4D9F30B for ; Wed, 10 Dec 2014 16:59:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E112620172 for ; Wed, 10 Dec 2014 16:59:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CE46120166 for ; Wed, 10 Dec 2014 16:59:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932247AbaLJQ7J (ORCPT ); Wed, 10 Dec 2014 11:59:09 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54564 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932227AbaLJQ7H (ORCPT ); Wed, 10 Dec 2014 11:59:07 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sBAGx6nF025619 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 10 Dec 2014 11:59:06 -0500 Received: from amt.cnet (vpn1-5-156.gru2.redhat.com [10.97.5.156]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id sBAGx56a019121; Wed, 10 Dec 2014 11:59:05 -0500 Received: from amt.cnet (localhost [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id 1144610092B; Wed, 10 Dec 2014 14:58:48 -0200 (BRST) Received: (from marcelo@localhost) by amt.cnet (8.14.7/8.14.7/Submit) id sBAGwlPK019552; Wed, 10 Dec 2014 14:58:47 -0200 Message-Id: <20141210162420.149256493@amt.cnet> User-Agent: quilt/0.60-1 Date: Wed, 10 Dec 2014 14:23:18 -0200 From: Marcelo Tosatti To: kvm@vger.kernel.org, qemu-devel@nongnu.org Cc: Luiz Capitulino , Rik van Riel , Paolo Bonzini , Marcelo Tosatti Subject: [QEMU patch 1/2] kvm: sync kernel headers References: <20141210162317.370733848@amt.cnet> Content-Disposition: inline; filename=linux-headers-update X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Signed-off-by: Marcelo Tosatti --- linux-headers/asm-x86/kvm.h | 5 +++++ linux-headers/linux/kvm.h | 14 +++----------- 2 files changed, 8 insertions(+), 11 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: qemu/linux-headers/asm-x86/kvm.h =================================================================== --- qemu.orig/linux-headers/asm-x86/kvm.h 2014-12-08 17:54:33.647488264 -0200 +++ qemu/linux-headers/asm-x86/kvm.h 2014-12-09 13:27:20.749752962 -0200 @@ -277,6 +277,11 @@ __u8 reserved[31]; }; +struct kvm_tscdeadline_advance { + __u32 timer_advance; + __u32 reserved[3]; +}; + /* When set in flags, include corresponding fields on KVM_SET_VCPU_EVENTS */ #define KVM_VCPUEVENT_VALID_NMI_PENDING 0x00000001 #define KVM_VCPUEVENT_VALID_SIPI_VECTOR 0x00000002 Index: qemu/linux-headers/linux/kvm.h =================================================================== --- qemu.orig/linux-headers/linux/kvm.h 2014-12-08 17:54:33.647488264 -0200 +++ qemu/linux-headers/linux/kvm.h 2014-12-09 13:27:20.750752961 -0200 @@ -761,6 +753,7 @@ #define KVM_CAP_PPC_FIXUP_HCALL 103 #define KVM_CAP_PPC_ENABLE_HCALL 104 #define KVM_CAP_CHECK_EXTENSION_VM 105 +#define KVM_CAP_TSCDEADLINE_ADVANCE 106 #ifdef KVM_CAP_IRQ_ROUTING @@ -1061,6 +1054,8 @@ #define KVM_GET_DEVICE_ATTR _IOW(KVMIO, 0xe2, struct kvm_device_attr) #define KVM_HAS_DEVICE_ATTR _IOW(KVMIO, 0xe3, struct kvm_device_attr) +#define KVM_SET_TSCDEADLINE_ADVANCE _IOW(KVMIO, 0xe4, struct kvm_tscdeadline_advance) + /* * ioctls for vcpu fds */