Commit 968854c8 authored by Amos Kong's avatar Amos Kong Committed by Kevin Wolf
Browse files

qmp: access the local QemuOptsLists for drive option 



Currently we have three QemuOptsList (qemu_common_drive_opts,
qemu_legacy_drive_opts, and qemu_drive_opts), only qemu_drive_opts
is added to vm_config_groups[].

This patch changes query-command-line-options to access three local
QemuOptsLists for drive option, and merge the description items
together.

Signed-off-by: default avatarAmos Kong <akong@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent d48addda

blockdev.c

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ 
#include "sysemu/arch_init.h"



static QTAILQ_HEAD(drivelist, DriveInfo) drives = QTAILQ_HEAD_INITIALIZER(drives);

extern QemuOptsList qemu_common_drive_opts;



static const char *const if_name[IF_COUNT] = {

    [IF_NONE] = "none",

include/qemu/config-file.h

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
QemuOptsList *qemu_find_opts(const char *group);

QemuOptsList *qemu_find_opts_err(const char *group, Error **errp);

void qemu_add_opts(QemuOptsList *list);

void qemu_add_drive_opts(QemuOptsList *list);

int qemu_set_option(const char *str);

int qemu_global_option(const char *str);

void qemu_add_globals(void);

include/sysemu/sysemu.h

+2 −0
Original line number Diff line number Diff line
@@ -193,6 +193,8 @@ QemuOpts *qemu_get_machine_opts(void); 


bool usb_enabled(bool default_usb);



extern QemuOptsList qemu_legacy_drive_opts;

extern QemuOptsList qemu_common_drive_opts;

extern QemuOptsList qemu_drive_opts;

extern QemuOptsList qemu_chardev_opts;

extern QemuOptsList qemu_device_opts;

util/qemu-config.c

+76 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include "qmp-commands.h"



static QemuOptsList *vm_config_groups[32];

static QemuOptsList *drive_config_groups[4];



static QemuOptsList *find_list(QemuOptsList **lists, const char *group,

                               Error **errp)
@@ -77,6 +78,59 @@ static CommandLineParameterInfoList *query_option_descs(const QemuOptDesc *desc) 
    return param_list;

}



/* remove repeated entry from the info list */

static void cleanup_infolist(CommandLineParameterInfoList *head)

{

    CommandLineParameterInfoList *pre_entry, *cur, *del_entry;



    cur = head;

    while (cur->next) {

        pre_entry = head;

        while (pre_entry != cur->next) {

            if (!strcmp(pre_entry->value->name, cur->next->value->name)) {

                del_entry = cur->next;

                cur->next = cur->next->next;

                g_free(del_entry);

                break;

            }

            pre_entry = pre_entry->next;

        }

        cur = cur->next;

    }

}



/* merge the description items of two parameter infolists */

static void connect_infolist(CommandLineParameterInfoList *head,

                             CommandLineParameterInfoList *new)

{

    CommandLineParameterInfoList *cur;



    cur = head;

    while (cur->next) {

        cur = cur->next;

    }

    cur->next = new;

}



/* access all the local QemuOptsLists for drive option */

static CommandLineParameterInfoList *get_drive_infolist(void)

{

    CommandLineParameterInfoList *head = NULL, *cur;

    int i;



    for (i = 0; drive_config_groups[i] != NULL; i++) {

        if (!head) {

            head = query_option_descs(drive_config_groups[i]->desc);

        } else {

            cur = query_option_descs(drive_config_groups[i]->desc);

            connect_infolist(head, cur);

        }

    }

    cleanup_infolist(head);



    return head;

}



CommandLineOptionInfoList *qmp_query_command_line_options(bool has_option,

                                                          const char *option,

                                                          Error **errp)
@@ -89,7 +143,12 @@ CommandLineOptionInfoList *qmp_query_command_line_options(bool has_option, 
        if (!has_option || !strcmp(option, vm_config_groups[i]->name)) {

            info = g_malloc0(sizeof(*info));

            info->option = g_strdup(vm_config_groups[i]->name);

            info->parameters = query_option_descs(vm_config_groups[i]->desc);

            if (!strcmp("drive", vm_config_groups[i]->name)) {

                info->parameters = get_drive_infolist();

            } else {

                info->parameters =

                    query_option_descs(vm_config_groups[i]->desc);

            }

            entry = g_malloc0(sizeof(*entry));

            entry->value = info;

            entry->next = conf_list;
@@ -109,6 +168,22 @@ QemuOptsList *qemu_find_opts_err(const char *group, Error **errp) 
    return find_list(vm_config_groups, group, errp);

}



void qemu_add_drive_opts(QemuOptsList *list)

{

    int entries, i;



    entries = ARRAY_SIZE(drive_config_groups);

    entries--; /* keep list NULL terminated */

    for (i = 0; i < entries; i++) {

        if (drive_config_groups[i] == NULL) {

            drive_config_groups[i] = list;

            return;

        }

    }

    fprintf(stderr, "ran out of space in drive_config_groups");

    abort();

}



void qemu_add_opts(QemuOptsList *list)

{

    int entries, i;

vl.c

+3 −0
Original line number Diff line number Diff line
@@ -2867,6 +2867,9 @@ int main(int argc, char **argv, char **envp) 
    module_call_init(MODULE_INIT_QOM);



    qemu_add_opts(&qemu_drive_opts);

    qemu_add_drive_opts(&qemu_legacy_drive_opts);

    qemu_add_drive_opts(&qemu_common_drive_opts);

    qemu_add_drive_opts(&qemu_drive_opts);

    qemu_add_opts(&qemu_chardev_opts);

    qemu_add_opts(&qemu_device_opts);

    qemu_add_opts(&qemu_netdev_opts);