diff options
| -rw-r--r-- | block/vvfat.c | 3 | ||||
| -rw-r--r-- | linux-user/signal.c | 2 | ||||
| -rw-r--r-- | qdict.c | 1 | ||||
| -rw-r--r-- | tcg/tcg.c | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/block/vvfat.c b/block/vvfat.c index bb707c0008..aaa8593358 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -2462,10 +2462,13 @@ static int handle_commits(BDRVVVFATState* s) fail = -2; break; case ACTION_WRITEOUT: { +#ifndef NDEBUG + /* these variables are only used by assert() below */ direntry_t* entry = array_get(&(s->directory), commit->param.writeout.dir_index); uint32_t begin = begin_of_direntry(entry); mapping_t* mapping = find_mapping_for_cluster(s, begin); +#endif assert(mapping); assert(mapping->begin == begin); diff --git a/linux-user/signal.c b/linux-user/signal.c index 46491674fe..07616e3b49 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -412,7 +412,7 @@ static void QEMU_NORETURN force_sig(int target_sig) /* unreachable */ assert(0); - + abort(); } /* queue a signal so that it will be send to the virtual CPU as soon diff --git a/qdict.c b/qdict.c index 7d1469d408..7fb425a0ca 100644 --- a/qdict.c +++ b/qdict.c @@ -195,6 +195,7 @@ double qdict_get_double(const QDict *qdict, const char *key) return qint_get_int(qobject_to_qint(obj)); default: assert(0); + return 0.0; } } diff --git a/tcg/tcg.c b/tcg/tcg.c index e6a1caf795..1818868226 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -27,7 +27,7 @@ #include "config.h" -#ifndef CONFIG_DEBUG_TCG +#if !defined(CONFIG_DEBUG_TCG) && !defined(NDEBUG) /* define it to suppress various consistency checks (faster) */ #define NDEBUG #endif |