Commit 52c233a4 authored by Radim Krčmář's avatar Radim Krčmář Committed by Paolo Bonzini
Browse files

KVM: x86: return bool from kvm_apic_match*() 



And don't export the internal ones while at it.

Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 843e4330

arch/x86/kvm/ioapic.h

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static inline struct kvm_ioapic *ioapic_irqchip(struct kvm *kvm) 
}



void kvm_rtc_eoi_tracking_restore_one(struct kvm_vcpu *vcpu);

int kvm_apic_match_dest(struct kvm_vcpu *vcpu, struct kvm_lapic *source,

bool kvm_apic_match_dest(struct kvm_vcpu *vcpu, struct kvm_lapic *source,

		int short_hand, unsigned int dest, int dest_mode);

int kvm_apic_compare_prio(struct kvm_vcpu *vcpu1, struct kvm_vcpu *vcpu2);

void kvm_ioapic_update_eoi(struct kvm_vcpu *vcpu, int vector,

arch/x86/kvm/lapic.c

+4 −4
Original line number Diff line number Diff line
@@ -578,18 +578,18 @@ static void apic_set_tpr(struct kvm_lapic *apic, u32 tpr) 
	apic_update_ppr(apic);

}



static int kvm_apic_broadcast(struct kvm_lapic *apic, u32 dest)

static bool kvm_apic_broadcast(struct kvm_lapic *apic, u32 dest)

{

	return dest == (apic_x2apic_mode(apic) ?

			X2APIC_BROADCAST : APIC_BROADCAST);

}



int kvm_apic_match_physical_addr(struct kvm_lapic *apic, u32 dest)

static bool kvm_apic_match_physical_addr(struct kvm_lapic *apic, u32 dest)

{

	return kvm_apic_id(apic) == dest || kvm_apic_broadcast(apic, dest);

}



int kvm_apic_match_logical_addr(struct kvm_lapic *apic, u32 mda)

static bool kvm_apic_match_logical_addr(struct kvm_lapic *apic, u32 mda)

{

	int result = 0;

	u32 logical_id;
@@ -623,7 +623,7 @@ int kvm_apic_match_logical_addr(struct kvm_lapic *apic, u32 mda) 
	return result;

}



int kvm_apic_match_dest(struct kvm_vcpu *vcpu, struct kvm_lapic *source,

bool kvm_apic_match_dest(struct kvm_vcpu *vcpu, struct kvm_lapic *source,

			   int short_hand, unsigned int dest, int dest_mode)

{

	int result = 0;

arch/x86/kvm/lapic.h

+0 −2
Original line number Diff line number Diff line
@@ -58,8 +58,6 @@ void kvm_apic_set_version(struct kvm_vcpu *vcpu); 


void kvm_apic_update_tmr(struct kvm_vcpu *vcpu, u32 *tmr);

void kvm_apic_update_irr(struct kvm_vcpu *vcpu, u32 *pir);

int kvm_apic_match_physical_addr(struct kvm_lapic *apic, u32 dest);

int kvm_apic_match_logical_addr(struct kvm_lapic *apic, u32 mda);

int kvm_apic_set_irq(struct kvm_vcpu *vcpu, struct kvm_lapic_irq *irq,

		unsigned long *dest_map);

int kvm_apic_local_deliver(struct kvm_lapic *apic, int lvt_type);