Merge commit '600309b6108484a60be4a84cfe68e6b8d645799c' into upstream-merge

* commit '600309b6108484a60be4a84cfe68e6b8d645799c':
  Rename target_cpu to target_arch2
  monitor: Fix typo in documentation
  target-mips: fix MADD and MSUB/MSUBU instructions
  Fix hxtool.
  Use ctz64 in favor of ffsll
  Respect the standard
  Use pstrcpy and pstrcat to avoid OpenBSD linker warning
  Suppress a GCC warning
  Fix breakage by obsolete _P() for good
  Fix sdl_zoom compile problems on OpenBSD
  Fix missing strnlen problems
  Fix typo
  Remove bogus -Werror

Conflicts:
	configure

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 13 insertions, 0 deletions

diff --git a/cutils.c b/cutils.c
index f78300cad..346477b15 100644
--- a/cutils.c
+++ b/cutils.c
@@ -109,6 +109,19 @@ int stristart(const char *str, const char *val, const char **ptr)
     return 1;
 }
 
+/* XXX: use host strnlen if available ? */
+int qemu_strnlen(const char *s, int max_len)
+{
+    int i;
+
+    for(i = 0; i < max_len; i++) {
+        if (s[i] == '\0') {
+            break;
+        }
+    }
+    return i;
+}
+
 time_t mktimegm(struct tm *tm)
 {
     time_t t;