From patchwork Mon Mar 23 10:10:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lin Ma X-Patchwork-Id: 453343 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 7C71D1400F1 for ; Mon, 23 Mar 2015 21:11:53 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=T28mw1Zf; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from localhost ([::1]:54731 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZzKp-0006PT-Da for incoming@patchwork.ozlabs.org; Mon, 23 Mar 2015 06:11:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48798) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZzKM-0005oe-3Q for qemu-devel@nongnu.org; Mon, 23 Mar 2015 06:11:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YZzKH-0007Cz-40 for qemu-devel@nongnu.org; Mon, 23 Mar 2015 06:11:22 -0400 Received: from mail-pd0-x22e.google.com ([2607:f8b0:400e:c02::22e]:34376) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZzKG-0007Cl-TD for qemu-devel@nongnu.org; Mon, 23 Mar 2015 06:11:17 -0400 Received: by pdbni2 with SMTP id ni2so183201774pdb.1 for ; Mon, 23 Mar 2015 03:11:15 -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=G3+GhQ9JQt12rGz5bIl5OmsQyqBM4QJmA17mfQQrEYA=; b=T28mw1Zf2wE5N6k2JY8z3BGzredC8new+Pwj3TT2JXC35uzqbhO0giXYIAjCMaP/80 Q4lpb1MBJpMA2khl0+Rw5Y08o2Mm4m56e3qu6hHvq45Wd1r62PPTbPctZV0RXKnCuR8t sJ9EjFEuOFZg7KV1yOhytX1ZqeMkNT/JsIBtAwZ6CRnLsRyVOQTkkKcDDLBCHn/n0VRg micuwtNikMLWPRG8WLZN1qpkdWjFXVSovzMuvvIKfVjfCEiOCca2keO1lVCcedRMhYka XPlM0XaPZs62yUtLqAihv2K/EqohMRex8s17odppPNn8ULxk3n0yJI811XaZr9esYuw/ uLGw== X-Received: by 10.66.166.39 with SMTP id zd7mr194531610pab.117.1427105475684; Mon, 23 Mar 2015 03:11:15 -0700 (PDT) Received: from linux-wc25.site.apac.novell.com ([203.192.156.9]) by mx.google.com with ESMTPSA id zi5sm519616pbc.39.2015.03.23.03.11.12 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Mar 2015 03:11:14 -0700 (PDT) From: Lin Ma To: qemu-devel@nongnu.org, imammedo@redhat.com Date: Mon, 23 Mar 2015 18:10:41 +0800 Message-Id: <1427105442-23484-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::22e Cc: pbonzini@redhat.com, Lin Ma Subject: [Qemu-devel] [PATCH 1/2] object: Add can_be_deleted callback to TypeInfo and TypeImpl 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 Add can_be_deleted callback, If it is not null and returns false, The qmp_object_del won't delete the given object. Signed-off-by: Lin Ma --- include/qom/object.h | 12 ++++++++++++ qmp.c | 7 +++++++ qom/object.c | 12 ++++++++++++ 3 files changed, 31 insertions(+) diff --git a/include/qom/object.h b/include/qom/object.h index d2d7748..6e78cb0 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -428,6 +428,8 @@ struct Object * function. * @abstract: If this field is true, then the class is considered abstract and * cannot be directly instantiated. + * @can_be_deleted: If this function returns true, then the object can be + deleted safely. * @class_size: The size of the class object (derivative of #ObjectClass) * for this object. If @class_size is 0, then the size of the class will be * assumed to be the size of the parent class. This allows a type to avoid @@ -463,6 +465,8 @@ struct TypeInfo bool abstract; size_t class_size; + bool (*can_be_deleted)(Object *obj); + void (*class_init)(ObjectClass *klass, void *data); void (*class_base_init)(ObjectClass *klass, void *data); void (*class_finalize)(ObjectClass *klass, void *data); @@ -671,6 +675,14 @@ ObjectClass *object_get_class(Object *obj); const char *object_get_typename(Object *obj); /** + * object_can_be_deleted: + * @obj: The object to obtain the deletion for. + * + * Returns: %true if @obj can be deleted safely, %false otherwise. + */ +bool object_can_be_deleted(Object *obj); + +/** * type_register_static: * @info: The #TypeInfo of the new type. * diff --git a/qmp.c b/qmp.c index c479e77..dbbcb37 100644 --- a/qmp.c +++ b/qmp.c @@ -711,6 +711,13 @@ void qmp_object_del(const char *id, Error **errp) error_setg(errp, "object id not found"); return; } + + if (!object_can_be_deleted(obj)) { + char *path = object_get_canonical_path_component(obj); + error_setg(errp, "%s is in used, can not be deleted", path); + g_free(path); + return; + } object_unparent(obj); } diff --git a/qom/object.c b/qom/object.c index d167038..dcec108 100644 --- a/qom/object.c +++ b/qom/object.c @@ -57,6 +57,8 @@ struct TypeImpl bool abstract; + bool (*can_be_deleted)(Object *obj); + const char *parent; TypeImpl *parent_type; @@ -121,6 +123,8 @@ static TypeImpl *type_new(const TypeInfo *info) ti->abstract = info->abstract; + ti->can_be_deleted = info->can_be_deleted; + for (i = 0; info->interfaces && info->interfaces[i].type; i++) { ti->interfaces[i].typename = g_strdup(info->interfaces[i].type); } @@ -584,6 +588,14 @@ const char *object_get_typename(Object *obj) return obj->class->type->name; } +bool object_can_be_deleted(Object *obj) +{ + if (obj->class->type->can_be_deleted) + return obj->class->type->can_be_deleted(obj); + else + return true; +} + ObjectClass *object_get_class(Object *obj) { return obj->class;