From patchwork Fri Mar 20 04:14:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lin Ma X-Patchwork-Id: 452484 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 25060140161 for ; Fri, 20 Mar 2015 15:15:52 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=H1lNg2Ab; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from localhost ([::1]:42261 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYoLe-00078l-34 for incoming@patchwork.ozlabs.org; Fri, 20 Mar 2015 00:15:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35754) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYoLH-0006rM-Fw for qemu-devel@nongnu.org; Fri, 20 Mar 2015 00:15:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YYoLD-0004wX-DC for qemu-devel@nongnu.org; Fri, 20 Mar 2015 00:15:27 -0400 Received: from mail-pd0-x234.google.com ([2607:f8b0:400e:c02::234]:35929) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYoLD-0004wL-5z for qemu-devel@nongnu.org; Fri, 20 Mar 2015 00:15:23 -0400 Received: by pdbcz9 with SMTP id cz9so96461003pdb.3 for ; Thu, 19 Mar 2015 21:15:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=bMLBfbQ7zHewfGNIfF6TICSXBJDWtZjDwzuglQzBF4c=; b=H1lNg2AbHpZAZY5tP1Ml9ocgAfOjCjOQASbDBn3XROkH9sUMkGo7cnyGxqTGslhyOo bicO5Ae/v/oOh7xvaEMsiW7RVIXtC22v/MkEPFvVb+FtQ1YYBT9YhLFRX8ofnSxLTOgD eXtdTCQZz4+21v9KEipOPFKLhlI5t+xQgK5Mb0D1SuRKUFP67MeV+SZwG7SYbbMN7PsQ fhLuE+1O+Z3M2bAESN3jmJovnQHRs6hXYVV/OVdfb5Lje7f4MtUxM9Qlu6q9Q6HpiHUo 700QexrQltMKk63djs95d3yy7oDw/VLND5vICux8QcFEluZ6w5HvhfkzQfNW8N8Sz8B2 KtPw== X-Received: by 10.70.55.169 with SMTP id t9mr139754034pdp.57.1426824921870; Thu, 19 Mar 2015 21:15:21 -0700 (PDT) Received: from linux-wc25.site.apac.novell.com ([203.192.156.9]) by mx.google.com with ESMTPSA id ae7sm5550079pac.19.2015.03.19.21.15.19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Mar 2015 21:15:21 -0700 (PDT) From: Lin Ma To: qemu-devel@nongnu.org, imammedo@redhat.com Date: Fri, 20 Mar 2015 12:14:58 +0800 Message-Id: <1426824898-9936-1-git-send-email-lma@suse.com> X-Mailer: git-send-email 2.1.4 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c02::234 Cc: pbonzini@redhat.com, Lin Ma Subject: [Qemu-devel] [PATCH] object_del: Prevent removing an in-use memory backend object X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org showing a memory device whose memdev is removed leads an assert: (qemu) object_add memory-backend-ram,id=ram0,size=128M (qemu) device_add pc-dimm,id=d0,memdev=ram0 (qemu) object_del ram0 (qemu) info memory-devices ** ERROR:qom/object.c:1274:object_get_canonical_path_component:\ assertion failed: (obj->parent != NULL) Aborted The patch prevents removing an in-use mem backend and outputs an error msg. Signed-off-by: Lin Ma --- qmp.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/qmp.c b/qmp.c index c479e77..0086e2d 100644 --- a/qmp.c +++ b/qmp.c @@ -704,6 +704,7 @@ void qmp_object_del(const char *id, Error **errp) { Object *container; Object *obj; + const char *typename; container = container_get(object_get_root(), "/objects"); obj = object_resolve_path_component(container, id); @@ -711,6 +712,19 @@ void qmp_object_del(const char *id, Error **errp) error_setg(errp, "object id not found"); return; } + + typename = object_class_get_name(object_class_get_parent(\ + object_get_class(OBJECT(obj)))); + if (strcmp(typename, TYPE_MEMORY_BACKEND) == 0 ) { + MemoryRegion *mr; + mr = host_memory_backend_get_memory(MEMORY_BACKEND(obj), errp); + if (memory_region_is_mapped(mr)) { + char *path = object_get_canonical_path_component(obj); + error_setg(errp, "memdev %s is in used.", path); + g_free(path); + return; + } + } object_unparent(obj); }