mirror of https://github.com/proxmox/mirror_qemu
QemuOpts: add def_value_str to QemuOptDesc
Add def_value_str (default value) to QemuOptDesc, to replace function of the default value in QEMUOptionParameter. Improve qemu_opts_get_* functions: if find opt, return opt->str; otherwise, if desc->def_value_str is set, return desc->def_value_str; otherwise, return input defval. Improve qemu_opts_print: if option is set, print opt->str; otherwise, if desc->def_value_str is set, print it. Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com> Signed-off-by: Chunyan Liu <cyliu@suse.com> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>master
parent
e67905426b
commit
09722032e1
|
@ -99,6 +99,7 @@ typedef struct QemuOptDesc {
|
||||||
const char *name;
|
const char *name;
|
||||||
enum QemuOptType type;
|
enum QemuOptType type;
|
||||||
const char *help;
|
const char *help;
|
||||||
|
const char *def_value_str;
|
||||||
} QemuOptDesc;
|
} QemuOptDesc;
|
||||||
|
|
||||||
struct QemuOptsList {
|
struct QemuOptsList {
|
||||||
|
|
|
@ -570,6 +570,13 @@ static QemuOpt *qemu_opt_find(QemuOpts *opts, const char *name)
|
||||||
const char *qemu_opt_get(QemuOpts *opts, const char *name)
|
const char *qemu_opt_get(QemuOpts *opts, const char *name)
|
||||||
{
|
{
|
||||||
QemuOpt *opt = qemu_opt_find(opts, name);
|
QemuOpt *opt = qemu_opt_find(opts, name);
|
||||||
|
|
||||||
|
if (!opt) {
|
||||||
|
const QemuOptDesc *desc = find_desc_by_name(opts->list->desc, name);
|
||||||
|
if (desc && desc->def_value_str) {
|
||||||
|
return desc->def_value_str;
|
||||||
|
}
|
||||||
|
}
|
||||||
return opt ? opt->str : NULL;
|
return opt ? opt->str : NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -589,8 +596,13 @@ bool qemu_opt_get_bool(QemuOpts *opts, const char *name, bool defval)
|
||||||
{
|
{
|
||||||
QemuOpt *opt = qemu_opt_find(opts, name);
|
QemuOpt *opt = qemu_opt_find(opts, name);
|
||||||
|
|
||||||
if (opt == NULL)
|
if (opt == NULL) {
|
||||||
|
const QemuOptDesc *desc = find_desc_by_name(opts->list->desc, name);
|
||||||
|
if (desc && desc->def_value_str) {
|
||||||
|
parse_option_bool(name, desc->def_value_str, &defval, &error_abort);
|
||||||
|
}
|
||||||
return defval;
|
return defval;
|
||||||
|
}
|
||||||
assert(opt->desc && opt->desc->type == QEMU_OPT_BOOL);
|
assert(opt->desc && opt->desc->type == QEMU_OPT_BOOL);
|
||||||
return opt->value.boolean;
|
return opt->value.boolean;
|
||||||
}
|
}
|
||||||
|
@ -599,8 +611,14 @@ uint64_t qemu_opt_get_number(QemuOpts *opts, const char *name, uint64_t defval)
|
||||||
{
|
{
|
||||||
QemuOpt *opt = qemu_opt_find(opts, name);
|
QemuOpt *opt = qemu_opt_find(opts, name);
|
||||||
|
|
||||||
if (opt == NULL)
|
if (opt == NULL) {
|
||||||
|
const QemuOptDesc *desc = find_desc_by_name(opts->list->desc, name);
|
||||||
|
if (desc && desc->def_value_str) {
|
||||||
|
parse_option_number(name, desc->def_value_str, &defval,
|
||||||
|
&error_abort);
|
||||||
|
}
|
||||||
return defval;
|
return defval;
|
||||||
|
}
|
||||||
assert(opt->desc && opt->desc->type == QEMU_OPT_NUMBER);
|
assert(opt->desc && opt->desc->type == QEMU_OPT_NUMBER);
|
||||||
return opt->value.uint;
|
return opt->value.uint;
|
||||||
}
|
}
|
||||||
|
@ -609,8 +627,13 @@ uint64_t qemu_opt_get_size(QemuOpts *opts, const char *name, uint64_t defval)
|
||||||
{
|
{
|
||||||
QemuOpt *opt = qemu_opt_find(opts, name);
|
QemuOpt *opt = qemu_opt_find(opts, name);
|
||||||
|
|
||||||
if (opt == NULL)
|
if (opt == NULL) {
|
||||||
|
const QemuOptDesc *desc = find_desc_by_name(opts->list->desc, name);
|
||||||
|
if (desc && desc->def_value_str) {
|
||||||
|
parse_option_size(name, desc->def_value_str, &defval, &error_abort);
|
||||||
|
}
|
||||||
return defval;
|
return defval;
|
||||||
|
}
|
||||||
assert(opt->desc && opt->desc->type == QEMU_OPT_SIZE);
|
assert(opt->desc && opt->desc->type == QEMU_OPT_SIZE);
|
||||||
return opt->value.uint;
|
return opt->value.uint;
|
||||||
}
|
}
|
||||||
|
@ -898,11 +921,30 @@ void qemu_opts_del(QemuOpts *opts)
|
||||||
void qemu_opts_print(QemuOpts *opts)
|
void qemu_opts_print(QemuOpts *opts)
|
||||||
{
|
{
|
||||||
QemuOpt *opt;
|
QemuOpt *opt;
|
||||||
|
QemuOptDesc *desc = opts->list->desc;
|
||||||
|
|
||||||
printf("%s: %s:", opts->list->name,
|
if (desc[0].name == NULL) {
|
||||||
opts->id ? opts->id : "<noid>");
|
QTAILQ_FOREACH(opt, &opts->head, next) {
|
||||||
QTAILQ_FOREACH(opt, &opts->head, next) {
|
printf("%s=\"%s\" ", opt->name, opt->str);
|
||||||
printf(" %s=\"%s\"", opt->name, opt->str);
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
for (; desc && desc->name; desc++) {
|
||||||
|
const char *value;
|
||||||
|
QemuOpt *opt = qemu_opt_find(opts, desc->name);
|
||||||
|
|
||||||
|
value = opt ? opt->str : desc->def_value_str;
|
||||||
|
if (!value) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (desc->type == QEMU_OPT_STRING) {
|
||||||
|
printf("%s='%s' ", desc->name, value);
|
||||||
|
} else if ((desc->type == QEMU_OPT_SIZE ||
|
||||||
|
desc->type == QEMU_OPT_NUMBER) && opt) {
|
||||||
|
printf("%s=%" PRId64 " ", desc->name, opt->value.uint);
|
||||||
|
} else {
|
||||||
|
printf("%s=%s ", desc->name, value);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue