From patchwork Mon Jan 14 06:06:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 211710 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2C2AF2C00B3 for ; Mon, 14 Jan 2013 17:09:19 +1100 (EST) Received: from localhost ([::1]:58285 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TudET-0001G3-4B for incoming@patchwork.ozlabs.org; Mon, 14 Jan 2013 01:09:17 -0500 Received: from eggs.gnu.org ([208.118.235.92]:57302) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TudEB-000167-RT for qemu-devel@nongnu.org; Mon, 14 Jan 2013 01:09:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TudE9-00014Z-A0 for qemu-devel@nongnu.org; Mon, 14 Jan 2013 01:08:59 -0500 Received: from e23smtp06.au.ibm.com ([202.81.31.148]:55051) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TudE8-00014E-PL for qemu-devel@nongnu.org; Mon, 14 Jan 2013 01:08:57 -0500 Received: from /spool/local by e23smtp06.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 14 Jan 2013 16:05:06 +1000 Received: from d23dlp02.au.ibm.com (202.81.31.213) by e23smtp06.au.ibm.com (202.81.31.212) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 14 Jan 2013 16:05:04 +1000 Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [9.190.234.120]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id BB3392BB004B for ; Mon, 14 Jan 2013 17:08:52 +1100 (EST) Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r0E5vG4S1507726 for ; Mon, 14 Jan 2013 16:57:16 +1100 Received: from d23av03.au.ibm.com (loopback [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r0E68pfH021909 for ; Mon, 14 Jan 2013 17:08:51 +1100 Received: from RH63Wenchao (wenchaox.cn.ibm.com [9.115.122.169] (may be forged)) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r0E66WvQ019026; Mon, 14 Jan 2013 17:08:49 +1100 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Mon, 14 Jan 2013 14:06:28 +0800 Message-Id: <1358143589-5913-5-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1358143589-5913-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1358143589-5913-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13011406-7014-0000-0000-00000274953D X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.148 Cc: Wenchao Xia , aliguori@us.ibm.com, armbru@redhat.com, chenwj@iis.sinica.edu.tw, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH V6 4/5] HMP: move define of mon_cmds 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 Because mon_cmds may use info_cmds, so adjust the declare sequence of them. Signed-off-by: Wenchao Xia --- monitor.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/monitor.c b/monitor.c index 6f470bf..d3225c2 100644 --- a/monitor.c +++ b/monitor.c @@ -2425,12 +2425,6 @@ int monitor_handle_fd_param(Monitor *mon, const char *fdname) return fd; } -/* mon_cmds and info_cmds would be sorted at runtime */ -static mon_cmd_t mon_cmds[] = { -#include "hmp-commands.h" - { NULL, NULL, }, -}; - /* Please update hmp-commands.hx when adding or changing commands */ static mon_cmd_t info_cmds[] = { { @@ -2744,6 +2738,12 @@ static mon_cmd_t info_cmds[] = { }, }; +/* mon_cmds and info_cmds would be sorted at runtime */ +static mon_cmd_t mon_cmds[] = { +#include "hmp-commands.h" + { NULL, NULL, }, +}; + static const mon_cmd_t qmp_cmds[] = { #include "qmp-commands-old.h" { /* NULL */ },