aboutsummaryrefslogtreecommitdiff
path: root/util/qemu-option.c
diff options
context:
space:
mode:
authorEdgar E. Iglesias <edgar.iglesias@xilinx.com>2014-01-14 12:09:59 +1000
committerEdgar E. Iglesias <edgar.iglesias@xilinx.com>2014-01-14 12:10:08 +1000
commit133fe77437d3a23bf1fd70a231b4f29d5fa0571c (patch)
tree89450efd322bd414e941e30dfc991652892e4a3e /util/qemu-option.c
parent73c694565c6144e0c4e15041b5250a04a25107c3 (diff)
parentc950114286ea358a93ce632db0421945e1008395 (diff)
downloadqemu-133fe77437d3a23bf1fd70a231b4f29d5fa0571c.zip
qemu-133fe77437d3a23bf1fd70a231b4f29d5fa0571c.tar.gz
qemu-133fe77437d3a23bf1fd70a231b4f29d5fa0571c.tar.bz2
Merge remote branch 'luiz/queue/qmp' into qmpq
* luiz/queue/qmp: migration: qmp_migrate(): keep working after syntax error qerror: Remove assert_no_error() qemu-option: Remove qemu_opts_create_nofail target-i386: Remove assert_no_error usage hw: Remove assert_no_error usages qdev: Delete dead code error: Add error_abort monitor: add object-add (QMP) and object_add (HMP) command monitor: add object-del (QMP) and object_del (HMP) command qom: catch errors in object_property_add_child qom: fix leak for objects created with -object rng: initialize file descriptor to -1 qemu-monitor: HMP cpu-add wrapper vl: add missing transition debug->finish_migrate Message-Id: 1389045795-18706-1-git-send-email-lcapitulino@redhat.com Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Diffstat (limited to 'util/qemu-option.c')
-rw-r--r--util/qemu-option.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/util/qemu-option.c b/util/qemu-option.c
index efcb5dc..668e5d9 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -791,15 +791,6 @@ 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;