From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51199) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cEM91-0005ZV-5I for qemu-devel@nongnu.org; Tue, 06 Dec 2016 15:15:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cEM8x-00010N-FZ for qemu-devel@nongnu.org; Tue, 06 Dec 2016 15:15:19 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:39438 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cEM8x-000105-9Q for qemu-devel@nongnu.org; Tue, 06 Dec 2016 15:15:15 -0500 Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id uB6KDTdL067446 for ; Tue, 6 Dec 2016 15:15:14 -0500 Received: from e35.co.us.ibm.com (e35.co.us.ibm.com [32.97.110.153]) by mx0b-001b2d01.pphosted.com with ESMTP id 27609cpx4a-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 06 Dec 2016 15:15:14 -0500 Received: from localhost by e35.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 6 Dec 2016 13:15:13 -0700 From: Michael Roth Date: Tue, 6 Dec 2016 14:14:59 -0600 In-Reply-To: <1481055300-14239-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1481055300-14239-1-git-send-email-mdroth@linux.vnet.ibm.com> Message-Id: <1481055300-14239-2-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH for-2.8 1/2] monitor: fix object_del for command-line-created objects List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: david@gibson.dropbear.id.au, bharata.rao@gmail.com, dgilbert@redhat.com, armbru@redhat.com, Eric Blake , Daniel Berrange , qemu-stable@nongnu.org Currently objects specified on the command-line are only partially cleaned up when 'object_del' is issued in either HMP or QMP: the object itself is fully finalized, but the QemuOpts are not removed. This results in the following behavior: x86_64-softmmu/qemu-system-x86_64 -monitor stdio \ -object memory-backend-ram,id=ram1,size=256M QEMU 2.7.91 monitor - type 'help' for more information (qemu) object_del ram1 (qemu) object_del ram1 object 'ram1' not found (qemu) object_add memory-backend-ram,id=ram1,size=256M Duplicate ID 'ram1' for object Try "help object_add" for more information which can be an issue for use-cases like memory hotplug. This happens on the HMP side because hmp_object_add() attempts to create a temporary QemuOpts entry with ID 'ram1', which ends up conflicting with the command-line-created entry, since it was never cleaned up during the previous hmp_object_del() call. We address this by adding a check in user_creatable_del(), which is called by both qmp_object_del() and hmp_object_del() to handle the actual object cleanup, to determine whether an option group entry matching the object's ID is present and removing it if it is. Note that qmp_object_add() never attempts to create a temporary QemuOpts entry, so it does not encounter the duplicate ID error, which is why this isn't generally visible in libvirt. Cc: "Dr. David Alan Gilbert" Cc: Markus Armbruster Cc: Eric Blake Cc: Daniel Berrange Cc: qemu-stable@nongnu.org Signed-off-by: Michael Roth --- qom/object_interfaces.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index ded4d84..23849f9 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -5,6 +5,7 @@ #include "qapi-visit.h" #include "qapi/qobject-output-visitor.h" #include "qapi/opts-visitor.h" +#include "qemu/config-file.h" void user_creatable_complete(Object *obj, Error **errp) { @@ -197,6 +198,7 @@ void user_creatable_del(const char *id, Error **errp) { Object *container; Object *obj; + QemuOptsList *opt_group; container = object_get_objects_root(); obj = object_resolve_path_component(container, id); @@ -209,6 +211,15 @@ void user_creatable_del(const char *id, Error **errp) error_setg(errp, "object '%s' is in use, can not be deleted", id); return; } + + /* if object was defined on the command-line, remove its corresponding + * option group entry + */ + opt_group = qemu_find_opts_err("object", NULL); + if (opt_group) { + qemu_opts_del(qemu_opts_find(opt_group, id)); + } + object_unparent(obj); } -- 1.9.1