*/
#include "qemu/osdep.h"
-#include "monitor/monitor.h"
+#include "qemu/sockets.h"
+#include "monitor-internal.h"
+#include "monitor/qdev.h"
#include "monitor/qmp-helpers.h"
#include "sysemu/sysemu.h"
#include "sysemu/kvm.h"
#include "sysemu/runstate-action.h"
#include "sysemu/block-backend.h"
#include "qapi/error.h"
-#include "qapi/qapi-commands-acpi.h"
+#include "qapi/qapi-init-commands.h"
#include "qapi/qapi-commands-control.h"
#include "qapi/qapi-commands-misc.h"
-#include "qapi/qapi-commands-stats.h"
+#include "qapi/qmp/qerror.h"
#include "qapi/type-helpers.h"
#include "hw/mem/memory-device.h"
-#include "hw/acpi/acpi_dev_interface.h"
#include "hw/intc/intc.h"
#include "hw/rdma/rdma.h"
-#include "monitor/stats.h"
NameInfo *qmp_query_name(Error **errp)
{
return;
}
+ if (!fd_is_socket(fd)) {
+ error_setg(errp, "parameter @fdname must name a socket");
+ close(fd);
+ return;
+ }
+
for (i = 0; i < ARRAY_SIZE(protocol_table); i++) {
if (!strcmp(protocol, protocol_table[i].name)) {
if (!protocol_table[i].add_client(fd, has_skipauth, skipauth,
}
}
-ACPIOSTInfoList *qmp_query_acpi_ospm_status(Error **errp)
+char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index,
+ int64_t cpu_index, Error **errp)
{
- bool ambig;
- ACPIOSTInfoList *head = NULL;
- ACPIOSTInfoList **prev = &head;
- Object *obj = object_resolve_path_type("", TYPE_ACPI_DEVICE_IF, &ambig);
-
- if (obj) {
- AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_GET_CLASS(obj);
- AcpiDeviceIf *adev = ACPI_DEVICE_IF(obj);
-
- adevc->ospm_status(adev, &prev);
- } else {
- error_setg(errp, "command is not supported, missing ACPI device");
- }
-
- return head;
-}
-
-typedef struct StatsCallbacks {
- StatsProvider provider;
- StatRetrieveFunc *stats_cb;
- SchemaRetrieveFunc *schemas_cb;
- QTAILQ_ENTRY(StatsCallbacks) next;
-} StatsCallbacks;
-
-static QTAILQ_HEAD(, StatsCallbacks) stats_callbacks =
- QTAILQ_HEAD_INITIALIZER(stats_callbacks);
-
-void add_stats_callbacks(StatsProvider provider,
- StatRetrieveFunc *stats_fn,
- SchemaRetrieveFunc *schemas_fn)
-{
- StatsCallbacks *entry = g_new(StatsCallbacks, 1);
- entry->provider = provider;
- entry->stats_cb = stats_fn;
- entry->schemas_cb = schemas_fn;
-
- QTAILQ_INSERT_TAIL(&stats_callbacks, entry, next);
-}
-
-static bool invoke_stats_cb(StatsCallbacks *entry,
- StatsResultList **stats_results,
- StatsFilter *filter, StatsRequest *request,
- Error **errp)
-{
- ERRP_GUARD();
- strList *targets = NULL;
- strList *names = NULL;
-
- if (request) {
- if (request->provider != entry->provider) {
- return true;
- }
- if (request->has_names && !request->names) {
- return true;
- }
- names = request->has_names ? request->names : NULL;
- }
-
- switch (filter->target) {
- case STATS_TARGET_VM:
- break;
- case STATS_TARGET_VCPU:
- if (filter->u.vcpu.has_vcpus) {
- if (!filter->u.vcpu.vcpus) {
- /* No targets allowed? Return no statistics. */
- return true;
- }
- targets = filter->u.vcpu.vcpus;
- }
- break;
- default:
- abort();
- }
+ char *output = NULL;
+ MonitorHMP hmp = {};
- entry->stats_cb(stats_results, filter->target, names, targets, errp);
- if (*errp) {
- qapi_free_StatsResultList(*stats_results);
- *stats_results = NULL;
- return false;
- }
- return true;
-}
+ monitor_data_init(&hmp.common, false, true, false);
-StatsResultList *qmp_query_stats(StatsFilter *filter, Error **errp)
-{
- StatsResultList *stats_results = NULL;
- StatsCallbacks *entry;
- StatsRequestList *request;
-
- QTAILQ_FOREACH(entry, &stats_callbacks, next) {
- if (filter->has_providers) {
- for (request = filter->providers; request; request = request->next) {
- if (!invoke_stats_cb(entry, &stats_results, filter,
- request->value, errp)) {
- break;
- }
- }
- } else {
- if (!invoke_stats_cb(entry, &stats_results, filter, NULL, errp)) {
- break;
- }
+ if (has_cpu_index) {
+ int ret = monitor_set_cpu(&hmp.common, cpu_index);
+ if (ret < 0) {
+ error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cpu-index",
+ "a CPU number");
+ goto out;
}
}
- return stats_results;
-}
-
-StatsSchemaList *qmp_query_stats_schemas(bool has_provider,
- StatsProvider provider,
- Error **errp)
-{
- ERRP_GUARD();
- StatsSchemaList *stats_results = NULL;
- StatsCallbacks *entry;
+ handle_hmp_command(&hmp, command_line);
- QTAILQ_FOREACH(entry, &stats_callbacks, next) {
- if (!has_provider || provider == entry->provider) {
- entry->schemas_cb(&stats_results, errp);
- if (*errp) {
- qapi_free_StatsSchemaList(stats_results);
- return NULL;
- }
- }
+ WITH_QEMU_LOCK_GUARD(&hmp.common.mon_lock) {
+ output = g_strdup(hmp.common.outbuf->str);
}
- return stats_results;
+out:
+ monitor_data_destroy(&hmp.common);
+ return output;
}
-void add_stats_entry(StatsResultList **stats_results, StatsProvider provider,
- const char *qom_path, StatsList *stats_list)
+static void __attribute__((__constructor__)) monitor_init_qmp_commands(void)
{
- StatsResult *entry = g_new0(StatsResult, 1);
-
- entry->provider = provider;
- entry->qom_path = g_strdup(qom_path);
- entry->stats = stats_list;
-
- QAPI_LIST_PREPEND(*stats_results, entry);
-}
-
-void add_stats_schema(StatsSchemaList **schema_results,
- StatsProvider provider, StatsTarget target,
- StatsSchemaValueList *stats_list)
-{
- StatsSchema *entry = g_new0(StatsSchema, 1);
-
- entry->provider = provider;
- entry->target = target;
- entry->stats = stats_list;
- QAPI_LIST_PREPEND(*schema_results, entry);
-}
-
-bool apply_str_list_filter(const char *string, strList *list)
-{
- strList *str_list = NULL;
-
- if (!list) {
- return true;
- }
- for (str_list = list; str_list; str_list = str_list->next) {
- if (g_str_equal(string, str_list->value)) {
- return true;
- }
- }
- return false;
+ /*
+ * Two command lists:
+ * - qmp_commands contains all QMP commands
+ * - qmp_cap_negotiation_commands contains just
+ * "qmp_capabilities", to enforce capability negotiation
+ */
+
+ qmp_init_marshal(&qmp_commands);
+
+ qmp_register_command(&qmp_commands, "device_add",
+ qmp_device_add, 0, 0);
+
+ QTAILQ_INIT(&qmp_cap_negotiation_commands);
+ qmp_register_command(&qmp_cap_negotiation_commands, "qmp_capabilities",
+ qmp_marshal_qmp_capabilities,
+ QCO_ALLOW_PRECONFIG, 0);
}