diff options
| author | Peter Crosthwaite <peter.crosthwaite@xilinx.com> | 2014-01-01 18:49:17 -0800 |
|---|---|---|
| committer | Luiz Capitulino <lcapitulino@redhat.com> | 2014-01-06 15:02:30 -0500 |
| commit | 87ea75d5e135c0527c6a9dbac4317913409f28c7 (patch) | |
| tree | ad01b184d1a7e79e87139bd73da3b1e84dadf990 /hw/watchdog/watchdog.c | |
| parent | 00b810532446b1037aa5d299f181ac4d1d65aa9c (diff) | |
| download | qemu-87ea75d5e135c0527c6a9dbac4317913409f28c7.zip qemu-87ea75d5e135c0527c6a9dbac4317913409f28c7.tar.gz qemu-87ea75d5e135c0527c6a9dbac4317913409f28c7.tar.bz2 | |
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>
Diffstat (limited to 'hw/watchdog/watchdog.c')
| -rw-r--r-- | hw/watchdog/watchdog.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/watchdog/watchdog.c b/hw/watchdog/watchdog.c index 387962e..f28161b 100644 --- a/hw/watchdog/watchdog.c +++ b/hw/watchdog/watchdog.c @@ -66,7 +66,8 @@ int select_watchdog(const char *p) QLIST_FOREACH(model, &watchdog_list, entry) { if (strcasecmp(model->wdt_name, p) == 0) { /* add the device */ - opts = qemu_opts_create_nofail(qemu_find_opts("device")); + opts = qemu_opts_create(qemu_find_opts("device"), NULL, 0, + &error_abort); qemu_opt_set(opts, "driver", p); return 0; } |