From patchwork Mon Jul 25 01:44:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 106598 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B0784B6F83 for ; Mon, 25 Jul 2011 12:43:11 +1000 (EST) Received: from localhost ([::1]:55545 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QlAF5-0005kj-TR for incoming@patchwork.ozlabs.org; Sun, 24 Jul 2011 21:45:59 -0400 Received: from eggs.gnu.org ([140.186.70.92]:42399) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QlAEL-0004AP-Fz for qemu-devel@nongnu.org; Sun, 24 Jul 2011 21:45:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QlAEF-0005Wo-L0 for qemu-devel@nongnu.org; Sun, 24 Jul 2011 21:45:09 -0400 Received: from e8.ny.us.ibm.com ([32.97.182.138]:50157) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QlAEF-0005Vp-8j for qemu-devel@nongnu.org; Sun, 24 Jul 2011 21:45:07 -0400 Received: from d01relay05.pok.ibm.com (d01relay05.pok.ibm.com [9.56.227.237]) by e8.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p6P1WOBl014298 for ; Sun, 24 Jul 2011 21:32:24 -0400 Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay05.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p6P1j6h1154392 for ; Sun, 24 Jul 2011 21:45:06 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p6P1j6Yx007835 for ; Sun, 24 Jul 2011 21:45:06 -0400 Received: from titi.austin.rr.com (sig-9-65-207-230.mts.ibm.com [9.65.207.230]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p6P1itKs006824; Sun, 24 Jul 2011 21:45:05 -0400 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Sun, 24 Jul 2011 20:44:45 -0500 Message-Id: <1311558293-5855-14-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1311558293-5855-1-git-send-email-aliguori@us.ibm.com> References: <1311558293-5855-1-git-send-email-aliguori@us.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 32.97.182.138 Cc: Anthony Liguori Subject: [Qemu-devel] [PATCH 13/21] qom: add plug_destroy command 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 Signed-off-by: Anthony Liguori --- monitor.c | 20 ++++++++++++++++++++ qmp-commands.hx | 9 +++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/monitor.c b/monitor.c index e53808a..549251a 100644 --- a/monitor.c +++ b/monitor.c @@ -1069,6 +1069,26 @@ static int do_plug_create(Monitor *mon, const QDict *qdict, QObject **ret_data) return 0; } +static int do_plug_destroy(Monitor *mon, const QDict *qdict, QObject **ret_data) +{ + const char *id = qdict_get_str(qdict, "id"); + TypeInstance *inst; + Plug *plug; + + inst = type_find_by_id(id); + if (inst == NULL) { + return -1; + } + + plug = PLUG(inst); + + global_plug_list = g_slist_remove(global_plug_list, plug); + + type_delete(inst); + + return 0; +} + static int do_plug_list(Monitor *mon, const QDict *qdict, QObject **ret_data) { QList *qlist = qlist_new(); diff --git a/qmp-commands.hx b/qmp-commands.hx index 6f1091b..8203371 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -112,6 +112,15 @@ Notes: EQMP { + .name = "plug_destroy", + .args_type = "type:s", + .params = "type=value", + .help = "destroy a plug", + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_plug_destroy, + }, + + { .name = "plug_list", .args_type = "type:s?", .params = "",