From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42743) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cCDxa-0001gf-EQ for qemu-devel@nongnu.org; Wed, 30 Nov 2016 18:06:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cCDxX-0008LU-9g for qemu-devel@nongnu.org; Wed, 30 Nov 2016 18:06:42 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:49941 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 1cCDxX-0008LK-4T for qemu-devel@nongnu.org; Wed, 30 Nov 2016 18:06:39 -0500 Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id uAUN40lP061075 for ; Wed, 30 Nov 2016 18:06:38 -0500 Received: from e37.co.us.ibm.com (e37.co.us.ibm.com [32.97.110.158]) by mx0b-001b2d01.pphosted.com with ESMTP id 272347efnq-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 30 Nov 2016 18:06:38 -0500 Received: from localhost by e37.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 30 Nov 2016 16:06:37 -0700 From: Michael Roth Date: Wed, 30 Nov 2016 17:06:16 -0600 Message-Id: <1480547176-19349-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH] 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: "Dr. David Alan Gilbert" , Markus Armbruster , Eric Blake , Daniel Berrange 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 checks in {qmp,hmp}_object_del 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 Signed-off-by: Michael Roth --- hmp.c | 10 ++++++++++ qmp.c | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/hmp.c b/hmp.c index b869617..99b8bf3 100644 --- a/hmp.c +++ b/hmp.c @@ -2072,6 +2072,16 @@ void hmp_object_del(Monitor *mon, const QDict *qdict) user_creatable_del(id, &err); hmp_handle_error(mon, &err); + + /* if object was defined on the command-line, remove its corresponding + * option group entry + */ + if (err == NULL) { + QemuOptsList *opt_group = qemu_find_opts_err("object", &err); + if (opt_group) { + qemu_opts_del(qemu_opts_find(opt_group, id)); + } + } } void hmp_info_memdev(Monitor *mon, const QDict *qdict) diff --git a/qmp.c b/qmp.c index 0028f0b..87c545d 100644 --- a/qmp.c +++ b/qmp.c @@ -686,6 +686,16 @@ void qmp_object_add(const char *type, const char *id, void qmp_object_del(const char *id, Error **errp) { user_creatable_del(id, errp); + + /* if object was defined on the command-line, remove its corresponding + * option group entry + */ + if (!(errp && *errp)) { + QemuOptsList *opt_group = qemu_find_opts_err("object", errp); + if (opt_group) { + qemu_opts_del(qemu_opts_find(opt_group, id)); + } + } } MemoryDeviceInfoList *qmp_query_memory_devices(Error **errp) -- 1.9.1