Merge remote branch 'luiz/queue/qmp' into qmpq

[qemu.git] / qdev-monitor.c

diff --git a/qdev-monitor.c b/qdev-monitor.c
index ef63cbd7bbb04dc8658f859e4a0f4c267898dca4..1d3b68d40a790c70947cc0f401299553228dff02 100644 (file)
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -737,7 +737,7 @@ int qemu_global_option(const char *str)
         return -1;
     }
 
-    opts = qemu_opts_create_nofail(&qemu_global_opts);
+    opts = qemu_opts_create(&qemu_global_opts, NULL, 0, &error_abort);
     qemu_opt_set(opts, "driver", driver);
     qemu_opt_set(opts, "property", property);
     qemu_opt_set(opts, "value", str+offset+1);