From patchwork Fri Mar 27 16:55: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: 455517 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 7BA7414012F for ; Sat, 28 Mar 2015 03:56:38 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=hs2qb3OG; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from localhost ([::1]:51028 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbXYh-0005VT-8t for incoming@patchwork.ozlabs.org; Fri, 27 Mar 2015 12:56:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42492) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbXYF-0004kN-TY for qemu-devel@nongnu.org; Fri, 27 Mar 2015 12:56:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YbXYF-0000r9-43 for qemu-devel@nongnu.org; Fri, 27 Mar 2015 12:56:07 -0400 Received: from mail-pd0-x234.google.com ([2607:f8b0:400e:c02::234]:35668) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbXYE-0000r5-SZ for qemu-devel@nongnu.org; Fri, 27 Mar 2015 12:56:07 -0400 Received: by pdbop1 with SMTP id op1so101717076pdb.2 for ; Fri, 27 Mar 2015 09:56:06 -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=xEA5LJXOCgVI8kmbJXitchaDxJi+/gYl6PrcKba9zVQ=; b=hs2qb3OGNdcqi8H3x6mv2ELPSlWAwDfmkP2Qr1O0c9gEnopYSxno9Y4oUu4e/PpeKU SQzGtWdJC42VzYDsKblHzlBB7sxM1InON/Rb2BAtvdqJEc2s5ShKapw1D6/Vf21W8aDM tehiyEMSRs3QssnVzpoxA3eP/6pVc5wzUi1L23Vxmgw7s5j6MP3u/xyNaYOB8qdiWzAG x5mYuoZ0d6mvMrbLVTk0SnrxedDuJvTTvnpFj7/xYCF7ExnLQa8LtWnQ2TBevmDP4nyB F9U5StgfWv2/g5ybM0mvXeL8/oHvwGJ6xNChMplMEJzAynyEiHyKe4wi5kuD8tlJv4gn 3NbA== X-Received: by 10.66.122.204 with SMTP id lu12mr37201878pab.52.1427475365998; Fri, 27 Mar 2015 09:56:05 -0700 (PDT) Received: from linux-cj2w.apac.novell.com ([203.192.156.9]) by mx.google.com with ESMTPSA id z10sm2695473pas.18.2015.03.27.09.55.59 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Mar 2015 09:56:01 -0700 (PDT) From: Lin Ma To: imammedo@redhat.com, afaerber@suse.de, peter.crosthwaite@xilinx.com, pbonzini@redhat.com Date: Sat, 28 Mar 2015 00:55:29 +0800 Message-Id: <1427475330-4652-2-git-send-email-lma@suse.com> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1427475330-4652-1-git-send-email-lma@suse.com> References: <1427475330-4652-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 v5 1/2] qom: Add can_be_deleted callback to UserCreatableClass 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 If backends implement the can_be_deleted and it returns false, Then the qmp_object_del won't delete the given backends. Signed-off-by: Lin Ma --- include/qom/object_interfaces.h | 14 ++++++++++++++ qmp.c | 5 +++++ qom/object_interfaces.c | 14 ++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/include/qom/object_interfaces.h b/include/qom/object_interfaces.h index b792283..012b653 100644 --- a/include/qom/object_interfaces.h +++ b/include/qom/object_interfaces.h @@ -25,6 +25,8 @@ typedef struct UserCreatable { * UserCreatableClass: * @parent_class: the base class * @complete: callback to be called after @obj's properties are set. + * @can_be_deleted: callback to be called before an object is removed + * to check if @obj can be removed safely. * * Interface is designed to work with -object/object-add/object_add * commands. @@ -47,6 +49,7 @@ typedef struct UserCreatableClass { /* */ void (*complete)(UserCreatable *uc, Error **errp); + bool (*can_be_deleted)(UserCreatable *uc, Error **errp); } UserCreatableClass; /** @@ -59,4 +62,15 @@ typedef struct UserCreatableClass { * nothing. */ void user_creatable_complete(Object *obj, Error **errp); + +/** + * user_creatable_can_be_deleted: + * @obj: the object whose can_be_deleted() method is called if defined + * @errp: if an error occurs, a pointer to an area to store the error + * + * Wrapper to call can_be_deleted() method if one of types it's inherited + * from implements USER_CREATABLE interface, otherwise the call does + * nothing. + */ +bool user_creatable_can_be_deleted(Object *obj, Error **errp); #endif diff --git a/qmp.c b/qmp.c index c479e77..48f54c9 100644 --- a/qmp.c +++ b/qmp.c @@ -711,6 +711,11 @@ void qmp_object_del(const char *id, Error **errp) error_setg(errp, "object id not found"); return; } + + if (!user_creatable_can_be_deleted(obj, errp)) { + error_setg(errp, "%s is in use, can not be deleted", id); + return; + } object_unparent(obj); } diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index 6360818..608b436 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -18,6 +18,20 @@ void user_creatable_complete(Object *obj, Error **errp) } } +bool user_creatable_can_be_deleted(Object *obj, Error **errp) +{ + + UserCreatableClass *ucc; + UserCreatable *uc = USER_CREATABLE(obj); + + ucc = USER_CREATABLE_GET_CLASS(uc); + if (ucc->can_be_deleted) { + return ucc->can_be_deleted(uc, errp); + } else { + return true; + } +} + static void register_types(void) { static const TypeInfo uc_interface_info = {