From patchwork Sat Jun 5 14:58:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 104466 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o55ExFBq002350 for ; Sat, 5 Jun 2010 14:59:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933437Ab0FEO7M (ORCPT ); Sat, 5 Jun 2010 10:59:12 -0400 Received: from zion.dlh.net ([91.198.192.1]:51858 "EHLO mail.dlh.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933449Ab0FEO7L convert rfc822-to-8bit (ORCPT ); Sat, 5 Jun 2010 10:59:11 -0400 Received: from [82.141.21.121] (helo=peter-lievens-macbook-pro.fritz.box) by mail.dlh.net with asmtp (Exim 3.36 #24 (Debian)) id 1OKupO-0001ob-00; Sat, 05 Jun 2010 16:58:26 +0200 Subject: Re: porting fixes regarding kvm-clock and lost irqs to stable qemu-kvm 0.12.4 Mime-Version: 1.0 (Apple Message framework v1078) From: Peter Lieven In-Reply-To: <4C09A9BF.8090107@debian.org> Date: Sat, 5 Jun 2010 16:58:25 +0200 Cc: Marcelo Tosatti , Avi Kivity , Anthony Liguori , "kvm@vger.kernel.org" Message-Id: <7A6F5B41-DAE6-4D4E-8D3A-28147BB5BE78@dlh.net> References: <4C06751A.4080507@dlh.net> <20100604153102.GB11087@amt.cnet> <17DE5732-EDBF-4C7B-9C45-6BF66F200911@dlh.net> <4C09A9BF.8090107@debian.org> To: Faidon Liambotis X-Mailer: Apple Mail (2.1078) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sat, 05 Jun 2010 14:59:15 +0000 (UTC) diff -ur qemu-kvm-0.12.4.orig/qemu-kvm-x86.c qemu-kvm-0.12.4/qemu-kvm-x86.c --- qemu-kvm-0.12.4.orig/qemu-kvm-x86.c 2010-05-09 13:05:19.000000000 +0200 +++ qemu-kvm-0.12.4/qemu-kvm-x86.c 2010-06-02 18:18:53.000000000 +0200 @@ -1240,7 +1240,7 @@ int feature; } para_features[] = { #ifdef KVM_CAP_CLOCKSOURCE - { KVM_CAP_CLOCKSOURCE, KVM_FEATURE_CLOCKSOURCE }, +// { KVM_CAP_CLOCKSOURCE, KVM_FEATURE_CLOCKSOURCE }, #endif #ifdef KVM_CAP_NOP_IO_DELAY { KVM_CAP_NOP_IO_DELAY, KVM_FEATURE_NOP_IO_DELAY },