Commit 238431a9 authored by Blue Swirl's avatar Blue Swirl
Browse files

Allow const QemuOptDesc 



Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent 4a0b59fe

net.c

+1 −1
Original line number Diff line number Diff line
@@ -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];

qemu-option.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

qemu-option.h

+1 −1
Original line number Diff line number Diff line
@@ -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);