From: Igor Mammedov <imammedo@redhat.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-devel@nongnu.org
Subject: Re: [PATCH 26/29] hmp: introduce cmd_available
Date: Fri, 20 Nov 2020 16:46:52 +0100 [thread overview]
Message-ID: <20201120164652.220b9cfe@redhat.com> (raw)
In-Reply-To: <20201027182144.3315885-27-pbonzini@redhat.com>
On Tue, 27 Oct 2020 14:21:41 -0400
Paolo Bonzini <pbonzini@redhat.com> wrote:
> Combine the RUN_STATE_PRECONFIG and cmd_can_preconfig checks
> into a single function, to avoid repeating the same expression
> (or its negation after applying DeMorgan's rule) over and
> over again.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> ---
> monitor/hmp.c | 18 ++++++++++--------
> 1 file changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/monitor/hmp.c b/monitor/hmp.c
> index c5cd9d372b..f13ef455e2 100644
> --- a/monitor/hmp.c
> +++ b/monitor/hmp.c
> @@ -213,6 +213,11 @@ static bool cmd_can_preconfig(const HMPCommand *cmd)
> return strchr(cmd->flags, 'p');
> }
>
> +static bool cmd_available(const HMPCommand *cmd)
> +{
> + return !runstate_check(RUN_STATE_PRECONFIG) || cmd_can_preconfig(cmd);
> +}
> +
> static void help_cmd_dump_one(Monitor *mon,
> const HMPCommand *cmd,
> char **prefix_args,
> @@ -220,7 +225,7 @@ static void help_cmd_dump_one(Monitor *mon,
> {
> int i;
>
> - if (runstate_check(RUN_STATE_PRECONFIG) && !cmd_can_preconfig(cmd)) {
> + if (!cmd_available(cmd)) {
> return;
> }
>
> @@ -248,8 +253,7 @@ static void help_cmd_dump(Monitor *mon, const HMPCommand *cmds,
> /* Find one entry to dump */
> for (cmd = cmds; cmd->name != NULL; cmd++) {
> if (hmp_compare_cmd(args[arg_index], cmd->name) &&
> - ((!runstate_check(RUN_STATE_PRECONFIG) ||
> - cmd_can_preconfig(cmd)))) {
> + cmd_available(cmd)) {
> if (cmd->sub_table) {
> /* continue with next arg */
> help_cmd_dump(mon, cmd->sub_table,
> @@ -653,7 +657,7 @@ static const HMPCommand *monitor_parse_command(MonitorHMP *hmp_mon,
> (int)(p - cmdp_start), cmdp_start);
> return NULL;
> }
> - if (runstate_check(RUN_STATE_PRECONFIG) && !cmd_can_preconfig(cmd)) {
> + if (!cmd_available(cmd)) {
> monitor_printf(mon, "Command '%.*s' not available with -preconfig "
> "until after exit_preconfig.\n",
> (int)(p - cmdp_start), cmdp_start);
> @@ -1225,8 +1229,7 @@ static void monitor_find_completion_by_table(MonitorHMP *mon,
> }
> readline_set_completion_index(mon->rs, strlen(cmdname));
> for (cmd = cmd_table; cmd->name != NULL; cmd++) {
> - if (!runstate_check(RUN_STATE_PRECONFIG) ||
> - cmd_can_preconfig(cmd)) {
> + if (cmd_available(cmd)) {
> cmd_completion(mon, cmdname, cmd->name);
> }
> }
> @@ -1234,8 +1237,7 @@ static void monitor_find_completion_by_table(MonitorHMP *mon,
> /* find the command */
> for (cmd = cmd_table; cmd->name != NULL; cmd++) {
> if (hmp_compare_cmd(args[0], cmd->name) &&
> - (!runstate_check(RUN_STATE_PRECONFIG) ||
> - cmd_can_preconfig(cmd))) {
> + cmd_available(cmd)) {
> break;
> }
> }
next prev parent reply other threads:[~2020-11-20 15:56 UTC|newest]
Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-27 18:21 [RFC PATCH v2 00/37] cleanup qemu_init and make sense of command line processing Paolo Bonzini
2020-10-27 18:21 ` [PATCH 01/29] trace: remove argument from trace_init_file Paolo Bonzini
2020-10-27 18:21 ` [PATCH 02/29] semihosting: fix order of initialization functions Paolo Bonzini
2020-10-27 18:21 ` [PATCH 03/29] vl: extract validation of -smp to machine.c Paolo Bonzini
2020-10-28 16:32 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 04/29] vl: remove bogus check Paolo Bonzini
2020-10-28 16:48 ` Igor Mammedov
2020-10-28 16:55 ` Daniel P. Berrangé
2020-10-28 19:32 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 05/29] vl: split various early command line options to a separate function Paolo Bonzini
2020-11-02 15:30 ` Igor Mammedov
2020-11-02 16:33 ` Paolo Bonzini
2020-10-27 18:21 ` [PATCH 06/29] vl: move various initialization routines out of qemu_init Paolo Bonzini
2020-11-02 15:40 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 07/29] vl: extract qemu_init_subsystems Paolo Bonzini
2020-11-02 15:55 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 08/29] vl: move prelaunch part of qemu_init to new functions Paolo Bonzini
2020-11-11 19:29 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 09/29] vl: extract various command line validation snippets to a new function Paolo Bonzini
2020-11-11 19:39 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 10/29] vl: preconfig and loadvm are mutually exclusive Paolo Bonzini
2020-11-11 19:58 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 11/29] vl: extract various command line desugaring snippets to a new function Paolo Bonzini
2020-11-11 19:57 ` Igor Mammedov
2020-11-11 20:04 ` Paolo Bonzini
2020-11-18 16:55 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 12/29] vl: create "-net nic -net user" default earlier Paolo Bonzini
2020-11-18 14:43 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 13/29] vl: load plugins as late as possible Paolo Bonzini
2020-10-27 18:21 ` [PATCH 14/29] vl: move semihosting command line fallback to qemu_finish_machine_init Paolo Bonzini
2020-10-27 18:21 ` [PATCH 15/29] vl: extract default devices to separate functions Paolo Bonzini
2020-10-27 18:21 ` [PATCH 16/29] vl: move CHECKPOINT_INIT after preconfig Paolo Bonzini
2020-10-27 18:21 ` [PATCH 17/29] vl: separate qemu_create_early_backends Paolo Bonzini
2020-11-18 16:29 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 18/29] vl: separate qemu_create_late_backends Paolo Bonzini
2020-11-18 16:33 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 19/29] vl: separate qemu_create_machine Paolo Bonzini
2020-11-18 16:45 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 20/29] vl: separate qemu_apply_machine_options Paolo Bonzini
2020-11-18 16:57 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 21/29] vl: separate qemu_resolve_machine_memdev Paolo Bonzini
2020-11-20 13:15 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 22/29] vl: initialize displays before preconfig loop Paolo Bonzini
2020-11-20 15:11 ` Igor Mammedov
2020-11-20 15:53 ` Paolo Bonzini
2020-11-20 16:32 ` Igor Mammedov
2020-11-20 16:46 ` Paolo Bonzini
2020-11-20 17:11 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 23/29] vl: move -global check earlier Paolo Bonzini
2020-11-20 15:10 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 24/29] migration, vl: start migration via qmp_migrate_incoming Paolo Bonzini
2020-11-20 15:34 ` Igor Mammedov
2020-11-20 16:02 ` Paolo Bonzini
2020-12-02 13:10 ` Dr. David Alan Gilbert
2020-12-02 13:15 ` Daniel P. Berrangé
2020-12-02 13:29 ` Paolo Bonzini
2020-12-02 13:36 ` Paolo Bonzini
2020-12-02 15:08 ` Dr. David Alan Gilbert
2020-10-27 18:21 ` [PATCH 25/29] vl: start VM via qmp_cont Paolo Bonzini
2020-11-20 16:08 ` Igor Mammedov
2020-10-27 18:21 ` [PATCH 26/29] hmp: introduce cmd_available Paolo Bonzini
2020-11-20 15:46 ` Igor Mammedov [this message]
2020-10-27 18:21 ` [PATCH 27/29] remove preconfig state Paolo Bonzini
2020-11-20 16:01 ` Igor Mammedov
2020-11-20 16:22 ` Paolo Bonzini
2020-10-27 18:21 ` [PATCH 28/29] vl: remove separate preconfig main_loop Paolo Bonzini
2020-11-20 16:26 ` Igor Mammedov
2020-11-20 16:39 ` Paolo Bonzini
2020-11-23 8:34 ` Paolo Bonzini
2020-10-27 18:21 ` [PATCH 29/29] vl: allow -incoming defer with -preconfig Paolo Bonzini
2020-11-20 16:28 ` Igor Mammedov
2020-11-20 16:45 ` Paolo Bonzini
2020-11-02 15:57 ` [RFC PATCH v2 00/37] cleanup qemu_init and make sense of command line processing Igor Mammedov
2020-11-02 16:34 ` Paolo Bonzini
2020-11-03 12:57 ` Igor Mammedov
2020-11-03 14:37 ` Paolo Bonzini
2020-11-20 16:19 ` Igor Mammedov
2020-11-20 16:27 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201120164652.220b9cfe@redhat.com \
--to=imammedo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).