Browse Source
Move all of the QMP commands handlers to implement the 'control' module (qapi/control.json) that can be shared between the system emulator and tools such as a storage daemon to a new file monitor/qmp-cmds-control.c. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20200129102239.31435-4-kwolf@redhat.com> [Commit message tweaked] Signed-off-by: Markus Armbruster <armbru@redhat.com>pull/88/head
Kevin Wolf
7 years ago
committed by
Markus Armbruster
Markus Armbruster
4 changed files with 155 additions and 125 deletions
@ -1,3 +1,4 @@ |
|||
obj-y += misc.o |
|||
common-obj-y += monitor.o qmp.o hmp.o |
|||
common-obj-y += qmp-cmds.o hmp-cmds.o |
|||
common-obj-y += qmp-cmds.o qmp-cmds-control.o |
|||
common-obj-y += hmp-cmds.o |
|||
|
|||
@ -0,0 +1,153 @@ |
|||
/*
|
|||
* QMP commands related to the monitor (common to sysemu and tools) |
|||
* |
|||
* Copyright (c) 2003-2004 Fabrice Bellard |
|||
* |
|||
* Permission is hereby granted, free of charge, to any person obtaining a copy |
|||
* of this software and associated documentation files (the "Software"), to deal |
|||
* in the Software without restriction, including without limitation the rights |
|||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
|||
* copies of the Software, and to permit persons to whom the Software is |
|||
* furnished to do so, subject to the following conditions: |
|||
* |
|||
* The above copyright notice and this permission notice shall be included in |
|||
* all copies or substantial portions of the Software. |
|||
* |
|||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
|||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
|||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
|||
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
|||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
|||
* THE SOFTWARE. |
|||
*/ |
|||
|
|||
#include "qemu/osdep.h" |
|||
|
|||
#include "monitor-internal.h" |
|||
#include "qemu-version.h" |
|||
#include "qapi/error.h" |
|||
#include "qapi/qapi-commands-control.h" |
|||
#include "qapi/qapi-emit-events.h" |
|||
|
|||
/*
|
|||
* Accept QMP capabilities in @list for @mon. |
|||
* On success, set mon->qmp.capab[], and return true. |
|||
* On error, set @errp, and return false. |
|||
*/ |
|||
static bool qmp_caps_accept(MonitorQMP *mon, QMPCapabilityList *list, |
|||
Error **errp) |
|||
{ |
|||
GString *unavailable = NULL; |
|||
bool capab[QMP_CAPABILITY__MAX]; |
|||
|
|||
memset(capab, 0, sizeof(capab)); |
|||
|
|||
for (; list; list = list->next) { |
|||
if (!mon->capab_offered[list->value]) { |
|||
if (!unavailable) { |
|||
unavailable = g_string_new(QMPCapability_str(list->value)); |
|||
} else { |
|||
g_string_append_printf(unavailable, ", %s", |
|||
QMPCapability_str(list->value)); |
|||
} |
|||
} |
|||
capab[list->value] = true; |
|||
} |
|||
|
|||
if (unavailable) { |
|||
error_setg(errp, "Capability %s not available", unavailable->str); |
|||
g_string_free(unavailable, true); |
|||
return false; |
|||
} |
|||
|
|||
memcpy(mon->capab, capab, sizeof(capab)); |
|||
return true; |
|||
} |
|||
|
|||
void qmp_qmp_capabilities(bool has_enable, QMPCapabilityList *enable, |
|||
Error **errp) |
|||
{ |
|||
MonitorQMP *mon; |
|||
|
|||
assert(monitor_is_qmp(cur_mon)); |
|||
mon = container_of(cur_mon, MonitorQMP, common); |
|||
|
|||
if (mon->commands == &qmp_commands) { |
|||
error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND, |
|||
"Capabilities negotiation is already complete, command " |
|||
"ignored"); |
|||
return; |
|||
} |
|||
|
|||
if (!qmp_caps_accept(mon, enable, errp)) { |
|||
return; |
|||
} |
|||
|
|||
mon->commands = &qmp_commands; |
|||
} |
|||
|
|||
VersionInfo *qmp_query_version(Error **errp) |
|||
{ |
|||
VersionInfo *info = g_new0(VersionInfo, 1); |
|||
|
|||
info->qemu = g_new0(VersionTriple, 1); |
|||
info->qemu->major = QEMU_VERSION_MAJOR; |
|||
info->qemu->minor = QEMU_VERSION_MINOR; |
|||
info->qemu->micro = QEMU_VERSION_MICRO; |
|||
info->package = g_strdup(QEMU_PKGVERSION); |
|||
|
|||
return info; |
|||
} |
|||
|
|||
static void query_commands_cb(QmpCommand *cmd, void *opaque) |
|||
{ |
|||
CommandInfoList *info, **list = opaque; |
|||
|
|||
if (!cmd->enabled) { |
|||
return; |
|||
} |
|||
|
|||
info = g_malloc0(sizeof(*info)); |
|||
info->value = g_malloc0(sizeof(*info->value)); |
|||
info->value->name = g_strdup(cmd->name); |
|||
info->next = *list; |
|||
*list = info; |
|||
} |
|||
|
|||
CommandInfoList *qmp_query_commands(Error **errp) |
|||
{ |
|||
CommandInfoList *list = NULL; |
|||
MonitorQMP *mon; |
|||
|
|||
assert(monitor_is_qmp(cur_mon)); |
|||
mon = container_of(cur_mon, MonitorQMP, common); |
|||
|
|||
qmp_for_each_command(mon->commands, query_commands_cb, &list); |
|||
|
|||
return list; |
|||
} |
|||
|
|||
EventInfoList *qmp_query_events(Error **errp) |
|||
{ |
|||
/*
|
|||
* TODO This deprecated command is the only user of |
|||
* QAPIEvent_str() and QAPIEvent_lookup[]. When the command goes, |
|||
* they should go, too. |
|||
*/ |
|||
EventInfoList *info, *ev_list = NULL; |
|||
QAPIEvent e; |
|||
|
|||
for (e = 0 ; e < QAPI_EVENT__MAX ; e++) { |
|||
const char *event_name = QAPIEvent_str(e); |
|||
assert(event_name != NULL); |
|||
info = g_malloc0(sizeof(*info)); |
|||
info->value = g_malloc0(sizeof(*info->value)); |
|||
info->value->name = g_strdup(event_name); |
|||
|
|||
info->next = ev_list; |
|||
ev_list = info; |
|||
} |
|||
|
|||
return ev_list; |
|||
} |
|||
Loading…
Reference in new issue