From: Marcelo Tosatti <mtosatti@redhat.com>
To: kvm@vger.kernel.org
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Subject: [patch 7/8] KVM: PIT: removed unused code
Date: Sun, 05 Jul 2009 22:55:18 -0300 [thread overview]
Message-ID: <20090706015813.109958204@localhost.localdomain> (raw)
In-Reply-To: 20090706015511.923596553@localhost.localdomain
[-- Attachment #1: kvm-cleanup-pit --]
[-- Type: text/plain, Size: 1920 bytes --]
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Index: kvm-new/arch/x86/kvm/i8254.c
===================================================================
--- kvm-new.orig/arch/x86/kvm/i8254.c
+++ kvm-new/arch/x86/kvm/i8254.c
@@ -228,10 +228,7 @@ static void kvm_pit_ack_irq(struct kvm_i
{
struct kvm_kpit_state *ps = container_of(kian, struct kvm_kpit_state,
irq_ack_notifier);
- spin_lock(&ps->inject_lock);
kvm_timer_ack(&ps->pit_timer);
- ps->irq_ack = 1;
- spin_unlock(&ps->inject_lock);
}
static void destroy_pit_timer(struct kvm_timer *pt)
@@ -252,7 +249,6 @@ static void create_pit_timer(struct kvm_
/* TODO The new value only affected after the retriggered */
kvm_timer_cancel(pt);
- ps->irq_ack = 1;
kvm_timer_start(pt, interval, is_period);
}
@@ -516,17 +512,14 @@ static void kvm_pit_reset(struct kvm_pit
mutex_unlock(&pit->pit_state.lock);
kvm_timer_reset(&pit->pit_state.pit_timer);
- pit->pit_state.irq_ack = 1;
}
static void pit_mask_notifer(struct kvm_irq_mask_notifier *kimn, bool mask)
{
struct kvm_pit *pit = container_of(kimn, struct kvm_pit, mask_notifier);
- if (!mask) {
+ if (!mask)
kvm_timer_reset(&pit->pit_state.pit_timer);
- pit->pit_state.irq_ack = 1;
- }
}
static const struct kvm_io_device_ops pit_dev_ops = {
@@ -587,7 +580,6 @@ struct kvm_pit *kvm_create_pit(struct kv
mutex_init(&pit->pit_state.lock);
mutex_lock(&pit->pit_state.lock);
- spin_lock_init(&pit->pit_state.inject_lock);
kvm->arch.vpit = pit;
pit->kvm = kvm;
Index: kvm-new/arch/x86/kvm/i8254.h
===================================================================
--- kvm-new.orig/arch/x86/kvm/i8254.h
+++ kvm-new/arch/x86/kvm/i8254.h
@@ -25,8 +25,6 @@ struct kvm_kpit_state {
u32 speaker_data_on;
struct mutex lock;
struct kvm_pit *pit;
- spinlock_t inject_lock;
- unsigned long irq_ack;
struct kvm_irq_ack_notifier irq_ack_notifier;
};
--
next prev parent reply other threads:[~2009-07-06 20:01 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-06 1:55 [patch 0/8] RFC: in-kernel timer emulation changes Marcelo Tosatti
2009-07-06 1:55 ` [patch 1/8] KVM: timer interface unification Marcelo Tosatti
2009-07-08 13:33 ` Avi Kivity
2009-07-06 1:55 ` [patch 2/8] KVM: move lapic timer ack to EOI handler Marcelo Tosatti
2009-07-06 1:55 ` [patch 3/8] KVM: x86: per-vcpu timer list Marcelo Tosatti
2009-07-06 1:55 ` [patch 4/8] KVM: x86: replace hrtimer based timer emulation Marcelo Tosatti
2009-07-08 12:58 ` Gleb Natapov
2009-07-08 13:17 ` Marcelo Tosatti
2009-07-08 13:39 ` Gleb Natapov
2009-07-08 15:42 ` Marcelo Tosatti
2009-07-08 16:13 ` Gleb Natapov
2009-07-08 16:29 ` Gleb Natapov
2009-07-08 16:37 ` Marcelo Tosatti
2009-07-08 16:40 ` Gleb Natapov
2009-07-08 16:47 ` Marcelo Tosatti
2009-07-08 13:41 ` Avi Kivity
2009-07-08 16:24 ` Marcelo Tosatti
2009-07-08 16:36 ` Avi Kivity
2009-07-06 1:55 ` [patch 5/8] KVM: timer: honor noreinject tunable Marcelo Tosatti
2009-07-06 1:55 ` [patch 6/8] KVM: timer: optimize next_timer_event and vcpu_arm_exit Marcelo Tosatti
2009-07-06 1:55 ` Marcelo Tosatti [this message]
2009-07-06 1:55 ` [patch 8/8] kvmctl: time testcase Marcelo Tosatti
2009-07-08 13:43 ` [patch 0/8] RFC: in-kernel timer emulation changes Avi Kivity
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090706015813.109958204@localhost.localdomain \
--to=mtosatti@redhat.com \
--cc=kvm@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).