hw/intc/i8259: Refactor pic_read_irq() to avoid uninitialized variable
commit52ad57a9b68e215c4f5fa2cfd2412132b522bff5
authorPhilippe Mathieu-Daudé <philmd@redhat.com>
Thu, 18 Mar 2021 16:30:59 +0000 (18 17:30 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Fri, 19 Mar 2021 12:48:18 +0000 (19 08:48 -0400)
tree0daca6458f040dbc727b575b1b345b18e5d43670
parent561dbb41b1d752098249128d8462aaadc56fd15d
hw/intc/i8259: Refactor pic_read_irq() to avoid uninitialized variable

Some compiler versions are smart enough to detect a potentially
uninitialized variable, but are not smart enough to detect that this
cannot happen due to the code flow:

../hw/intc/i8259.c: In function ‘pic_read_irq’:
../hw/intc/i8259.c:203:13: error: ‘irq2’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
   203 |         irq = irq2 + 8;
       |         ~~~~^~~~~~~~~~

Restrict irq2 variable use to the inner statement.

Fixes: 78ef2b6989f ("i8259: Reorder intack in pic_read_irq")
Reported-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210318163059.3686596-1-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
hw/intc/i8259.c