Commit 2b9e3576 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Markus Armbruster
Browse files

monitor: remove mhandler.cmd_new 



This is no longer necessary now that we aren't using middle mode
anymore.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-Id: <20160912091913.15831-12-marcandre.lureau@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 9e812b6a

docs/writing-qmp-commands.txt

+2 −2
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ we should add it to the hmp-commands.hx file: 
        .args_type  = "message:s?",

        .params     = "hello-world [message]",

        .help       = "Print message to the standard output",

        .mhandler.cmd = hmp_hello_world,

        .cmd        = hmp_hello_world,

    },



STEXI
@@ -515,7 +515,7 @@ in the monitor.c file. The entry for the "info alarmclock" follows: 
        .args_type  = "",

        .params     = "",

        .help       = "show information about the alarm clock",

        .mhandler.cmd = hmp_info_alarm_clock,

        .cmd        = hmp_info_alarm_clock,

    },



To test this, run qemu and type "info alarmclock" in the user monitor.

hmp-commands-info.hx

+59 −59
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show the version of QEMU",

        .mhandler.cmd = hmp_info_version,

        .cmd        = hmp_info_version,

    },



STEXI
@@ -32,7 +32,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show the network state",

        .mhandler.cmd = hmp_info_network,

        .cmd        = hmp_info_network,

    },



STEXI
@@ -46,7 +46,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show the character devices",

        .mhandler.cmd = hmp_info_chardev,

        .cmd        = hmp_info_chardev,

    },



STEXI
@@ -61,7 +61,7 @@ ETEXI 
        .params     = "[-n] [-v] [device]",

        .help       = "show info of one block device or all block devices "

                      "(-n: show named nodes; -v: show details)",

        .mhandler.cmd = hmp_info_block,

        .cmd        = hmp_info_block,

    },



STEXI
@@ -75,7 +75,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show block device statistics",

        .mhandler.cmd = hmp_info_blockstats,

        .cmd        = hmp_info_blockstats,

    },



STEXI
@@ -89,7 +89,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show progress of ongoing block device operations",

        .mhandler.cmd = hmp_info_block_jobs,

        .cmd        = hmp_info_block_jobs,

    },



STEXI
@@ -103,7 +103,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show the cpu registers",

        .mhandler.cmd = hmp_info_registers,

        .cmd        = hmp_info_registers,

    },



STEXI
@@ -118,7 +118,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show local apic state",

        .mhandler.cmd = hmp_info_local_apic,

        .cmd        = hmp_info_local_apic,

    },

#endif
@@ -134,7 +134,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show io apic state",

        .mhandler.cmd = hmp_info_io_apic,

        .cmd        = hmp_info_io_apic,

    },

#endif
@@ -149,7 +149,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show infos for each CPU",

        .mhandler.cmd = hmp_info_cpus,

        .cmd        = hmp_info_cpus,

    },



STEXI
@@ -163,7 +163,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show the command line history",

        .mhandler.cmd = hmp_info_history,

        .cmd        = hmp_info_history,

    },



STEXI
@@ -180,11 +180,11 @@ ETEXI 
        .params     = "",

        .help       = "show the interrupts statistics (if available)",

#ifdef TARGET_SPARC

        .mhandler.cmd = sun4m_hmp_info_irq,

        .cmd        = sun4m_hmp_info_irq,

#elif defined(TARGET_LM32)

        .mhandler.cmd = lm32_hmp_info_irq,

        .cmd        = lm32_hmp_info_irq,

#else

        .mhandler.cmd = hmp_info_irq,

        .cmd        = hmp_info_irq,

#endif

    },
@@ -200,11 +200,11 @@ ETEXI 
        .params     = "",

        .help       = "show i8259 (PIC) state",

#ifdef TARGET_SPARC

        .mhandler.cmd = sun4m_hmp_info_pic,

        .cmd        = sun4m_hmp_info_pic,

#elif defined(TARGET_LM32)

        .mhandler.cmd = lm32_hmp_info_pic,

        .cmd        = lm32_hmp_info_pic,

#else

        .mhandler.cmd = hmp_info_pic,

        .cmd        = hmp_info_pic,

#endif

    },

#endif
@@ -220,7 +220,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show PCI info",

        .mhandler.cmd = hmp_info_pci,

        .cmd        = hmp_info_pci,

    },



STEXI
@@ -236,7 +236,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show virtual to physical memory mappings",

        .mhandler.cmd = hmp_info_tlb,

        .cmd        = hmp_info_tlb,

    },

#endif
@@ -252,7 +252,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show the active virtual memory mappings",

        .mhandler.cmd = hmp_info_mem,

        .cmd        = hmp_info_mem,

    },

#endif
@@ -267,7 +267,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show memory tree",

        .mhandler.cmd = hmp_info_mtree,

        .cmd        = hmp_info_mtree,

    },



STEXI
@@ -281,7 +281,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show dynamic compiler info",

        .mhandler.cmd = hmp_info_jit,

        .cmd        = hmp_info_jit,

    },



STEXI
@@ -295,7 +295,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show dynamic compiler opcode counters",

        .mhandler.cmd = hmp_info_opcount,

        .cmd        = hmp_info_opcount,

    },



STEXI
@@ -309,7 +309,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show KVM information",

        .mhandler.cmd = hmp_info_kvm,

        .cmd        = hmp_info_kvm,

    },



STEXI
@@ -323,7 +323,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show NUMA information",

        .mhandler.cmd = hmp_info_numa,

        .cmd        = hmp_info_numa,

    },



STEXI
@@ -337,7 +337,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show guest USB devices",

        .mhandler.cmd = hmp_info_usb,

        .cmd        = hmp_info_usb,

    },



STEXI
@@ -351,7 +351,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show host USB devices",

        .mhandler.cmd = hmp_info_usbhost,

        .cmd        = hmp_info_usbhost,

    },



STEXI
@@ -365,7 +365,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show profiling information",

        .mhandler.cmd = hmp_info_profile,

        .cmd        = hmp_info_profile,

    },



STEXI
@@ -379,7 +379,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show capture information",

        .mhandler.cmd = hmp_info_capture,

        .cmd        = hmp_info_capture,

    },



STEXI
@@ -393,7 +393,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show the currently saved VM snapshots",

        .mhandler.cmd = hmp_info_snapshots,

        .cmd        = hmp_info_snapshots,

    },



STEXI
@@ -407,7 +407,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show the current VM status (running|paused)",

        .mhandler.cmd = hmp_info_status,

        .cmd        = hmp_info_status,

    },



STEXI
@@ -421,7 +421,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show which guest mouse is receiving events",

        .mhandler.cmd = hmp_info_mice,

        .cmd        = hmp_info_mice,

    },



STEXI
@@ -435,7 +435,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show the vnc server status",

        .mhandler.cmd = hmp_info_vnc,

        .cmd        = hmp_info_vnc,

    },



STEXI
@@ -450,7 +450,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show the spice server status",

        .mhandler.cmd = hmp_info_spice,

        .cmd        = hmp_info_spice,

    },

#endif
@@ -465,7 +465,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show the current VM name",

        .mhandler.cmd = hmp_info_name,

        .cmd        = hmp_info_name,

    },



STEXI
@@ -479,7 +479,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show the current VM UUID",

        .mhandler.cmd = hmp_info_uuid,

        .cmd        = hmp_info_uuid,

    },



STEXI
@@ -493,7 +493,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show CPU statistics",

        .mhandler.cmd = hmp_info_cpustats,

        .cmd        = hmp_info_cpustats,

    },



STEXI
@@ -508,7 +508,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show user network stack connection states",

        .mhandler.cmd = hmp_info_usernet,

        .cmd        = hmp_info_usernet,

    },

#endif
@@ -523,7 +523,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show migration status",

        .mhandler.cmd = hmp_info_migrate,

        .cmd        = hmp_info_migrate,

    },



STEXI
@@ -537,7 +537,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show current migration capabilities",

        .mhandler.cmd = hmp_info_migrate_capabilities,

        .cmd        = hmp_info_migrate_capabilities,

    },



STEXI
@@ -551,7 +551,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show current migration parameters",

        .mhandler.cmd = hmp_info_migrate_parameters,

        .cmd        = hmp_info_migrate_parameters,

    },



STEXI
@@ -565,7 +565,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show current migration xbzrle cache size",

        .mhandler.cmd = hmp_info_migrate_cache_size,

        .cmd        = hmp_info_migrate_cache_size,

    },



STEXI
@@ -579,7 +579,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show balloon information",

        .mhandler.cmd = hmp_info_balloon,

        .cmd        = hmp_info_balloon,

    },



STEXI
@@ -593,7 +593,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show device tree",

        .mhandler.cmd = hmp_info_qtree,

        .cmd        = hmp_info_qtree,

    },



STEXI
@@ -607,7 +607,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show qdev device model list",

        .mhandler.cmd = hmp_info_qdm,

        .cmd        = hmp_info_qdm,

    },



STEXI
@@ -621,7 +621,7 @@ ETEXI 
        .args_type  = "path:s?",

        .params     = "[path]",

        .help       = "show QOM composition tree",

        .mhandler.cmd = hmp_info_qom_tree,

        .cmd        = hmp_info_qom_tree,

    },



STEXI
@@ -635,7 +635,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show roms",

        .mhandler.cmd = hmp_info_roms,

        .cmd        = hmp_info_roms,

    },



STEXI
@@ -650,7 +650,7 @@ ETEXI 
        .params     = "[name] [vcpu]",

        .help       = "show available trace-events & their state "

                      "(name: event name pattern; vcpu: vCPU to query, default is any)",

        .mhandler.cmd = hmp_info_trace_events,

        .cmd = hmp_info_trace_events,

        .command_completion = info_trace_events_completion,

    },
@@ -665,7 +665,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show the TPM device",

        .mhandler.cmd = hmp_info_tpm,

        .cmd        = hmp_info_tpm,

    },



STEXI
@@ -679,7 +679,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show memory backends",

        .mhandler.cmd = hmp_info_memdev,

        .cmd        = hmp_info_memdev,

    },



STEXI
@@ -693,7 +693,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show memory devices",

        .mhandler.cmd = hmp_info_memory_devices,

        .cmd        = hmp_info_memory_devices,

    },



STEXI
@@ -707,7 +707,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "show iothreads",

        .mhandler.cmd = hmp_info_iothreads,

        .cmd        = hmp_info_iothreads,

    },



STEXI
@@ -721,7 +721,7 @@ ETEXI 
        .args_type  = "name:s",

        .params     = "name",

        .help       = "Show rocker switch",

        .mhandler.cmd = hmp_rocker,

        .cmd        = hmp_rocker,

    },



STEXI
@@ -735,7 +735,7 @@ ETEXI 
        .args_type  = "name:s",

        .params     = "name",

        .help       = "Show rocker ports",

        .mhandler.cmd = hmp_rocker_ports,

        .cmd        = hmp_rocker_ports,

    },



STEXI
@@ -749,7 +749,7 @@ ETEXI 
        .args_type  = "name:s,tbl_id:i?",

        .params     = "name [tbl_id]",

        .help       = "Show rocker OF-DPA flow tables",

        .mhandler.cmd = hmp_rocker_of_dpa_flows,

        .cmd        = hmp_rocker_of_dpa_flows,

    },



STEXI
@@ -763,7 +763,7 @@ ETEXI 
        .args_type  = "name:s,type:i?",

        .params     = "name [type]",

        .help       = "Show rocker OF-DPA groups",

        .mhandler.cmd = hmp_rocker_of_dpa_groups,

        .cmd        = hmp_rocker_of_dpa_groups,

    },



STEXI
@@ -778,7 +778,7 @@ ETEXI 
        .args_type  = "addr:l",

        .params     = "address",

        .help       = "Display the value of a storage key",

        .mhandler.cmd = hmp_info_skeys,

        .cmd        = hmp_info_skeys,

    },

#endif
@@ -793,7 +793,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "Display the latest dump status",

        .mhandler.cmd = hmp_info_dump,

        .cmd        = hmp_info_dump,

    },



STEXI
@@ -807,7 +807,7 @@ ETEXI 
        .args_type  = "",

        .params     = "",

        .help       = "Show information about hotpluggable CPUs",

        .mhandler.cmd = hmp_hotpluggable_cpus,

        .cmd        = hmp_hotpluggable_cpus,

    },



STEXI

hmp-commands.hx

+104 −104

File changed.

Preview size limit exceeded, changes collapsed.

monitor.c

+5 −8
Original line number Diff line number Diff line
@@ -130,13 +130,10 @@ typedef struct mon_cmd_t { 
    const char *args_type;

    const char *params;

    const char *help;

    union {

    void (*cmd)(Monitor *mon, const QDict *qdict);

        void (*cmd_new)(QDict *params, QObject **ret_data, Error **errp);

    } mhandler;

    /* @sub_table is a list of 2nd level of commands. If it do not exist,

     * mhandler should be used. If it exist, sub_table[?].mhandler should be

     * used, and mhandler of 1st level plays the role of help function.

    /* @sub_table is a list of 2nd level of commands. If it does not exist,

     * cmd should be used. If it exists, sub_table[?].cmd should be

     * used, and cmd of 1st level plays the role of help function.

     */

    struct mon_cmd_t *sub_table;

    void (*command_completion)(ReadLineState *rs, int nb_args, const char *str);
@@ -3005,7 +3002,7 @@ static void handle_hmp_command(Monitor *mon, const char *cmdline) 
        return;

    }



    cmd->mhandler.cmd(mon, qdict);

    cmd->cmd(mon, qdict);

    QDECREF(qdict);

}