summary refs log tree commit diff stats
path: root/scripts
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-05-05 10:23:22 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-05-05 10:23:22 +0100
commitb4c5df7a15dad2417bc05d08a470b82ab89d56ea (patch)
treeb6a85e5a4d7f410cbcdea5917cd7921f7e9ef288 /scripts
parent5bccbb04a4abba7af4398de992bf06d585fd1333 (diff)
parent2e1c92daff752c056ae10087e6b1702b0460af88 (diff)
downloadfocaccia-qemu-b4c5df7a15dad2417bc05d08a470b82ab89d56ea.tar.gz
focaccia-qemu-b4c5df7a15dad2417bc05d08a470b82ab89d56ea.zip
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: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/coverity-model.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/coverity-model.c b/scripts/coverity-model.c
index 224d2d1873..617f67d716 100644
--- a/scripts/coverity-model.c
+++ b/scripts/coverity-model.c
@@ -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;
 }