From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756720AbcBIOFt (ORCPT ); Tue, 9 Feb 2016 09:05:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33737 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756139AbcBIOFs (ORCPT ); Tue, 9 Feb 2016 09:05:48 -0500 Date: Tue, 9 Feb 2016 15:05:45 +0100 From: Radim =?utf-8?B?S3LEjW3DocWZ?= To: Paolo Bonzini Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Subject: Re: [PATCH 2/3] KVM: x86: consolidate "has lapic" checks into irq.c Message-ID: <20160209140543.GB30378@potion.brq.redhat.com> References: <1454948146-35353-1-git-send-email-pbonzini@redhat.com> <1454948146-35353-3-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1454948146-35353-3-git-send-email-pbonzini@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2016-02-08 17:15+0100, Paolo Bonzini: > Do for kvm_cpu_has_pending_timer and kvm_inject_pending_timer_irqs > what the other irq.c routines have been doing. > > Signed-off-by: Paolo Bonzini > --- > diff --git a/arch/x86/kvm/irq.c b/arch/x86/kvm/irq.c > @@ -33,7 +33,10 @@ > */ > int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu) > { > - return apic_has_pending_timer(vcpu); > + if (lapic_in_kernel(vcpu)) > + return apic_has_pending_timer(vcpu); > + > + return true; Apart from int/bool mismatch, it returned 0 before and that was correct.