Commit da93318a authored by Peter Maydell's avatar Peter Maydell Committed by Andrzej Zaborowski
Browse files

qemu-option: Add support for merged QemuOptsLists 



Add support for option lists which are merged together, so that
"-listname foo=bar -listname bar=baz" is equivalent to "-listname
foo=bar,bar=baz" rather than generating two separate lists of options.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarAndrzej Zaborowski <andrew.zaborowski@intel.com>
parent a84fac14

qemu-option.c

+6 −1
Original line number Diff line number Diff line
@@ -741,13 +741,18 @@ QemuOpts *qemu_opts_create(QemuOptsList *list, const char *id, int fail_if_exist 
        }

        opts = qemu_opts_find(list, id);

        if (opts != NULL) {

            if (fail_if_exists) {

            if (fail_if_exists && !list->merge_lists) {

                qerror_report(QERR_DUPLICATE_ID, id, list->name);

                return NULL;

            } else {

                return opts;

            }

        }

    } else if (list->merge_lists) {

        opts = qemu_opts_find(list, NULL);

        if (opts) {

            return opts;

        }

    }

    opts = g_malloc0(sizeof(*opts));

    if (id) {

qemu-option.h

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ typedef struct QemuOptDesc { 
struct QemuOptsList {

    const char *name;

    const char *implied_opt_name;

    bool merge_lists;  /* Merge multiple uses of option into a single list? */

    QTAILQ_HEAD(, QemuOpts) head;

    QemuOptDesc desc[];

};