Commit b4c5df7a authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-cov-model-2015-05-05' into staging 



coverity: fix address_space_rw model

# gpg: Signature made Tue May  5 09:44:26 2015 BST using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"

* remotes/armbru/tags/pull-cov-model-2015-05-05:
  coverity: fix address_space_rw model

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 5bccbb04 2e1c92da

scripts/coverity-model.c

+3 −3
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ typedef uint64_t hwaddr; 
typedef uint32_t MemTxResult;

typedef uint64_t MemTxAttrs;



static void __write(uint8_t *buf, ssize_t len)

static void __bufwrite(uint8_t *buf, ssize_t len)

{

    int first, last;

    __coverity_negative_sink__(len);
@@ -59,7 +59,7 @@ static void __write(uint8_t *buf, ssize_t len) 
    __coverity_writeall__(buf);

}



static void __read(uint8_t *buf, ssize_t len)

static void __bufread(uint8_t *buf, ssize_t len)

{

    __coverity_negative_sink__(len);

    if (len == 0) return;
@@ -74,7 +74,7 @@ MemTxResult address_space_rw(AddressSpace *as, hwaddr addr, MemTxAttrs attrs, 


    // TODO: investigate impact of treating reads as producing

    // tainted data, with __coverity_tainted_data_argument__(buf).

    if (is_write) __write(buf, len); else __read(buf, len);

    if (is_write) __bufread(buf, len); else __bufwrite(buf, len);



    return result;

}