Merge commit '075e36b8ede5409b491abdf69fe2ffcf1bfe6bca' into upstream-merge

* commit '075e36b8ede5409b491abdf69fe2ffcf1bfe6bca': (27 commits)
  monitor: Fix do_commit() argument type
  Don't redefine NULL, please
  Fix coding style issue
  Remove PARAMS() macro
  __thread should be before real type
  gcc wants 1st static and then const
  Bring two last users of K&R definitions to ANSI c89
  static and inline should came before the type of the functions
  Use proper typedef syntax
  Revert "This files are compiled in libqemu.a now"
  fix use after free
  unbreak usb pass-through on linux.
  clean: remove ide/*.o files on clean
  ARM host: fix generated blocks linking
  Fix spelling in comment
  Suppress some variants of English in comments
  sparc64-8bit-asi
  target-mips: remove MAX_OP_PER_INSTR workaround
  exec-all.h: increase OPC_BUF_SIZE
  exec-all.h: increase MAX_OP_PER_INSTR to 96 from 64
  ...

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/qemu-config.c b/qemu-config.c
index 636fa64b4..8ec7aca19 100644
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -190,7 +190,7 @@ int qemu_set_option(const char *str)
         return -1;
     }
 
-    if (-1 == qemu_opt_set(opts, arg, str+offset+1)) {
+    if (qemu_opt_set(opts, arg, str+offset+1) == -1) {
         fprintf(stderr, "failed to set \"%s\" for %s \"%s\"\n",
                 arg, lists[i]->name, id);
         return -1;