From patchwork Sat Mar 20 03:20:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Wang X-Patchwork-Id: 87069 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 o2K3KMGf019953 for ; Sat, 20 Mar 2010 03:20:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752761Ab0CTDUU (ORCPT ); Fri, 19 Mar 2010 23:20:20 -0400 Received: from mail-gx0-f217.google.com ([209.85.217.217]:57000 "EHLO mail-gx0-f217.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752600Ab0CTDUT (ORCPT ); Fri, 19 Mar 2010 23:20:19 -0400 Received: by gxk9 with SMTP id 9so2186337gxk.8 for ; Fri, 19 Mar 2010 20:20:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=guaYERcHzpg1rg/ivOSOGQQXUok+4F4LI94Nd+nfWvo=; b=bn/ZXh/Bb0hpN7FHy1k+o3+mg3nC+7V/sMUE1QH/OW79GviD4X3/NgD2xKA1P+gz1+ WpUSB4mxP+EQxbdrEWP+WqMh7bmnNBMkXg7EN5inohn1sjGLisY+MyDQ+AOUTV0bbbmD rgUXKY5+NXrfaQUScFAllNGpnjcoftK8dAX48= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=jEZOcqt7cPnTfivdeu5yIUsaPvGmh3MivNRtWkg+RLYTx0wmpggAp3RxQvqhJbt2UV VVE7hLpcAVShv4t21CMiGtBj5tWBtniFR4SFe7P1TlSfl03RMruKUNHudvB1el/OAdzP IgcaWBDRt2FI9IezR0+qEilHWd70+s2sO/fUc= Received: by 10.101.46.14 with SMTP id y14mr34806anj.132.1269055217336; Fri, 19 Mar 2010 20:20:17 -0700 (PDT) Received: from localhost.localdomain ([114.249.21.188]) by mx.google.com with ESMTPS id 9sm615435ywf.35.2010.03.19.20.20.13 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 19 Mar 2010 20:20:16 -0700 (PDT) From: Xiao Wang To: avi@redhat.com, mtosatti@redhat.com Cc: kvm@vger.kernel.org, akong@redhat.com, Xiao Wang Subject: [PATCH] KVM: Drop KVM_REQ_PENDING_TIMER Date: Sat, 20 Mar 2010 11:20:02 +0800 Message-Id: <1269055202-3195-1-git-send-email-sirouni@gmail.com> X-Mailer: git-send-email 1.6.3.3 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, 20 Mar 2010 03:20:22 +0000 (UTC) diff --git a/arch/x86/kvm/timer.c b/arch/x86/kvm/timer.c index eea4043..3aa09a6 100644 --- a/arch/x86/kvm/timer.c +++ b/arch/x86/kvm/timer.c @@ -16,8 +16,6 @@ static int __kvm_timer_fn(struct kvm_vcpu *vcpu, struct kvm_timer *ktimer) */ if (ktimer->reinject || !atomic_read(&ktimer->pending)) { atomic_inc(&ktimer->pending); - /* FIXME: this code should not know anything about vcpus */ - set_bit(KVM_REQ_PENDING_TIMER, &vcpu->requests); } if (waitqueue_active(q)) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index bcf52d1..a4baab4 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -4444,7 +4444,6 @@ static int __vcpu_run(struct kvm_vcpu *vcpu) if (r <= 0) break; - clear_bit(KVM_REQ_PENDING_TIMER, &vcpu->requests); if (kvm_cpu_has_pending_timer(vcpu)) kvm_inject_pending_timer_irqs(vcpu); diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index a3fd0f9..592c04b 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -33,12 +33,11 @@ #define KVM_REQ_REPORT_TPR_ACCESS 2 #define KVM_REQ_MMU_RELOAD 3 #define KVM_REQ_TRIPLE_FAULT 4 -#define KVM_REQ_PENDING_TIMER 5 -#define KVM_REQ_UNHALT 6 -#define KVM_REQ_MMU_SYNC 7 -#define KVM_REQ_KVMCLOCK_UPDATE 8 -#define KVM_REQ_KICK 9 -#define KVM_REQ_DEACTIVATE_FPU 10 +#define KVM_REQ_UNHALT 5 +#define KVM_REQ_MMU_SYNC 6 +#define KVM_REQ_KVMCLOCK_UPDATE 7 +#define KVM_REQ_KICK 8 +#define KVM_REQ_DEACTIVATE_FPU 9 #define KVM_USERSPACE_IRQ_SOURCE_ID 0