From patchwork Thu Mar 26 17:07:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lin Ma X-Patchwork-Id: 455141 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 80630140188 for ; Fri, 27 Mar 2015 04:09:10 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=B1WcgCO3; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from localhost ([::1]:45635 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbBHH-0006Ap-Ti for incoming@patchwork.ozlabs.org; Thu, 26 Mar 2015 13:09:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55534) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbBFl-0003R3-Vj for qemu-devel@nongnu.org; Thu, 26 Mar 2015 13:07:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YbBFf-0006B7-Vx for qemu-devel@nongnu.org; Thu, 26 Mar 2015 13:07:33 -0400 Received: from mail-pa0-x22e.google.com ([2607:f8b0:400e:c03::22e]:33589) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbBFf-0006Ay-Ox for qemu-devel@nongnu.org; Thu, 26 Mar 2015 13:07:27 -0400 Received: by pabxg6 with SMTP id xg6so68678759pab.0 for ; Thu, 26 Mar 2015 10:07:27 -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=6kGR1g6P+qpu+XDUERZOHi5O1vHT936Ybc4/m5uV6xM=; b=B1WcgCO3t6K0Vvw4Ork3/jRe8CV00vzcwKsLs4diHh7RJeSiS7clZcggrSVsQXaKKY kMrstkACZ5cbyhbiNfmwSinQqS8AwlcbvpjCJfpNM9vTmiAARh59dld9+TQE1eH6Ou8G mr0eyShX1MUz2N453L/q3eByp+N3eYwgt4mTTNrrua+4T8np7b9klrDqHJq2gaSp255M 0fJVXCa9kZhJ2hwObFq7AFg6xFgCJl0vZFeE5IAzmsNqz5j2KHmn1X0hqs8+hjZeIo1P vYIivNkbWLYBQfHCQSjF1UYw4OnFfmCVsmwm5t+IOsn7vOZ/RwtcVaMwkzvYDDZH6njI EYig== X-Received: by 10.70.103.230 with SMTP id fz6mr27995275pdb.45.1427389647216; Thu, 26 Mar 2015 10:07:27 -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.24 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 26 Mar 2015 10:07:26 -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:05 +0800 Message-Id: <1427389626-23487-2-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:c03::22e Cc: qemu-devel@nongnu.org, Lin Ma Subject: [Qemu-devel] [PATCH v3 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 | 3 +++ qmp.c | 13 +++++++++++++ 2 files changed, 16 insertions(+) diff --git a/include/qom/object_interfaces.h b/include/qom/object_interfaces.h index b792283..19b66f1 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; /** diff --git a/qmp.c b/qmp.c index c479e77..a9156d6 100644 --- a/qmp.c +++ b/qmp.c @@ -711,6 +711,19 @@ void qmp_object_del(const char *id, Error **errp) error_setg(errp, "object id not found"); return; } + + UserCreatableClass *ucc; + UserCreatable *uc = + (UserCreatable *)object_dynamic_cast(obj, TYPE_USER_CREATABLE); + ucc = USER_CREATABLE_GET_CLASS(uc); + if (ucc->can_be_deleted) { + if (!ucc->can_be_deleted(uc, errp)) { + 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); }