|
@@ -670,11 +670,9 @@ void qemu_opts_set(QemuOptsList *list, const char *id,
|
|
|
const char *name, const char *value, Error **errp)
|
|
|
{
|
|
|
QemuOpts *opts;
|
|
|
- Error *local_err = NULL;
|
|
|
|
|
|
- opts = qemu_opts_create(list, id, 1, &local_err);
|
|
|
- if (local_err) {
|
|
|
- error_propagate(errp, local_err);
|
|
|
+ opts = qemu_opts_create(list, id, 1, errp);
|
|
|
+ if (!opts) {
|
|
|
return;
|
|
|
}
|
|
|
qemu_opt_set(opts, name, value, errp);
|
|
@@ -1012,10 +1010,8 @@ QemuOpts *qemu_opts_from_qdict(QemuOptsList *list, const QDict *qdict,
|
|
|
QemuOpts *opts;
|
|
|
const QDictEntry *entry;
|
|
|
|
|
|
- opts = qemu_opts_create(list, qdict_get_try_str(qdict, "id"), 1,
|
|
|
- &local_err);
|
|
|
- if (local_err) {
|
|
|
- error_propagate(errp, local_err);
|
|
|
+ opts = qemu_opts_create(list, qdict_get_try_str(qdict, "id"), 1, errp);
|
|
|
+ if (!opts) {
|
|
|
return NULL;
|
|
|
}
|
|
|
|