commit 87ea75d5e135c0527c6a9dbac4317913409f28c7
author Peter Crosthwaite <peter.crosthwaite@xilinx.com> Wed Jan 01 18:49:17 2014 -0800
committer Luiz Capitulino <lcapitulino@redhat.com> Mon Jan 06 15:02:30 2014 -0500
tree ad01b184d1a7e79e87139bd73da3b1e84dadf990
parent 00b810532446b1037aa5d299f181ac4d1d65aa9c

qemu-option: Remove qemu_opts_create_nofail

This is a boiler-plate _nofail variant of qemu_opts_create. Remove and
use error_abort in call sites.

null/0 arguments needs to be added for the id and fail_if_exists fields
in affected callsites due to argument inconsistency between the normal and
no_fail variants.

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>

block/rbd.c

diff --git a/block/rbd.c b/block/rbd.c
index 4a1ea5b..f453f04 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -461,7 +461,7 @@
     const char *filename;
     int r;
 
-    opts = qemu_opts_create_nofail(&runtime_opts);
+    opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);
     qemu_opts_absorb_qdict(opts, options, &local_err);
     if (error_is_set(&local_err)) {
         qerror_report_err(local_err);