Commit 70f93dae authored by Gleb Natapov's avatar Gleb Natapov Committed by Avi Kivity

KVM: Use temporary variable to shorten lines.

Cosmetic only. No logic is changed by this patch.
Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 0105d1a5
...@@ -103,6 +103,7 @@ static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val) ...@@ -103,6 +103,7 @@ static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val)
{ {
unsigned index; unsigned index;
bool mask_before, mask_after; bool mask_before, mask_after;
union kvm_ioapic_redirect_entry *e;
switch (ioapic->ioregsel) { switch (ioapic->ioregsel) {
case IOAPIC_REG_VERSION: case IOAPIC_REG_VERSION:
...@@ -122,19 +123,20 @@ static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val) ...@@ -122,19 +123,20 @@ static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val)
ioapic_debug("change redir index %x val %x\n", index, val); ioapic_debug("change redir index %x val %x\n", index, val);
if (index >= IOAPIC_NUM_PINS) if (index >= IOAPIC_NUM_PINS)
return; return;
mask_before = ioapic->redirtbl[index].fields.mask; e = &ioapic->redirtbl[index];
mask_before = e->fields.mask;
if (ioapic->ioregsel & 1) { if (ioapic->ioregsel & 1) {
ioapic->redirtbl[index].bits &= 0xffffffff; e->bits &= 0xffffffff;
ioapic->redirtbl[index].bits |= (u64) val << 32; e->bits |= (u64) val << 32;
} else { } else {
ioapic->redirtbl[index].bits &= ~0xffffffffULL; e->bits &= ~0xffffffffULL;
ioapic->redirtbl[index].bits |= (u32) val; e->bits |= (u32) val;
ioapic->redirtbl[index].fields.remote_irr = 0; e->fields.remote_irr = 0;
} }
mask_after = ioapic->redirtbl[index].fields.mask; mask_after = e->fields.mask;
if (mask_before != mask_after) if (mask_before != mask_after)
kvm_fire_mask_notifiers(ioapic->kvm, index, mask_after); kvm_fire_mask_notifiers(ioapic->kvm, index, mask_after);
if (ioapic->redirtbl[index].fields.trig_mode == IOAPIC_LEVEL_TRIG if (e->fields.trig_mode == IOAPIC_LEVEL_TRIG
&& ioapic->irr & (1 << index)) && ioapic->irr & (1 << index))
ioapic_service(ioapic, index); ioapic_service(ioapic, index);
break; break;
......
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