Allow const QemuOptDesc
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
parent
4a0b59fe3b
commit
238431a9d8
2
net.c
2
net.c
@ -840,7 +840,7 @@ typedef int (*net_client_init_func)(QemuOpts *opts,
|
||||
/* magic number, but compiler will warn if too small */
|
||||
#define NET_MAX_DESC 20
|
||||
|
||||
static struct {
|
||||
static const struct {
|
||||
const char *type;
|
||||
net_client_init_func init;
|
||||
QemuOptDesc desc[NET_MAX_DESC];
|
||||
|
@ -470,7 +470,7 @@ struct QemuOpt {
|
||||
const char *name;
|
||||
const char *str;
|
||||
|
||||
QemuOptDesc *desc;
|
||||
const QemuOptDesc *desc;
|
||||
union {
|
||||
int boolean;
|
||||
uint64_t uint;
|
||||
@ -565,7 +565,7 @@ static void qemu_opt_del(QemuOpt *opt)
|
||||
int qemu_opt_set(QemuOpts *opts, const char *name, const char *value)
|
||||
{
|
||||
QemuOpt *opt;
|
||||
QemuOptDesc *desc = opts->list->desc;
|
||||
const QemuOptDesc *desc = opts->list->desc;
|
||||
int i;
|
||||
|
||||
for (i = 0; desc[i].name != NULL; i++) {
|
||||
@ -777,7 +777,7 @@ QemuOpts *qemu_opts_parse(QemuOptsList *list, const char *params, const char *fi
|
||||
/* Validate parsed opts against descriptions where no
|
||||
* descriptions were provided in the QemuOptsList.
|
||||
*/
|
||||
int qemu_opts_validate(QemuOpts *opts, QemuOptDesc *desc)
|
||||
int qemu_opts_validate(QemuOpts *opts, const QemuOptDesc *desc)
|
||||
{
|
||||
QemuOpt *opt;
|
||||
|
||||
|
@ -115,7 +115,7 @@ int qemu_opts_set(QemuOptsList *list, const char *id,
|
||||
const char *name, const char *value);
|
||||
const char *qemu_opts_id(QemuOpts *opts);
|
||||
void qemu_opts_del(QemuOpts *opts);
|
||||
int qemu_opts_validate(QemuOpts *opts, QemuOptDesc *desc);
|
||||
int qemu_opts_validate(QemuOpts *opts, const QemuOptDesc *desc);
|
||||
int qemu_opts_do_parse(QemuOpts *opts, const char *params, const char *firstname);
|
||||
QemuOpts *qemu_opts_parse(QemuOptsList *list, const char *params, const char *firstname);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user