The use of consistent variable names makes it much easier to follow which fields are being accessed from I8259CommonState.
Signed-off-by: Mark Cave-Ayland <[email protected]> --- hw/i386/kvm/i8259.c | 86 ++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/hw/i386/kvm/i8259.c b/hw/i386/kvm/i8259.c index 8ae5dd39b5..86b1ffea4e 100644 --- a/hw/i386/kvm/i8259.c +++ b/hw/i386/kvm/i8259.c @@ -36,13 +36,13 @@ struct KVMI8259Class { DeviceRealize parent_realize; }; -static void kvm_pic_get(I8259CommonState *s) +static void kvm_pic_get(I8259CommonState *cs) { struct kvm_irqchip chip; struct kvm_pic_state *kpic; int ret; - chip.chip_id = s->master ? KVM_IRQCHIP_PIC_MASTER : KVM_IRQCHIP_PIC_SLAVE; + chip.chip_id = cs->master ? KVM_IRQCHIP_PIC_MASTER : KVM_IRQCHIP_PIC_SLAVE; ret = kvm_vm_ioctl(kvm_state, KVM_GET_IRQCHIP, &chip); if (ret < 0) { fprintf(stderr, "KVM_GET_IRQCHIP failed: %s\n", strerror(-ret)); @@ -51,50 +51,50 @@ static void kvm_pic_get(I8259CommonState *s) kpic = &chip.chip.pic; - s->last_irr = kpic->last_irr; - s->irr = kpic->irr; - s->imr = kpic->imr; - s->isr = kpic->isr; - s->priority_add = kpic->priority_add; - s->irq_base = kpic->irq_base; - s->read_reg_select = kpic->read_reg_select; - s->poll = kpic->poll; - s->special_mask = kpic->special_mask; - s->init_state = kpic->init_state; - s->auto_eoi = kpic->auto_eoi; - s->rotate_on_auto_eoi = kpic->rotate_on_auto_eoi; - s->special_fully_nested_mode = kpic->special_fully_nested_mode; - s->init4 = kpic->init4; - s->elcr = kpic->elcr; - s->elcr_mask = kpic->elcr_mask; + cs->last_irr = kpic->last_irr; + cs->irr = kpic->irr; + cs->imr = kpic->imr; + cs->isr = kpic->isr; + cs->priority_add = kpic->priority_add; + cs->irq_base = kpic->irq_base; + cs->read_reg_select = kpic->read_reg_select; + cs->poll = kpic->poll; + cs->special_mask = kpic->special_mask; + cs->init_state = kpic->init_state; + cs->auto_eoi = kpic->auto_eoi; + cs->rotate_on_auto_eoi = kpic->rotate_on_auto_eoi; + cs->special_fully_nested_mode = kpic->special_fully_nested_mode; + cs->init4 = kpic->init4; + cs->elcr = kpic->elcr; + cs->elcr_mask = kpic->elcr_mask; } -static void kvm_pic_put(I8259CommonState *s) +static void kvm_pic_put(I8259CommonState *cs) { struct kvm_irqchip chip; struct kvm_pic_state *kpic; int ret; - chip.chip_id = s->master ? KVM_IRQCHIP_PIC_MASTER : KVM_IRQCHIP_PIC_SLAVE; + chip.chip_id = cs->master ? KVM_IRQCHIP_PIC_MASTER : KVM_IRQCHIP_PIC_SLAVE; kpic = &chip.chip.pic; - kpic->last_irr = s->last_irr; - kpic->irr = s->irr; - kpic->imr = s->imr; - kpic->isr = s->isr; - kpic->priority_add = s->priority_add; - kpic->irq_base = s->irq_base; - kpic->read_reg_select = s->read_reg_select; - kpic->poll = s->poll; - kpic->special_mask = s->special_mask; - kpic->init_state = s->init_state; - kpic->auto_eoi = s->auto_eoi; - kpic->rotate_on_auto_eoi = s->rotate_on_auto_eoi; - kpic->special_fully_nested_mode = s->special_fully_nested_mode; - kpic->init4 = s->init4; - kpic->elcr = s->elcr; - kpic->elcr_mask = s->elcr_mask; + kpic->last_irr = cs->last_irr; + kpic->irr = cs->irr; + kpic->imr = cs->imr; + kpic->isr = cs->isr; + kpic->priority_add = cs->priority_add; + kpic->irq_base = cs->irq_base; + kpic->read_reg_select = cs->read_reg_select; + kpic->poll = cs->poll; + kpic->special_mask = cs->special_mask; + kpic->init_state = cs->init_state; + kpic->auto_eoi = cs->auto_eoi; + kpic->rotate_on_auto_eoi = cs->rotate_on_auto_eoi; + kpic->special_fully_nested_mode = cs->special_fully_nested_mode; + kpic->init4 = cs->init4; + kpic->elcr = cs->elcr; + kpic->elcr_mask = cs->elcr_mask; ret = kvm_vm_ioctl(kvm_state, KVM_SET_IRQCHIP, &chip); if (ret < 0) { @@ -105,12 +105,12 @@ static void kvm_pic_put(I8259CommonState *s) static void kvm_pic_reset(DeviceState *dev) { - I8259CommonState *s = I8259_COMMON(dev); + I8259CommonState *cs = I8259_COMMON(dev); - s->elcr = 0; - pic_reset_common(s); + cs->elcr = 0; + pic_reset_common(cs); - kvm_pic_put(s); + kvm_pic_put(cs); } static void kvm_pic_set_irq(void *opaque, int irq, int level) @@ -124,11 +124,11 @@ static void kvm_pic_set_irq(void *opaque, int irq, int level) static void kvm_pic_realize(DeviceState *dev, Error **errp) { - I8259CommonState *s = I8259_COMMON(dev); + I8259CommonState *cs = I8259_COMMON(dev); KVMI8259Class *kpc = KVM_I8259_GET_CLASS(dev); - memory_region_init_io(&s->base_io, OBJECT(dev), NULL, NULL, "kvm-pic", 2); - memory_region_init_io(&s->elcr_io, OBJECT(dev), NULL, NULL, "kvm-elcr", 1); + memory_region_init_io(&cs->base_io, OBJECT(dev), NULL, NULL, "kvm-pic", 2); + memory_region_init_io(&cs->elcr_io, OBJECT(dev), NULL, NULL, "kvm-elcr", 1); kpc->parent_realize(dev, errp); } -- 2.43.0
