From patchwork Mon Mar 30 08:36:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lin Ma X-Patchwork-Id: 456007 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 00E071400B6 for ; Mon, 30 Mar 2015 19:38:55 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=vIPRYwi7; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from localhost ([::1]:60247 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcVDg-00022J-U4 for incoming@patchwork.ozlabs.org; Mon, 30 Mar 2015 04:38:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59649) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcVC1-0007m8-64 for qemu-devel@nongnu.org; Mon, 30 Mar 2015 04:37:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YcVBx-0004Fc-9f for qemu-devel@nongnu.org; Mon, 30 Mar 2015 04:37:09 -0400 Received: from mail-pd0-x234.google.com ([2607:f8b0:400e:c02::234]:36851) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcVBx-0004FK-1r for qemu-devel@nongnu.org; Mon, 30 Mar 2015 04:37:05 -0400 Received: by pdcp1 with SMTP id p1so77263043pdc.3 for ; Mon, 30 Mar 2015 01:37:04 -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=7fMXvuvrppNVncGtVtjFmK7J842FyGILwLvgvxLQUmA=; b=vIPRYwi79lsxWA85jE5iTLUsruUz9iTUAdlLycPA/sFgki81ewGqswRvsmrfPYVCW8 wfYtoY5kbFKYZcfjlQYNRdvqljNuwHxXKTb12g1DEchhwg6kzJbcZC0JnNKAADWR30Ih DB2bPmC+XmRtTCI6Y8eI3PrmnJc/L69w+YvsxzixWcaXrmu94+g1kr5lgkc5fhkEmqA6 K78KC23g+lvx0HqUJKgesJWlLjPaHMpRljJ0ahBdwF8qgsyms6QwkEBpM8llinLH6lTg MCedgGlTMccAp8zroJ8AxoDjKIaxUR6yErGkR2eUYqRaV+PbAfuXFsvp+C54zK9qsI3J d6EA== X-Received: by 10.68.65.77 with SMTP id v13mr8570276pbs.105.1427704624280; Mon, 30 Mar 2015 01:37:04 -0700 (PDT) Received: from linux-wc25.site.site ([203.192.156.9]) by mx.google.com with ESMTPSA id oq7sm9745178pac.32.2015.03.30.01.37.01 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 Mar 2015 01:37:03 -0700 (PDT) From: Lin Ma To: imammedo@redhat.com, afaerber@suse.de, peter.crosthwaite@xilinx.com, pbonzini@redhat.com Date: Mon, 30 Mar 2015 16:36:29 +0800 Message-Id: <1427704589-7688-3-git-send-email-lma@suse.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1427704589-7688-1-git-send-email-lma@suse.com> References: <1427704589-7688-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 v6 2/2] hostmem: Prevent removing an in-use memory backend 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..b7b6cf8 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 = {