Commit 9628af03 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/lalrae/tags/mips-20160408' into staging 



MIPS patches 2016-04-08

Changes:
* fix off-by-one error in ITU

# gpg: Signature made Fri 08 Apr 2016 10:43:16 BST using RSA key ID 0B29DA6B
# gpg: Good signature from "Leon Alrae <leon.alrae@imgtec.com>"

* remotes/lalrae/tags/mips-20160408:
  hw/mips_itu: fix off-by-one reported by Coverity

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 8227e2d1 f2eb665a

hw/misc/mips_itu.c

+3 −8
Original line number Diff line number Diff line
@@ -66,18 +66,13 @@ static uint64_t itc_tag_read(void *opaque, hwaddr addr, unsigned size) 
{

    MIPSITUState *tag = (MIPSITUState *)opaque;

    uint64_t index = addr >> 3;

    uint64_t ret = 0;



    switch (index) {

    case 0 ... ITC_ADDRESSMAP_NUM:

        ret = tag->ITCAddressMap[index];

        break;

    default:

    if (index >= ITC_ADDRESSMAP_NUM) {

        qemu_log_mask(LOG_GUEST_ERROR, "Read 0x%" PRIx64 "\n", addr);

        break;

        return 0;

    }



    return ret;

    return tag->ITCAddressMap[index];

}



static void itc_reconfigure(MIPSITUState *tag)