From patchwork Thu Mar 26 17:07:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lin Ma X-Patchwork-Id: 455142 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 37BAD14009B for ; Fri, 27 Mar 2015 04:11:24 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=EiW9WuFy; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from localhost ([::1]:45661 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbBJS-0001NJ-Bk for incoming@patchwork.ozlabs.org; Thu, 26 Mar 2015 13:11:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55547) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbBFn-0003ST-7q for qemu-devel@nongnu.org; Thu, 26 Mar 2015 13:07:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YbBFj-0006C9-G0 for qemu-devel@nongnu.org; Thu, 26 Mar 2015 13:07:35 -0400 Received: from mail-pd0-x234.google.com ([2607:f8b0:400e:c02::234]:36499) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbBFj-0006C3-8R for qemu-devel@nongnu.org; Thu, 26 Mar 2015 13:07:31 -0400 Received: by pdbcz9 with SMTP id cz9so68438184pdb.3 for ; Thu, 26 Mar 2015 10:07:30 -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:in-reply-to:references; bh=Ud7xcweLUWdIyr2iMMiwixPqazBqgj+f65CRP4qSVfs=; b=EiW9WuFyujyMfoda/ZWdYOcJMKA6V/yojz9taRvbywZKVfwy6d3bEPr1xaPq4hlfGr zZyOy2zhLP9DGz+ZJ0mfZFi3uWqF4F6vuzjaF+Ppucqmgo1PW1er2znjl2yLkK3u8zba yGNvNn+Yn4nrwON6dfNfWGMULRQloY5IMNt+OVhf84vtP3va/UoRo0P4lw59ibUV6iGD uhb5rkezoW44+y4RaRAIzwEkPjoHjfRYmYAS0oN2ynDCGSvYQ4FIQRC7h3RYz82j+dUr gIF0m9rh0xmbmAouwH4HHX5aRxoBymNq3VHR8KB845sTrWzHgRFu8t40SGYcRbDtlmsC eE7w== X-Received: by 10.66.227.169 with SMTP id sb9mr28656032pac.11.1427389650693; Thu, 26 Mar 2015 10:07:30 -0700 (PDT) Received: from blue1.bej.suse.com ([203.192.156.9]) by mx.google.com with ESMTPSA id o7sm5646052pdm.46.2015.03.26.10.07.27 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 26 Mar 2015 10:07:30 -0700 (PDT) From: Lin Ma To: imammedo@redhat.com, afaerber@suse.de, peter.crosthwaite@xilinx.com, pbonzini@redhat.com Date: Fri, 27 Mar 2015 01:07:06 +0800 Message-Id: <1427389626-23487-3-git-send-email-lma@suse.com> X-Mailer: git-send-email 1.7.12.4 In-Reply-To: <1427389626-23487-1-git-send-email-lma@suse.com> References: <1427389626-23487-1-git-send-email-lma@suse.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c02::234 Cc: qemu-devel@nongnu.org, Lin Ma Subject: [Qemu-devel] [PATCH v3 2/2] hostmem: 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 error out. Signed-off-by: Lin Ma --- backends/hostmem.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/backends/hostmem.c b/backends/hostmem.c index 99e8f99..dbf94a9 100644 --- a/backends/hostmem.c +++ b/backends/hostmem.c @@ -335,12 +335,26 @@ host_memory_backend_memory_complete(UserCreatable *uc, Error **errp) } } +static bool +host_memory_backend_can_be_deleted(UserCreatable *uc, Error **errp) +{ + MemoryRegion *mr; + mr = host_memory_backend_get_memory(MEMORY_BACKEND(uc), errp); + if (memory_region_is_mapped(mr)) { + return false; + } else { + return true; + } +} + static void host_memory_backend_class_init(ObjectClass *oc, void *data) { UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc); ucc->complete = host_memory_backend_memory_complete; + + ucc->can_be_deleted = host_memory_backend_can_be_deleted; } static const TypeInfo host_memory_backend_info = {