Commit ac8ef992 authored by Peter Xu's avatar Peter Xu Committed by Paolo Bonzini

KVM: X86: Drop KVM_APIC_SHORT_MASK and KVM_APIC_DEST_MASK

We have both APIC_SHORT_MASK and KVM_APIC_SHORT_MASK defined for the
shorthand mask.  Similarly, we have both APIC_DEST_MASK and
KVM_APIC_DEST_MASK defined for the destination mode mask.

Drop the KVM_APIC_* macros and replace the only user of them to use
the APIC_DEST_* macros instead.  At the meantime, move APIC_SHORT_MASK
and APIC_DEST_MASK from lapic.c to lapic.h.
Reviewed-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent c96001c5
...@@ -56,9 +56,6 @@ ...@@ -56,9 +56,6 @@
#define APIC_VERSION (0x14UL | ((KVM_APIC_LVT_NUM - 1) << 16)) #define APIC_VERSION (0x14UL | ((KVM_APIC_LVT_NUM - 1) << 16))
#define LAPIC_MMIO_LENGTH (1 << 12) #define LAPIC_MMIO_LENGTH (1 << 12)
/* followed define is not in apicdef.h */ /* followed define is not in apicdef.h */
#define APIC_SHORT_MASK 0xc0000
#define APIC_DEST_NOSHORT 0x0
#define APIC_DEST_MASK 0x800
#define MAX_APIC_VECTOR 256 #define MAX_APIC_VECTOR 256
#define APIC_VECTORS_PER_REG 32 #define APIC_VECTORS_PER_REG 32
......
...@@ -10,8 +10,9 @@ ...@@ -10,8 +10,9 @@
#define KVM_APIC_SIPI 1 #define KVM_APIC_SIPI 1
#define KVM_APIC_LVT_NUM 6 #define KVM_APIC_LVT_NUM 6
#define KVM_APIC_SHORT_MASK 0xc0000 #define APIC_SHORT_MASK 0xc0000
#define KVM_APIC_DEST_MASK 0x800 #define APIC_DEST_NOSHORT 0x0
#define APIC_DEST_MASK 0x800
#define APIC_BUS_CYCLE_NS 1 #define APIC_BUS_CYCLE_NS 1
#define APIC_BUS_FREQUENCY (1000000000ULL / APIC_BUS_CYCLE_NS) #define APIC_BUS_FREQUENCY (1000000000ULL / APIC_BUS_CYCLE_NS)
......
...@@ -4519,9 +4519,9 @@ static int avic_incomplete_ipi_interception(struct vcpu_svm *svm) ...@@ -4519,9 +4519,9 @@ static int avic_incomplete_ipi_interception(struct vcpu_svm *svm)
*/ */
kvm_for_each_vcpu(i, vcpu, kvm) { kvm_for_each_vcpu(i, vcpu, kvm) {
bool m = kvm_apic_match_dest(vcpu, apic, bool m = kvm_apic_match_dest(vcpu, apic,
icrl & KVM_APIC_SHORT_MASK, icrl & APIC_SHORT_MASK,
GET_APIC_DEST_FIELD(icrh), GET_APIC_DEST_FIELD(icrh),
icrl & KVM_APIC_DEST_MASK); icrl & APIC_DEST_MASK);
if (m && !avic_vcpu_is_running(vcpu)) if (m && !avic_vcpu_is_running(vcpu))
kvm_vcpu_wake_up(vcpu); kvm_vcpu_wake_up(vcpu);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment