From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47198) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPXcM-0007tB-RC for qemu-devel@nongnu.org; Thu, 04 Sep 2014 10:02:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XPXcI-0003ls-4F for qemu-devel@nongnu.org; Thu, 04 Sep 2014 10:02:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:30959) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPXcH-0003lo-Sy for qemu-devel@nongnu.org; Thu, 04 Sep 2014 10:02:26 -0400 Date: Thu, 4 Sep 2014 16:02:16 +0200 From: Igor Mammedov Message-ID: <20140904160216.5ba9e3a8@nial.usersys.redhat.com> In-Reply-To: <1409126919-22233-9-git-send-email-tangchen@cn.fujitsu.com> References: <1409126919-22233-1-git-send-email-tangchen@cn.fujitsu.com> <1409126919-22233-9-git-send-email-tangchen@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [RESEND PATCH v3 8/8] monitor: Add memory hot unplug support for device_del command. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Tang Chen Cc: zhugh.fnst@cn.fujitsu.com, mst@redhat.com, hutao@cn.fujitsu.com, qemu-devel@nongnu.org, isimatu.yasuaki@jp.fujitsu.com, pbonzini@redhat.com On Wed, 27 Aug 2014 16:08:39 +0800 Tang Chen wrote: > From: Hu Tao > > Implement find_peripheral_device() to find bus-less device, and call it in > qmp_device_del() so that device_del command will be able to remove memory > device. probably patch should go before 4/8 > > Signed-off-by: Hu Tao > Signed-off-by: Tang Chen > --- > include/qom/object.h | 1 + > qdev-monitor.c | 23 +++++++++++++++++++++++ > qom/object.c | 2 +- > 3 files changed, 25 insertions(+), 1 deletion(-) > > diff --git a/include/qom/object.h b/include/qom/object.h > index 8a05a81..a352beb 100644 > --- a/include/qom/object.h > +++ b/include/qom/object.h > @@ -1300,5 +1300,6 @@ int object_child_foreach(Object *obj, int (*fn)(Object *child, void *opaque), > */ > Object *container_get(Object *root, const char *path); > > +bool object_property_is_child(ObjectProperty *prop); > > #endif > diff --git a/qdev-monitor.c b/qdev-monitor.c > index fb9ee24..effd928 100644 > --- a/qdev-monitor.c > +++ b/qdev-monitor.c > @@ -24,6 +24,7 @@ > #include "qmp-commands.h" > #include "sysemu/arch_init.h" > #include "qemu/config-file.h" > +#include "qom/object.h" > > /* > * Aliases were a bad idea from the start. Let's keep them > @@ -683,12 +684,34 @@ int do_device_add(Monitor *mon, const QDict *qdict, QObject **ret_data) > return 0; > } > > +static DeviceState *find_peripheral_device(const char *id) > +{ > + Object *peripheral = qdev_get_peripheral(); > + DeviceState *dev = NULL; > + ObjectProperty *prop; > + > + QTAILQ_FOREACH(prop, &peripheral->properties, node) { > + if (object_property_is_child(prop)) { > + dev = DEVICE(prop->opaque); > + if (!strcmp(dev->id, id)) { > + return dev; > + } > + } > + } It's not permitted to access internal fields of Object outside of object.c checkout usage of object_resolve_path()/object_resolve_path_type(), that's what you need to use. > + > + return NULL; > +} > + > void qmp_device_del(const char *id, Error **errp) > { > DeviceState *dev; > > dev = qdev_find_recursive(sysbus_get_default(), id); > if (!dev) { > + dev = find_peripheral_device(id); > + } > + > + if (!dev) { > error_set(errp, QERR_DEVICE_NOT_FOUND, id); > return; > } > diff --git a/qom/object.c b/qom/object.c > index 0e8267b..1183e5d 100644 > --- a/qom/object.c > +++ b/qom/object.c > @@ -351,7 +351,7 @@ void object_initialize(void *data, size_t size, const char *typename) > object_initialize_with_type(data, size, type); > } > > -static inline bool object_property_is_child(ObjectProperty *prop) > +bool object_property_is_child(ObjectProperty *prop) > { > return strstart(prop->type, "child<", NULL); > }