summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorDong Xu Wang <wdongxu@linux.vnet.ibm.com>2012-12-06 14:47:21 +0800
committerKevin Wolf <kwolf@redhat.com>2012-12-11 16:34:45 +0100
commitdd39244978627e41a66b98d20eceddb1d7d25def (patch)
tree45ff9ebacf37d37d155e598b62232c3cb73344cb
parentad718d01ba0af531d10b0a8685cf5047edfd1891 (diff)
downloadfocaccia-qemu-dd39244978627e41a66b98d20eceddb1d7d25def.tar.gz
focaccia-qemu-dd39244978627e41a66b98d20eceddb1d7d25def.zip
introduce qemu_opts_create_nofail function
While id is NULL, qemu_opts_create can not fail, so ignore
errors is fine.

Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--qemu-option.c9
-rw-r--r--qemu-option.h1
2 files changed, 10 insertions, 0 deletions
diff --git a/qemu-option.c b/qemu-option.c
index e0131ce7b1..1303188dbd 100644
--- a/qemu-option.c
+++ b/qemu-option.c
@@ -780,6 +780,15 @@ QemuOpts *qemu_opts_create(QemuOptsList *list, const char *id,
     return opts;
 }
 
+QemuOpts *qemu_opts_create_nofail(QemuOptsList *list)
+{
+    QemuOpts *opts;
+    Error *errp = NULL;
+    opts = qemu_opts_create(list, NULL, 0, &errp);
+    assert_no_error(errp);
+    return opts;
+}
+
 void qemu_opts_reset(QemuOptsList *list)
 {
     QemuOpts *opts, *next_opts;
diff --git a/qemu-option.h b/qemu-option.h
index ca729862d5..b0f8d1ecd6 100644
--- a/qemu-option.h
+++ b/qemu-option.h
@@ -133,6 +133,7 @@ int qemu_opt_foreach(QemuOpts *opts, qemu_opt_loopfunc func, void *opaque,
 QemuOpts *qemu_opts_find(QemuOptsList *list, const char *id);
 QemuOpts *qemu_opts_create(QemuOptsList *list, const char *id,
                            int fail_if_exists, Error **errp);
+QemuOpts *qemu_opts_create_nofail(QemuOptsList *list);
 void qemu_opts_reset(QemuOptsList *list);
 void qemu_opts_loc_restore(QemuOpts *opts);
 int qemu_opts_set(QemuOptsList *list, const char *id,