From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 526B0C06510 for ; Tue, 2 Jul 2019 11:47:11 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2980621473 for ; Tue, 2 Jul 2019 11:47:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2980621473 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiHFd-0005Iw-Cp for qemu-devel@archiver.kernel.org; Tue, 02 Jul 2019 07:47:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34204) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiHCZ-0003zs-Da for qemu-devel@nongnu.org; Tue, 02 Jul 2019 07:44:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hiHCW-00065D-0T for qemu-devel@nongnu.org; Tue, 02 Jul 2019 07:43:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47426) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hiHCQ-0005wb-D1 for qemu-devel@nongnu.org; Tue, 02 Jul 2019 07:43:52 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 590FA3082E4C for ; Tue, 2 Jul 2019 11:43:45 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-102.ams2.redhat.com [10.36.116.102]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F2E795D9C3; Tue, 2 Jul 2019 11:43:44 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 688051132ADD; Tue, 2 Jul 2019 13:43:43 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 2 Jul 2019 13:43:43 +0200 Message-Id: <20190702114343.21699-2-armbru@redhat.com> In-Reply-To: <20190702114343.21699-1-armbru@redhat.com> References: <20190702114343.21699-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Tue, 02 Jul 2019 11:43:45 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL v2 07/18] qom: Move HMP command handlers to qom/ X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , "Daniel P. Berrange" , Eduardo Habkost , "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Move the HMP command handlers related to QOM handlers from monitor/hmp-cmds.c and qdev-monitor.c to new qom/qom-hmp-cmds.c, where they are covered by MAINTAINERS section QOM. Cc: Paolo Bonzini Cc: "Daniel P. Berrange" Cc: Eduardo Habkost Cc: "Dr. David Alan Gilbert" Signed-off-by: Markus Armbruster Message-Id: <20190619201050.19040-7-armbru@redhat.com> Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Dr. David Alan Gilbert [Also move hmp_info_qom_tree(), tweak commit message accordingly] --- include/monitor/hmp.h | 3 ++ include/monitor/qdev.h | 1 - monitor/hmp-cmds.c | 50 +---------------- qdev-monitor.c | 57 -------------------- qom/Makefile.objs | 2 +- qom/qom-hmp-cmds.c | 120 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 125 insertions(+), 108 deletions(-) create mode 100644 qom/qom-hmp-cmds.c diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index 1d095d5837..b36ebccd29 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -16,6 +16,8 @@ =20 #include "qemu/readline.h" =20 +void hmp_handle_error(Monitor *mon, Error **errp); + void hmp_info_name(Monitor *mon, const QDict *qdict); void hmp_info_version(Monitor *mon, const QDict *qdict); void hmp_info_kvm(Monitor *mon, const QDict *qdict); @@ -118,6 +120,7 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict= ); void hmp_info_memory_devices(Monitor *mon, const QDict *qdict); void hmp_qom_list(Monitor *mon, const QDict *qdict); void hmp_qom_set(Monitor *mon, const QDict *qdict); +void hmp_info_qom_tree(Monitor *mon, const QDict *dict); void object_add_completion(ReadLineState *rs, int nb_args, const char *s= tr); void object_del_completion(ReadLineState *rs, int nb_args, const char *s= tr); void device_add_completion(ReadLineState *rs, int nb_args, const char *s= tr); diff --git a/include/monitor/qdev.h b/include/monitor/qdev.h index 0ff3331284..084799e4d9 100644 --- a/include/monitor/qdev.h +++ b/include/monitor/qdev.h @@ -7,7 +7,6 @@ =20 void hmp_info_qtree(Monitor *mon, const QDict *qdict); void hmp_info_qdm(Monitor *mon, const QDict *qdict); -void hmp_info_qom_tree(Monitor *mon, const QDict *dict); void qmp_device_add(QDict *qdict, QObject **ret_data, Error **errp); =20 int qdev_device_help(QemuOpts *opts); diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index d94ab7563e..5641036dc3 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -60,7 +60,7 @@ #include #endif =20 -static void hmp_handle_error(Monitor *mon, Error **errp) +void hmp_handle_error(Monitor *mon, Error **errp) { assert(errp); if (*errp) { @@ -2714,54 +2714,6 @@ void hmp_info_iothreads(Monitor *mon, const QDict = *qdict) qapi_free_IOThreadInfoList(info_list); } =20 -void hmp_qom_list(Monitor *mon, const QDict *qdict) -{ - const char *path =3D qdict_get_try_str(qdict, "path"); - ObjectPropertyInfoList *list; - Error *err =3D NULL; - - if (path =3D=3D NULL) { - monitor_printf(mon, "/\n"); - return; - } - - list =3D qmp_qom_list(path, &err); - if (err =3D=3D NULL) { - ObjectPropertyInfoList *start =3D list; - while (list !=3D NULL) { - ObjectPropertyInfo *value =3D list->value; - - monitor_printf(mon, "%s (%s)\n", - value->name, value->type); - list =3D list->next; - } - qapi_free_ObjectPropertyInfoList(start); - } - hmp_handle_error(mon, &err); -} - -void hmp_qom_set(Monitor *mon, const QDict *qdict) -{ - const char *path =3D qdict_get_str(qdict, "path"); - const char *property =3D qdict_get_str(qdict, "property"); - const char *value =3D qdict_get_str(qdict, "value"); - Error *err =3D NULL; - bool ambiguous =3D false; - Object *obj; - - obj =3D object_resolve_path(path, &ambiguous); - if (obj =3D=3D NULL) { - error_set(&err, ERROR_CLASS_DEVICE_NOT_FOUND, - "Device '%s' not found", path); - } else { - if (ambiguous) { - monitor_printf(mon, "Warning: Path '%s' is ambiguous\n", pat= h); - } - object_property_parse(obj, value, property, &err); - } - hmp_handle_error(mon, &err); -} - void hmp_rocker(Monitor *mon, const QDict *qdict) { const char *name =3D qdict_get_str(qdict, "name"); diff --git a/qdev-monitor.c b/qdev-monitor.c index 63a87e9632..58222c2211 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -739,63 +739,6 @@ void hmp_info_qdm(Monitor *mon, const QDict *qdict) qdev_print_devinfos(true); } =20 -typedef struct QOMCompositionState { - Monitor *mon; - int indent; -} QOMCompositionState; - -static void print_qom_composition(Monitor *mon, Object *obj, int indent)= ; - -static int print_qom_composition_child(Object *obj, void *opaque) -{ - QOMCompositionState *s =3D opaque; - - print_qom_composition(s->mon, obj, s->indent); - - return 0; -} - -static void print_qom_composition(Monitor *mon, Object *obj, int indent) -{ - QOMCompositionState s =3D { - .mon =3D mon, - .indent =3D indent + 2, - }; - char *name; - - if (obj =3D=3D object_get_root()) { - name =3D g_strdup(""); - } else { - name =3D object_get_canonical_path_component(obj); - } - monitor_printf(mon, "%*s/%s (%s)\n", indent, "", name, - object_get_typename(obj)); - g_free(name); - object_child_foreach(obj, print_qom_composition_child, &s); -} - -void hmp_info_qom_tree(Monitor *mon, const QDict *dict) -{ - const char *path =3D qdict_get_try_str(dict, "path"); - Object *obj; - bool ambiguous =3D false; - - if (path) { - obj =3D object_resolve_path(path, &ambiguous); - if (!obj) { - monitor_printf(mon, "Path '%s' could not be resolved.\n", pa= th); - return; - } - if (ambiguous) { - monitor_printf(mon, "Warning: Path '%s' is ambiguous.\n", pa= th); - return; - } - } else { - obj =3D qdev_get_machine(); - } - print_qom_composition(mon, obj, 0); -} - void qmp_device_add(QDict *qdict, QObject **ret_data, Error **errp) { Error *local_err =3D NULL; diff --git a/qom/Makefile.objs b/qom/Makefile.objs index 5fb43b842c..aae478fc21 100644 --- a/qom/Makefile.objs +++ b/qom/Makefile.objs @@ -2,4 +2,4 @@ qom-obj-y =3D object.o container.o qom-qobject.o qom-obj-y +=3D object_interfaces.o =20 common-obj-y =3D cpu.o -common-obj-$(CONFIG_SOFTMMU) +=3D qom-qmp-cmds.o +common-obj-$(CONFIG_SOFTMMU) +=3D qom-hmp-cmds.o qom-qmp-cmds.o diff --git a/qom/qom-hmp-cmds.c b/qom/qom-hmp-cmds.c new file mode 100644 index 0000000000..a268e01eb4 --- /dev/null +++ b/qom/qom-hmp-cmds.c @@ -0,0 +1,120 @@ +/* + * HMP commands related to QOM + * + * This work is licensed under the terms of the GNU GPL, version 2 or + * later. See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "hw/qdev-core.h" +#include "monitor/hmp.h" +#include "monitor/monitor.h" +#include "qapi/error.h" +#include "qapi/qapi-commands-qom.h" +#include "qapi/qmp/qdict.h" +#include "qom/object.h" + +void hmp_qom_list(Monitor *mon, const QDict *qdict) +{ + const char *path =3D qdict_get_try_str(qdict, "path"); + ObjectPropertyInfoList *list; + Error *err =3D NULL; + + if (path =3D=3D NULL) { + monitor_printf(mon, "/\n"); + return; + } + + list =3D qmp_qom_list(path, &err); + if (err =3D=3D NULL) { + ObjectPropertyInfoList *start =3D list; + while (list !=3D NULL) { + ObjectPropertyInfo *value =3D list->value; + + monitor_printf(mon, "%s (%s)\n", + value->name, value->type); + list =3D list->next; + } + qapi_free_ObjectPropertyInfoList(start); + } + hmp_handle_error(mon, &err); +} + +void hmp_qom_set(Monitor *mon, const QDict *qdict) +{ + const char *path =3D qdict_get_str(qdict, "path"); + const char *property =3D qdict_get_str(qdict, "property"); + const char *value =3D qdict_get_str(qdict, "value"); + Error *err =3D NULL; + bool ambiguous =3D false; + Object *obj; + + obj =3D object_resolve_path(path, &ambiguous); + if (obj =3D=3D NULL) { + error_set(&err, ERROR_CLASS_DEVICE_NOT_FOUND, + "Device '%s' not found", path); + } else { + if (ambiguous) { + monitor_printf(mon, "Warning: Path '%s' is ambiguous\n", pat= h); + } + object_property_parse(obj, value, property, &err); + } + hmp_handle_error(mon, &err); +} + +typedef struct QOMCompositionState { + Monitor *mon; + int indent; +} QOMCompositionState; + +static void print_qom_composition(Monitor *mon, Object *obj, int indent)= ; + +static int print_qom_composition_child(Object *obj, void *opaque) +{ + QOMCompositionState *s =3D opaque; + + print_qom_composition(s->mon, obj, s->indent); + + return 0; +} + +static void print_qom_composition(Monitor *mon, Object *obj, int indent) +{ + QOMCompositionState s =3D { + .mon =3D mon, + .indent =3D indent + 2, + }; + char *name; + + if (obj =3D=3D object_get_root()) { + name =3D g_strdup(""); + } else { + name =3D object_get_canonical_path_component(obj); + } + monitor_printf(mon, "%*s/%s (%s)\n", indent, "", name, + object_get_typename(obj)); + g_free(name); + object_child_foreach(obj, print_qom_composition_child, &s); +} + +void hmp_info_qom_tree(Monitor *mon, const QDict *dict) +{ + const char *path =3D qdict_get_try_str(dict, "path"); + Object *obj; + bool ambiguous =3D false; + + if (path) { + obj =3D object_resolve_path(path, &ambiguous); + if (!obj) { + monitor_printf(mon, "Path '%s' could not be resolved.\n", pa= th); + return; + } + if (ambiguous) { + monitor_printf(mon, "Warning: Path '%s' is ambiguous.\n", pa= th); + return; + } + } else { + obj =3D qdev_get_machine(); + } + print_qom_composition(mon, obj, 0); +} --=20 2.21.0