| Message ID | 1247753019-11412-3-git-send-email-gleb@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Jul 16, 2009 at 05:03:30PM +0300, Gleb Natapov wrote: > > Signed-off-by: Gleb Natapov <gleb@redhat.com> > --- > arch/x86/kvm/i8254.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c > index 137e548..472653c 100644 > --- a/arch/x86/kvm/i8254.c > +++ b/arch/x86/kvm/i8254.c > @@ -672,6 +672,8 @@ void kvm_free_pit(struct kvm *kvm) > if (kvm->arch.vpit) { > kvm_unregister_irq_mask_notifier(kvm, 0, > &kvm->arch.vpit->mask_notifier); > + kvm_unregister_irq_ack_notifier(kvm, > + &kvm->arch.vpit->pit_state.irq_ack_notifier); > mutex_lock(&kvm->arch.vpit->pit_state.lock); > timer = &kvm->arch.vpit->pit_state.pit_timer.timer; > hrtimer_cancel(timer); Applied this one. I suppose you're reworking the lockless patchset to include the PIC irq ack changes? (as discussed the pic_unlock trick with vcpu_kick is not necessary anymore etc). Just please if you have any fixes, send them separately so backporting to -stable is easier. Thanks -- 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
On Tue, Jul 21, 2009 at 02:16:43PM -0300, Marcelo Tosatti wrote: > On Thu, Jul 16, 2009 at 05:03:30PM +0300, Gleb Natapov wrote: > > > > Signed-off-by: Gleb Natapov <gleb@redhat.com> > > --- > > arch/x86/kvm/i8254.c | 2 ++ > > 1 files changed, 2 insertions(+), 0 deletions(-) > > > > diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c > > index 137e548..472653c 100644 > > --- a/arch/x86/kvm/i8254.c > > +++ b/arch/x86/kvm/i8254.c > > @@ -672,6 +672,8 @@ void kvm_free_pit(struct kvm *kvm) > > if (kvm->arch.vpit) { > > kvm_unregister_irq_mask_notifier(kvm, 0, > > &kvm->arch.vpit->mask_notifier); > > + kvm_unregister_irq_ack_notifier(kvm, > > + &kvm->arch.vpit->pit_state.irq_ack_notifier); > > mutex_lock(&kvm->arch.vpit->pit_state.lock); > > timer = &kvm->arch.vpit->pit_state.pit_timer.timer; > > hrtimer_cancel(timer); > > Applied this one. > > I suppose you're reworking the lockless patchset to include the PIC irq > ack changes? (as discussed the pic_unlock trick with vcpu_kick is not > necessary anymore etc). > Fixed all of this already. Want them as separate patch series? I did them on my irq branch but they are good for master too. > Just please if you have any fixes, send them separately so backporting > to -stable is easier. > -- Gleb. -- 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
diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c index 137e548..472653c 100644 --- a/arch/x86/kvm/i8254.c +++ b/arch/x86/kvm/i8254.c @@ -672,6 +672,8 @@ void kvm_free_pit(struct kvm *kvm) if (kvm->arch.vpit) { kvm_unregister_irq_mask_notifier(kvm, 0, &kvm->arch.vpit->mask_notifier); + kvm_unregister_irq_ack_notifier(kvm, + &kvm->arch.vpit->pit_state.irq_ack_notifier); mutex_lock(&kvm->arch.vpit->pit_state.lock); timer = &kvm->arch.vpit->pit_state.pit_timer.timer; hrtimer_cancel(timer);
Signed-off-by: Gleb Natapov <gleb@redhat.com> --- arch/x86/kvm/i8254.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)