Commit 150a84fe authored by Peter Xu's avatar Peter Xu Committed by Paolo Bonzini

KVM: X86: Convert the last users of "shorthand = 0" to use macros

Change the last users of "shorthand = 0" to use APIC_DEST_NOSHORT.
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 5c69d5c1
...@@ -330,7 +330,7 @@ static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val) ...@@ -330,7 +330,7 @@ static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val)
if (e->fields.delivery_mode == APIC_DM_FIXED) { if (e->fields.delivery_mode == APIC_DM_FIXED) {
struct kvm_lapic_irq irq; struct kvm_lapic_irq irq;
irq.shorthand = 0; irq.shorthand = APIC_DEST_NOSHORT;
irq.vector = e->fields.vector; irq.vector = e->fields.vector;
irq.delivery_mode = e->fields.delivery_mode << 8; irq.delivery_mode = e->fields.delivery_mode << 8;
irq.dest_id = e->fields.dest_id; irq.dest_id = e->fields.dest_id;
...@@ -379,7 +379,7 @@ static int ioapic_service(struct kvm_ioapic *ioapic, int irq, bool line_status) ...@@ -379,7 +379,7 @@ static int ioapic_service(struct kvm_ioapic *ioapic, int irq, bool line_status)
irqe.trig_mode = entry->fields.trig_mode; irqe.trig_mode = entry->fields.trig_mode;
irqe.delivery_mode = entry->fields.delivery_mode << 8; irqe.delivery_mode = entry->fields.delivery_mode << 8;
irqe.level = 1; irqe.level = 1;
irqe.shorthand = 0; irqe.shorthand = APIC_DEST_NOSHORT;
irqe.msi_redir_hint = false; irqe.msi_redir_hint = false;
if (irqe.trig_mode == IOAPIC_EDGE_TRIG) if (irqe.trig_mode == IOAPIC_EDGE_TRIG)
......
...@@ -121,7 +121,7 @@ void kvm_set_msi_irq(struct kvm *kvm, struct kvm_kernel_irq_routing_entry *e, ...@@ -121,7 +121,7 @@ void kvm_set_msi_irq(struct kvm *kvm, struct kvm_kernel_irq_routing_entry *e,
irq->msi_redir_hint = ((e->msi.address_lo irq->msi_redir_hint = ((e->msi.address_lo
& MSI_ADDR_REDIRECTION_LOWPRI) > 0); & MSI_ADDR_REDIRECTION_LOWPRI) > 0);
irq->level = 1; irq->level = 1;
irq->shorthand = 0; irq->shorthand = APIC_DEST_NOSHORT;
} }
EXPORT_SYMBOL_GPL(kvm_set_msi_irq); EXPORT_SYMBOL_GPL(kvm_set_msi_irq);
......
...@@ -7357,7 +7357,7 @@ static void kvm_pv_kick_cpu_op(struct kvm *kvm, unsigned long flags, int apicid) ...@@ -7357,7 +7357,7 @@ static void kvm_pv_kick_cpu_op(struct kvm *kvm, unsigned long flags, int apicid)
{ {
struct kvm_lapic_irq lapic_irq; struct kvm_lapic_irq lapic_irq;
lapic_irq.shorthand = 0; lapic_irq.shorthand = APIC_DEST_NOSHORT;
lapic_irq.dest_mode = APIC_DEST_PHYSICAL; lapic_irq.dest_mode = APIC_DEST_PHYSICAL;
lapic_irq.level = 0; lapic_irq.level = 0;
lapic_irq.dest_id = apicid; lapic_irq.dest_id = apicid;
......
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