[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v20 05/26] remove assertion of qemu_opt_get function
From: |
Chunyan Liu |
Subject: |
[Qemu-devel] [PATCH v20 05/26] remove assertion of qemu_opt_get functions |
Date: |
Wed, 12 Feb 2014 14:33:05 +0800 |
In qemu_opt_set functions, if desc doen't exist but opts_accepts_any is true, it
won't report error, but can still alloc an opt for the option and save it.
However, after that, when doing qemu_opt_get, this option could be found in opts
but opt->desc is NULL. This is correct, should not be treated as error.
This patch would fix vvfat issue after changing to QemuOpts.
Signed-off-by: Chunyan Liu <address@hidden>
---
util/qemu-option.c | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/util/qemu-option.c b/util/qemu-option.c
index 21699d0..c51c55d 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -641,7 +641,6 @@ bool qemu_opt_get_bool(QemuOpts *opts, const char *name,
bool defval)
}
return defval;
}
- assert(opt->desc && opt->desc->type == QEMU_OPT_BOOL);
return opt->value.boolean;
}
@@ -675,7 +674,6 @@ uint64_t qemu_opt_get_number(QemuOpts *opts, const char
*name, uint64_t defval)
}
return defval;
}
- assert(opt->desc && opt->desc->type == QEMU_OPT_NUMBER);
return opt->value.uint;
}
@@ -710,7 +708,6 @@ uint64_t qemu_opt_get_size(QemuOpts *opts, const char
*name, uint64_t defval)
}
return defval;
}
- assert(opt->desc && opt->desc->type == QEMU_OPT_SIZE);
return opt->value.uint;
}
--
1.6.0.2
- [Qemu-devel] [PATCH v20 00/26] replace QEMUOptionParameter with QemuOpts, Chunyan Liu, 2014/02/12
- [Qemu-devel] [PATCH v20 02/26] qapi: output def_value_str when query command line options, Chunyan Liu, 2014/02/12
- [Qemu-devel] [PATCH v20 04/26] add some QemuOpts functions for replace work, Chunyan Liu, 2014/02/12
- [Qemu-devel] [PATCH v20 03/26] improve some functions in qemu-option.c, Chunyan Liu, 2014/02/12
- [Qemu-devel] [PATCH v20 05/26] remove assertion of qemu_opt_get functions,
Chunyan Liu <=
- [Qemu-devel] [PATCH v20 01/26] add def_value_str to QemuOptDesc, Chunyan Liu, 2014/02/12
- [Qemu-devel] [PATCH v20 06/26] change block layer to support both QemuOpts and QEMUOptionParameter, Chunyan Liu, 2014/02/12
- [Qemu-devel] [PATCH v20 08/26] gluster.c: replace QEMUOptionParameter with QemuOpts, Chunyan Liu, 2014/02/12
- [Qemu-devel] [PATCH v20 07/26] cow.c: replace QEMUOptionParameter with QemuOpts, Chunyan Liu, 2014/02/12