From patchwork Tue Dec 6 17:54:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 129793 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 C8CFC1007D8 for ; Wed, 7 Dec 2011 06:07:09 +1100 (EST) Received: from localhost ([::1]:56537 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RY0M5-0008CL-L0 for incoming@patchwork.ozlabs.org; Tue, 06 Dec 2011 14:07:05 -0500 Received: from eggs.gnu.org ([140.186.70.92]:46181) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RY0Ls-0008BY-Vu for qemu-devel@nongnu.org; Tue, 06 Dec 2011 14:06:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RY0Lo-0004dE-NM for qemu-devel@nongnu.org; Tue, 06 Dec 2011 14:06:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:20853) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RY0Lo-0004dA-FR for qemu-devel@nongnu.org; Tue, 06 Dec 2011 14:06:48 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id pB6J6IJW015229 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Dec 2011 14:06:47 -0500 Received: from localhost (ovpn-113-121.phx2.redhat.com [10.3.113.121]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id pB6HswUB019556; Tue, 6 Dec 2011 12:54:59 -0500 From: Luiz Capitulino To: aliguori@us.ibm.com Date: Tue, 6 Dec 2011 15:54:17 -0200 Message-Id: <1323194072-20046-8-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1323194072-20046-1-git-send-email-lcapitulino@redhat.com> References: <1323194072-20046-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 209.132.183.28 Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 07/22] qapi: Complete system_powerdown conversion 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 Commit 5bc465e4b1b6f4582a400c0a7033a1c841744278 converted only the HMP part of the system_powerdown command to the QAPI, this commit completes it by converting the QMP part too. Signed-off-by: Luiz Capitulino --- monitor.c | 10 ---------- qmp-commands.hx | 5 +---- 2 files changed, 1 insertions(+), 14 deletions(-) diff --git a/monitor.c b/monitor.c index 1be222e..344b196 100644 --- a/monitor.c +++ b/monitor.c @@ -1796,16 +1796,6 @@ static void do_boot_set(Monitor *mon, const QDict *qdict) } } -/** - * do_system_powerdown(): Issue a machine powerdown - */ -static int do_system_powerdown(Monitor *mon, const QDict *qdict, - QObject **ret_data) -{ - qemu_system_powerdown_request(); - return 0; -} - #if defined(TARGET_I386) static void print_pte(Monitor *mon, target_phys_addr_t addr, target_phys_addr_t pte, diff --git a/qmp-commands.hx b/qmp-commands.hx index 94da2a8..4fcb92c 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -244,10 +244,7 @@ EQMP { .name = "system_powerdown", .args_type = "", - .params = "", - .help = "send system power down event", - .user_print = monitor_user_noop, - .mhandler.cmd_new = do_system_powerdown, + .mhandler.cmd_new = qmp_marshal_input_system_powerdown, }, SQMP