diff options
| -rw-r--r-- | hmp.c | 19 | ||||
| -rw-r--r-- | hmp.h | 1 | ||||
| -rw-r--r-- | monitor.c | 41 | ||||
| -rw-r--r-- | qapi-schema.json | 67 | ||||
| -rw-r--r-- | qmp-commands.hx | 6 | ||||
| -rw-r--r-- | sysemu.h | 19 | ||||
| -rw-r--r-- | vl.c | 32 |
7 files changed, 106 insertions, 79 deletions
@@ -53,3 +53,22 @@ void hmp_info_kvm(Monitor *mon) qapi_free_KvmInfo(info); } +void hmp_info_status(Monitor *mon) +{ + StatusInfo *info; + + info = qmp_query_status(NULL); + + monitor_printf(mon, "VM status: %s%s", + info->running ? "running" : "paused", + info->singlestep ? " (single step mode)" : ""); + + if (!info->running && info->status != RUN_STATE_PAUSED) { + monitor_printf(mon, " (%s)", RunState_lookup[info->status]); + } + + monitor_printf(mon, "\n"); + + qapi_free_StatusInfo(info); +} + @@ -20,5 +20,6 @@ void hmp_info_name(Monitor *mon); void hmp_info_version(Monitor *mon); void hmp_info_kvm(Monitor *mon); +void hmp_info_status(Monitor *mon); #endif @@ -2550,36 +2550,6 @@ static int do_inject_nmi(Monitor *mon, const QDict *qdict, QObject **ret_data) } #endif -static void do_info_status_print(Monitor *mon, const QObject *data) -{ - QDict *qdict; - const char *status; - - qdict = qobject_to_qdict(data); - - monitor_printf(mon, "VM status: "); - if (qdict_get_bool(qdict, "running")) { - monitor_printf(mon, "running"); - if (qdict_get_bool(qdict, "singlestep")) { - monitor_printf(mon, " (single step mode)"); - } - } else { - monitor_printf(mon, "paused"); - } - - status = qdict_get_str(qdict, "status"); - if (strcmp(status, "paused") && strcmp(status, "running")) { - monitor_printf(mon, " (%s)", status); - } - - monitor_printf(mon, "\n"); -} - -static void do_info_status(Monitor *mon, QObject **ret_data) -{ - *ret_data = qobject_from_jsonf("{ 'running': %i, 'singlestep': %i, 'status': %s }", runstate_is_running(), singlestep, runstate_as_string()); -} - static qemu_acl *find_acl(Monitor *mon, const char *name) { qemu_acl *acl = qemu_acl_find(name); @@ -2979,8 +2949,7 @@ static const mon_cmd_t info_cmds[] = { .args_type = "", .params = "", .help = "show the current VM status (running|paused)", - .user_print = do_info_status_print, - .mhandler.info_new = do_info_status, + .mhandler.info = hmp_info_status, }, { .name = "pcmcia", @@ -3162,14 +3131,6 @@ static const mon_cmd_t qmp_query_cmds[] = { .mhandler.info_new = do_pci_info, }, { - .name = "status", - .args_type = "", - .params = "", - .help = "show the current VM status (running|paused)", - .user_print = do_info_status_print, - .mhandler.info_new = do_info_status, - }, - { .name = "mice", .args_type = "", .params = "", diff --git a/qapi-schema.json b/qapi-schema.json index 641f12da7a..0e59c71005 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -85,3 +85,70 @@ ## { 'command': 'query-kvm', 'returns': 'KvmInfo' } +## +# @RunState +# +# An enumation of VM run states. +# +# @debug: QEMU is running on a debugger +# +# @inmigrate: guest is paused waiting for an incoming migration +# +# @internal-error: An internal error that prevents further guest execution +# has occurred +# +# @io-error: the last IOP has failed and the device is configured to pause +# on I/O errors +# +# @paused: guest has been paused via the 'stop' command +# +# @postmigrate: guest is paused following a successful 'migrate' +# +# @prelaunch: QEMU was started with -S and guest has not started +# +# @finish-migrate: guest is paused to finish the migration process +# +# @restore-vm: guest is paused to restore VM state +# +# @running: guest is actively running +# +# @save-vm: guest is paused to save the VM state +# +# @shutdown: guest is shut down (and -no-shutdown is in use) +# +# @watchdog: the watchdog action is configured to pause and has been triggered +## +{ 'enum': 'RunState', + 'data': [ 'debug', 'inmigrate', 'internal-error', 'io-error', 'paused', + 'postmigrate', 'prelaunch', 'finish-migrate', 'restore-vm', + 'running', 'save-vm', 'shutdown', 'watchdog' ] } + +## +# @StatusInfo: +# +# Information about VCPU run state +# +# @running: true if all VCPUs are runnable, false if not runnable +# +# @singlestep: true if VCPUs are in single-step mode +# +# @status: the virtual machine @RunState +# +# Since: 0.14.0 +# +# Notes: @singlestep is enabled through the GDB stub +## +{ 'type': 'StatusInfo', + 'data': {'running': 'bool', 'singlestep': 'bool', 'status': 'RunState'} } + +## +# @query-status: +# +# Query the run status of all VCPUs +# +# Returns: @StatusInfo reflecting all VCPUs +# +# Since: 0.14.0 +## +{ 'command': 'query-status', 'returns': 'StatusInfo' } + diff --git a/qmp-commands.hx b/qmp-commands.hx index 9f9751d1c3..afa95bd93a 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -1609,6 +1609,12 @@ Example: <- { "return": { "running": true, "singlestep": false, "status": "running" } } EQMP + + { + .name = "query-status", + .args_type = "", + .mhandler.cmd_new = qmp_marshal_input_query_status, + }, SQMP query-mice @@ -6,27 +6,11 @@ #include "qemu-option.h" #include "qemu-queue.h" #include "qemu-timer.h" +#include "qapi-types.h" #include "notify.h" /* vl.c */ -typedef enum { - RUN_STATE_DEBUG, /* qemu is running under gdb */ - RUN_STATE_INMIGRATE, /* paused waiting for an incoming migration */ - RUN_STATE_INTERNAL_ERROR, /* paused due to an internal error */ - RUN_STATE_IO_ERROR, /* paused due to an I/O error */ - RUN_STATE_PAUSED, /* paused by the user (ie. the 'stop' command) */ - RUN_STATE_POSTMIGRATE, /* paused following a successful migration */ - RUN_STATE_PRELAUNCH, /* qemu was started with -S and haven't started */ - RUN_STATE_FINISH_MIGRATE, /* paused preparing to finish migrate */ - RUN_STATE_RESTORE_VM, /* paused restoring the VM state */ - RUN_STATE_RUNNING, /* qemu is running */ - RUN_STATE_SAVE_VM, /* paused saving VM state */ - RUN_STATE_SHUTDOWN, /* guest shut down and -no-shutdown is in use */ - RUN_STATE_WATCHDOG, /* watchdog fired and qemu is configured to pause */ - RUN_STATE_MAX -} RunState; - extern const char *bios_name; extern const char *qemu_name; @@ -38,7 +22,6 @@ void runstate_init(void); bool runstate_check(RunState state); void runstate_set(RunState new_state); int runstate_is_running(void); -const char *runstate_as_string(void); typedef struct vm_change_state_entry VMChangeStateEntry; typedef void VMChangeStateHandler(void *opaque, int running, RunState state); @@ -147,6 +147,7 @@ int main(int argc, char **argv) #include "qemu-config.h" #include "qemu-objects.h" #include "qemu-options.h" +#include "qmp-commands.h" #ifdef CONFIG_VIRTFS #include "fsdev/qemu-fsdev.h" #endif @@ -375,22 +376,6 @@ static const RunStateTransition runstate_transitions_def[] = { static bool runstate_valid_transitions[RUN_STATE_MAX][RUN_STATE_MAX]; -static const char *const runstate_name_tbl[RUN_STATE_MAX] = { - [RUN_STATE_DEBUG] = "debug", - [RUN_STATE_INMIGRATE] = "incoming-migration", - [RUN_STATE_INTERNAL_ERROR] = "internal-error", - [RUN_STATE_IO_ERROR] = "io-error", - [RUN_STATE_PAUSED] = "paused", - [RUN_STATE_POSTMIGRATE] = "post-migrate", - [RUN_STATE_PRELAUNCH] = "prelaunch", - [RUN_STATE_FINISH_MIGRATE] = "finish-migrate", - [RUN_STATE_RESTORE_VM] = "restore-vm", - [RUN_STATE_RUNNING] = "running", - [RUN_STATE_SAVE_VM] = "save-vm", - [RUN_STATE_SHUTDOWN] = "shutdown", - [RUN_STATE_WATCHDOG] = "watchdog", -}; - bool runstate_check(RunState state) { return current_run_state == state; @@ -419,15 +404,20 @@ void runstate_set(RunState new_state) current_run_state = new_state; } -const char *runstate_as_string(void) +int runstate_is_running(void) { - assert(current_run_state < RUN_STATE_MAX); - return runstate_name_tbl[current_run_state]; + return runstate_check(RUN_STATE_RUNNING); } -int runstate_is_running(void) +StatusInfo *qmp_query_status(Error **errp) { - return runstate_check(RUN_STATE_RUNNING); + StatusInfo *info = g_malloc0(sizeof(*info)); + + info->running = runstate_is_running(); + info->singlestep = singlestep; + info->status = current_run_state; + + return info; } /***********************************************************/ |