From nobody Mon Feb 9 18:46:01 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1713885175; cv=none; d=zohomail.com; s=zohoarc; b=mP6IG3P1IT8rRi5HizMFWzxNoYFfTMrlLgRRuTx5k5KacM93mxaEKcW/oCUpmQb59321o8sq6eRTy6CubsFPwXh2ifmacwxPPr4sNBpLhcAvqMJyJfF3PCOAsQZzgBa9kUolWv3TsHcPTm6Q9nVHwP132u40NzMQ+swveH+XEs8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1713885175; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2bV6hCJ7qQo40huP00kw85XkgnvXtd5S1oXCGjI30BM=; b=I/kvAIDxLM14cE5S0XdOAVbfG5FPDHJhDM2/ggcpHTF1hpVgn9Fl7Fq0cSoKu9dEIOXwRB0zrNof0cJNYzQp2ggXPd4lu85BmNA9Wvu2XcyCm1rDp8bf8IQRksnzRk3hKqzm9reRtUNGvUHjwaXmtKmyoWWFqfb2fIVCXMNbUI8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 171388517564626.67489350072003; Tue, 23 Apr 2024 08:12:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rzHnd-0007DD-A2; Tue, 23 Apr 2024 11:11:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rzHmb-0004ME-Nu for qemu-devel@nongnu.org; Tue, 23 Apr 2024 11:10:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rzHmY-0008VP-H1 for qemu-devel@nongnu.org; Tue, 23 Apr 2024 11:10:09 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-381-Os0pdHg-P9-kQ_vXygKMcA-1; Tue, 23 Apr 2024 11:10:01 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2825D812C55; Tue, 23 Apr 2024 15:10:01 +0000 (UTC) Received: from avogadro.lan (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8BDD3200AFA2; Tue, 23 Apr 2024 15:10:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1713885005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2bV6hCJ7qQo40huP00kw85XkgnvXtd5S1oXCGjI30BM=; b=BlCucIRmcQzNH8b4rNF6fenzb1KaWS6kAM/CyifkR/C1777+MhGG9LAiNngnF+PEcL0Uka TgfCo9u+/JcWGnpieA5IaZhRcBKaXfYIxHFuhX67E+AhPOwwPK4hsjBGRd2vf6pMDQCkXH DX1WAGdfeQReggOqWEyAgohHd41btq0= X-MC-Unique: Os0pdHg-P9-kQ_vXygKMcA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 06/63] util/qemu-config: Extract QMP commands to qemu-config-qmp.c Date: Tue, 23 Apr 2024 17:08:54 +0200 Message-ID: <20240423150951.41600-7-pbonzini@redhat.com> In-Reply-To: <20240423150951.41600-1-pbonzini@redhat.com> References: <20240423150951.41600-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.67, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1713885177839100003 From: Philippe Mathieu-Daud=C3=A9 QMP is irrelevant for user emulation. Extract the code related to QMP in a different source file, which won't be build for user emulation binaries. This avoid pulling pointless code. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20240404194757.9343-5-philmd@linaro.org> Signed-off-by: Paolo Bonzini Message-ID: <20240408155330.522792-7-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- include/qemu/config-file.h | 3 + monitor/qemu-config-qmp.c | 206 +++++++++++++++++++++++++++++++++++++ util/qemu-config.c | 204 +----------------------------------- monitor/meson.build | 1 + 4 files changed, 212 insertions(+), 202 deletions(-) create mode 100644 monitor/qemu-config-qmp.c diff --git a/include/qemu/config-file.h b/include/qemu/config-file.h index b82a778123f..51b310fa3b4 100644 --- a/include/qemu/config-file.h +++ b/include/qemu/config-file.h @@ -8,6 +8,9 @@ QemuOptsList *qemu_find_opts(const char *group); QemuOptsList *qemu_find_opts_err(const char *group, Error **errp); QemuOpts *qemu_find_opts_singleton(const char *group); =20 +extern QemuOptsList *vm_config_groups[]; +extern QemuOptsList *drive_config_groups[]; + void qemu_add_opts(QemuOptsList *list); void qemu_add_drive_opts(QemuOptsList *list); int qemu_global_option(const char *str); diff --git a/monitor/qemu-config-qmp.c b/monitor/qemu-config-qmp.c new file mode 100644 index 00000000000..24477a0e448 --- /dev/null +++ b/monitor/qemu-config-qmp.c @@ -0,0 +1,206 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qapi/qapi-commands-misc.h" +#include "qapi/qmp/qlist.h" +#include "qemu/option.h" +#include "qemu/config-file.h" +#include "hw/boards.h" + +static CommandLineParameterInfoList *query_option_descs(const QemuOptDesc = *desc) +{ + CommandLineParameterInfoList *param_list =3D NULL; + CommandLineParameterInfo *info; + int i; + + for (i =3D 0; desc[i].name !=3D NULL; i++) { + info =3D g_malloc0(sizeof(*info)); + info->name =3D g_strdup(desc[i].name); + + switch (desc[i].type) { + case QEMU_OPT_STRING: + info->type =3D COMMAND_LINE_PARAMETER_TYPE_STRING; + break; + case QEMU_OPT_BOOL: + info->type =3D COMMAND_LINE_PARAMETER_TYPE_BOOLEAN; + break; + case QEMU_OPT_NUMBER: + info->type =3D COMMAND_LINE_PARAMETER_TYPE_NUMBER; + break; + case QEMU_OPT_SIZE: + info->type =3D COMMAND_LINE_PARAMETER_TYPE_SIZE; + break; + } + + info->help =3D g_strdup(desc[i].help); + info->q_default =3D g_strdup(desc[i].def_value_str); + + QAPI_LIST_PREPEND(param_list, info); + } + + return param_list; +} + +/* remove repeated entry from the info list */ +static void cleanup_infolist(CommandLineParameterInfoList *head) +{ + CommandLineParameterInfoList *pre_entry, *cur, *del_entry; + + cur =3D head; + while (cur->next) { + pre_entry =3D head; + while (pre_entry !=3D cur->next) { + if (!strcmp(pre_entry->value->name, cur->next->value->name)) { + del_entry =3D cur->next; + cur->next =3D cur->next->next; + del_entry->next =3D NULL; + qapi_free_CommandLineParameterInfoList(del_entry); + break; + } + pre_entry =3D pre_entry->next; + } + cur =3D cur->next; + } +} + +/* merge the description items of two parameter infolists */ +static void connect_infolist(CommandLineParameterInfoList *head, + CommandLineParameterInfoList *new) +{ + CommandLineParameterInfoList *cur; + + cur =3D head; + while (cur->next) { + cur =3D cur->next; + } + cur->next =3D new; +} + +/* access all the local QemuOptsLists for drive option */ +static CommandLineParameterInfoList *get_drive_infolist(void) +{ + CommandLineParameterInfoList *head =3D NULL, *cur; + int i; + + for (i =3D 0; drive_config_groups[i] !=3D NULL; i++) { + if (!head) { + head =3D query_option_descs(drive_config_groups[i]->desc); + } else { + cur =3D query_option_descs(drive_config_groups[i]->desc); + connect_infolist(head, cur); + } + } + cleanup_infolist(head); + + return head; +} + +static CommandLineParameterInfo *objprop_to_cmdline_prop(ObjectProperty *p= rop) +{ + CommandLineParameterInfo *info; + + info =3D g_malloc0(sizeof(*info)); + info->name =3D g_strdup(prop->name); + + if (g_str_equal(prop->type, "bool") || g_str_equal(prop->type, "OnOffA= uto")) { + info->type =3D COMMAND_LINE_PARAMETER_TYPE_BOOLEAN; + } else if (g_str_equal(prop->type, "int")) { + info->type =3D COMMAND_LINE_PARAMETER_TYPE_NUMBER; + } else if (g_str_equal(prop->type, "size")) { + info->type =3D COMMAND_LINE_PARAMETER_TYPE_SIZE; + } else { + info->type =3D COMMAND_LINE_PARAMETER_TYPE_STRING; + } + + if (prop->description) { + info->help =3D g_strdup(prop->description); + } + + return info; +} + +static CommandLineParameterInfoList *query_all_machine_properties(void) +{ + CommandLineParameterInfoList *params =3D NULL, *clpiter; + CommandLineParameterInfo *info; + GSList *machines, *curr_mach; + ObjectPropertyIterator op_iter; + ObjectProperty *prop; + bool is_new; + + machines =3D object_class_get_list(TYPE_MACHINE, false); + assert(machines); + + /* Loop over all machine classes */ + for (curr_mach =3D machines; curr_mach; curr_mach =3D curr_mach->next)= { + object_class_property_iter_init(&op_iter, curr_mach->data); + /* ... and over the properties of each machine: */ + while ((prop =3D object_property_iter_next(&op_iter))) { + if (!prop->set) { + continue; + } + /* + * Check whether the property has already been put into the li= st + * (via another machine class) + */ + is_new =3D true; + for (clpiter =3D params; clpiter !=3D NULL; clpiter =3D clpite= r->next) { + if (g_str_equal(clpiter->value->name, prop->name)) { + is_new =3D false; + break; + } + } + /* If it hasn't been added before, add it now to the list */ + if (is_new) { + info =3D objprop_to_cmdline_prop(prop); + QAPI_LIST_PREPEND(params, info); + } + } + } + + g_slist_free(machines); + + /* Add entry for the "type" parameter */ + info =3D g_malloc0(sizeof(*info)); + info->name =3D g_strdup("type"); + info->type =3D COMMAND_LINE_PARAMETER_TYPE_STRING; + info->help =3D g_strdup("machine type"); + QAPI_LIST_PREPEND(params, info); + + return params; +} + +CommandLineOptionInfoList *qmp_query_command_line_options(const char *opti= on, + Error **errp) +{ + CommandLineOptionInfoList *conf_list =3D NULL; + CommandLineOptionInfo *info; + int i; + + for (i =3D 0; vm_config_groups[i] !=3D NULL; i++) { + if (!option || !strcmp(option, vm_config_groups[i]->name)) { + info =3D g_malloc0(sizeof(*info)); + info->option =3D g_strdup(vm_config_groups[i]->name); + if (!strcmp("drive", vm_config_groups[i]->name)) { + info->parameters =3D get_drive_infolist(); + } else { + info->parameters =3D + query_option_descs(vm_config_groups[i]->desc); + } + QAPI_LIST_PREPEND(conf_list, info); + } + } + + if (!option || !strcmp(option, "machine")) { + info =3D g_malloc0(sizeof(*info)); + info->option =3D g_strdup("machine"); + info->parameters =3D query_all_machine_properties(); + QAPI_LIST_PREPEND(conf_list, info); + } + + if (conf_list =3D=3D NULL) { + error_setg(errp, "invalid option name: %s", option); + } + + return conf_list; +} diff --git a/util/qemu-config.c b/util/qemu-config.c index 42076efe1ef..a90c18dad25 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -1,16 +1,14 @@ #include "qemu/osdep.h" #include "block/qdict.h" /* for qdict_extract_subqdict() */ #include "qapi/error.h" -#include "qapi/qapi-commands-misc.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" #include "qemu/error-report.h" #include "qemu/option.h" #include "qemu/config-file.h" -#include "hw/boards.h" =20 -static QemuOptsList *vm_config_groups[48]; -static QemuOptsList *drive_config_groups[5]; +QemuOptsList *vm_config_groups[48]; +QemuOptsList *drive_config_groups[5]; =20 static QemuOptsList *find_list(QemuOptsList **lists, const char *group, Error **errp) @@ -55,204 +53,6 @@ QemuOpts *qemu_find_opts_singleton(const char *group) return opts; } =20 -static CommandLineParameterInfoList *query_option_descs(const QemuOptDesc = *desc) -{ - CommandLineParameterInfoList *param_list =3D NULL; - CommandLineParameterInfo *info; - int i; - - for (i =3D 0; desc[i].name !=3D NULL; i++) { - info =3D g_malloc0(sizeof(*info)); - info->name =3D g_strdup(desc[i].name); - - switch (desc[i].type) { - case QEMU_OPT_STRING: - info->type =3D COMMAND_LINE_PARAMETER_TYPE_STRING; - break; - case QEMU_OPT_BOOL: - info->type =3D COMMAND_LINE_PARAMETER_TYPE_BOOLEAN; - break; - case QEMU_OPT_NUMBER: - info->type =3D COMMAND_LINE_PARAMETER_TYPE_NUMBER; - break; - case QEMU_OPT_SIZE: - info->type =3D COMMAND_LINE_PARAMETER_TYPE_SIZE; - break; - } - - info->help =3D g_strdup(desc[i].help); - info->q_default =3D g_strdup(desc[i].def_value_str); - - QAPI_LIST_PREPEND(param_list, info); - } - - return param_list; -} - -/* remove repeated entry from the info list */ -static void cleanup_infolist(CommandLineParameterInfoList *head) -{ - CommandLineParameterInfoList *pre_entry, *cur, *del_entry; - - cur =3D head; - while (cur->next) { - pre_entry =3D head; - while (pre_entry !=3D cur->next) { - if (!strcmp(pre_entry->value->name, cur->next->value->name)) { - del_entry =3D cur->next; - cur->next =3D cur->next->next; - del_entry->next =3D NULL; - qapi_free_CommandLineParameterInfoList(del_entry); - break; - } - pre_entry =3D pre_entry->next; - } - cur =3D cur->next; - } -} - -/* merge the description items of two parameter infolists */ -static void connect_infolist(CommandLineParameterInfoList *head, - CommandLineParameterInfoList *new) -{ - CommandLineParameterInfoList *cur; - - cur =3D head; - while (cur->next) { - cur =3D cur->next; - } - cur->next =3D new; -} - -/* access all the local QemuOptsLists for drive option */ -static CommandLineParameterInfoList *get_drive_infolist(void) -{ - CommandLineParameterInfoList *head =3D NULL, *cur; - int i; - - for (i =3D 0; drive_config_groups[i] !=3D NULL; i++) { - if (!head) { - head =3D query_option_descs(drive_config_groups[i]->desc); - } else { - cur =3D query_option_descs(drive_config_groups[i]->desc); - connect_infolist(head, cur); - } - } - cleanup_infolist(head); - - return head; -} - -static CommandLineParameterInfo *objprop_to_cmdline_prop(ObjectProperty *p= rop) -{ - CommandLineParameterInfo *info; - - info =3D g_malloc0(sizeof(*info)); - info->name =3D g_strdup(prop->name); - - if (g_str_equal(prop->type, "bool") || g_str_equal(prop->type, "OnOffA= uto")) { - info->type =3D COMMAND_LINE_PARAMETER_TYPE_BOOLEAN; - } else if (g_str_equal(prop->type, "int")) { - info->type =3D COMMAND_LINE_PARAMETER_TYPE_NUMBER; - } else if (g_str_equal(prop->type, "size")) { - info->type =3D COMMAND_LINE_PARAMETER_TYPE_SIZE; - } else { - info->type =3D COMMAND_LINE_PARAMETER_TYPE_STRING; - } - - if (prop->description) { - info->help =3D g_strdup(prop->description); - } - - return info; -} - -static CommandLineParameterInfoList *query_all_machine_properties(void) -{ - CommandLineParameterInfoList *params =3D NULL, *clpiter; - CommandLineParameterInfo *info; - GSList *machines, *curr_mach; - ObjectPropertyIterator op_iter; - ObjectProperty *prop; - bool is_new; - - machines =3D object_class_get_list(TYPE_MACHINE, false); - assert(machines); - - /* Loop over all machine classes */ - for (curr_mach =3D machines; curr_mach; curr_mach =3D curr_mach->next)= { - object_class_property_iter_init(&op_iter, curr_mach->data); - /* ... and over the properties of each machine: */ - while ((prop =3D object_property_iter_next(&op_iter))) { - if (!prop->set) { - continue; - } - /* - * Check whether the property has already been put into the li= st - * (via another machine class) - */ - is_new =3D true; - for (clpiter =3D params; clpiter !=3D NULL; clpiter =3D clpite= r->next) { - if (g_str_equal(clpiter->value->name, prop->name)) { - is_new =3D false; - break; - } - } - /* If it hasn't been added before, add it now to the list */ - if (is_new) { - info =3D objprop_to_cmdline_prop(prop); - QAPI_LIST_PREPEND(params, info); - } - } - } - - g_slist_free(machines); - - /* Add entry for the "type" parameter */ - info =3D g_malloc0(sizeof(*info)); - info->name =3D g_strdup("type"); - info->type =3D COMMAND_LINE_PARAMETER_TYPE_STRING; - info->help =3D g_strdup("machine type"); - QAPI_LIST_PREPEND(params, info); - - return params; -} - -CommandLineOptionInfoList *qmp_query_command_line_options(const char *opti= on, - Error **errp) -{ - CommandLineOptionInfoList *conf_list =3D NULL; - CommandLineOptionInfo *info; - int i; - - for (i =3D 0; vm_config_groups[i] !=3D NULL; i++) { - if (!option || !strcmp(option, vm_config_groups[i]->name)) { - info =3D g_malloc0(sizeof(*info)); - info->option =3D g_strdup(vm_config_groups[i]->name); - if (!strcmp("drive", vm_config_groups[i]->name)) { - info->parameters =3D get_drive_infolist(); - } else { - info->parameters =3D - query_option_descs(vm_config_groups[i]->desc); - } - QAPI_LIST_PREPEND(conf_list, info); - } - } - - if (!option || !strcmp(option, "machine")) { - info =3D g_malloc0(sizeof(*info)); - info->option =3D g_strdup("machine"); - info->parameters =3D query_all_machine_properties(); - QAPI_LIST_PREPEND(conf_list, info); - } - - if (conf_list =3D=3D NULL) { - error_setg(errp, "invalid option name: %s", option); - } - - return conf_list; -} - QemuOptsList *qemu_find_opts_err(const char *group, Error **errp) { return find_list(vm_config_groups, group, errp); diff --git a/monitor/meson.build b/monitor/meson.build index 5269492cf05..a71523a1ce8 100644 --- a/monitor/meson.build +++ b/monitor/meson.build @@ -4,6 +4,7 @@ system_ss.add(files( 'fds.c', 'hmp-cmds.c', 'hmp.c', + 'qemu-config-qmp.c', )) system_ss.add([spice_headers, files('qmp-cmds.c')]) =20 --=20 2.44.0