qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Luiz Capitulino <lcapitulino@redhat.com>
To: qemu-devel@nongnu.org
Cc: aliguori@us.ibm.com, armbru@redhat.com
Subject: [Qemu-devel] [PATCH 04/25] Monitor: Move qmp_query_version() up in monitor.c
Date: Mon,  6 Dec 2010 16:23:51 -0200	[thread overview]
Message-ID: <1291659852-23028-5-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1291659852-23028-1-git-send-email-lcapitulino@redhat.com>

So that next commit can change do_info_version_print() to call it.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 monitor.c |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/monitor.c b/monitor.c
index 481eab2..6252b3f 100644
--- a/monitor.c
+++ b/monitor.c
@@ -714,21 +714,6 @@ help:
     help_cmd(mon, "info");
 }
 
-static void do_info_version_print(Monitor *mon, const QObject *data)
-{
-    QDict *qdict;
-    QDict *qemu;
-
-    qdict = qobject_to_qdict(data);
-    qemu = qdict_get_qdict(qdict, "qemu");
-
-    monitor_printf(mon, "%" PRId64 ".%" PRId64 ".%" PRId64 "%s\n",
-                  qdict_get_int(qemu, "major"),
-                  qdict_get_int(qemu, "minor"),
-                  qdict_get_int(qemu, "micro"),
-                  qdict_get_str(qdict, "package"));
-}
-
 static void qmp_query_version(Monitor *mon, QObject **ret_data)
 {
     const char *version = QEMU_VERSION;
@@ -745,6 +730,21 @@ static void qmp_query_version(Monitor *mon, QObject **ret_data)
         'micro': %d }, 'package': %s }", major, minor, micro, QEMU_PKGVERSION);
 }
 
+static void do_info_version_print(Monitor *mon, const QObject *data)
+{
+    QDict *qdict;
+    QDict *qemu;
+
+    qdict = qobject_to_qdict(data);
+    qemu = qdict_get_qdict(qdict, "qemu");
+
+    monitor_printf(mon, "%" PRId64 ".%" PRId64 ".%" PRId64 "%s\n",
+                  qdict_get_int(qemu, "major"),
+                  qdict_get_int(qemu, "minor"),
+                  qdict_get_int(qemu, "micro"),
+                  qdict_get_str(qdict, "package"));
+}
+
 static void do_info_name_print(Monitor *mon, const QObject *data)
 {
     QDict *qdict;
-- 
1.7.3.3.398.g0b0cd

  parent reply	other threads:[~2010-12-06 18:24 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-06 18:23 [Qemu-devel] [PATCH v1 00/25]: Monitor: First step on an internal QMP API Luiz Capitulino
2010-12-06 18:23 ` [Qemu-devel] [PATCH 01/25] QMP: Rename query handlers Luiz Capitulino
2010-12-07 12:28   ` Miguel Di Ciurcio Filho
2010-12-07 13:15     ` Luiz Capitulino
2010-12-06 18:23 ` [Qemu-devel] [PATCH 02/25] QMP: Drop user_print usage from the qmp_query_cmds[] table Luiz Capitulino
2010-12-06 18:23 ` [Qemu-devel] [PATCH 03/25] Monitor: Drop balloon handlers comments Luiz Capitulino
2010-12-06 18:23 ` Luiz Capitulino [this message]
2010-12-06 18:23 ` [Qemu-devel] [PATCH 05/25] Monitor: Convert do_info_version_print() into do_info_version() Luiz Capitulino
2010-12-06 18:23 ` [Qemu-devel] [PATCH 06/25] Monitor: Convert qemu_chr_info_print() into qemu_chr_info() Luiz Capitulino
2010-12-06 18:23 ` [Qemu-devel] [PATCH 07/25] Monitor: Convert bdrv_info_print() into bdrv_info() Luiz Capitulino
2010-12-06 18:23 ` [Qemu-devel] [PATCH 08/25] Monitor: Convert bdrv_stats_print() into bdrv_stats() Luiz Capitulino
2010-12-06 18:23 ` [Qemu-devel] [PATCH 09/25] Monitor: Move qmp_query_cpus() up in monitor.c Luiz Capitulino
2010-12-06 18:23 ` [Qemu-devel] [PATCH 10/25] Monitor: Convert monitor_print_cpus() into do_info_cpus() Luiz Capitulino
2010-12-06 18:23 ` [Qemu-devel] [PATCH 11/25] Monitor: Convert do_pci_info_print() into do_pci_info() Luiz Capitulino
2010-12-06 18:23 ` [Qemu-devel] [PATCH 12/25] Monitor: Move qmp_query_kvm() up in monitor.c Luiz Capitulino
2010-12-06 18:24 ` [Qemu-devel] [PATCH 13/25] Monitor: Convert do_info_kvm_print() into do_info_kvm() Luiz Capitulino
2010-12-06 18:24 ` [Qemu-devel] [PATCH 14/25] Monitor: Move qmp_query_status() up in monitor.c Luiz Capitulino
2010-12-06 18:24 ` [Qemu-devel] [PATCH 15/25] Monitor: Convert do_info_status_print() into do_info_status() Luiz Capitulino
2010-12-06 18:24 ` [Qemu-devel] [PATCH 16/25] Monitor: Convert do_info_mice_print() into do_info_mice() Luiz Capitulino
2010-12-06 18:24 ` [Qemu-devel] [PATCH 17/25] Monitor: Convert do_info_vnc_print() into do_info_vnc() Luiz Capitulino
2010-12-06 18:24 ` [Qemu-devel] [PATCH 18/25] Monitor: Move qmp_query_name() up in monitor.c Luiz Capitulino
2010-12-06 18:24 ` [Qemu-devel] [PATCH 19/25] Monitor: Convert do_info_name_print() into do_info_name() Luiz Capitulino
2010-12-06 18:24 ` [Qemu-devel] [PATCH 20/25] Monitor: Move qmp_query_uuid() up in monitor.c Luiz Capitulino
2010-12-06 18:24 ` [Qemu-devel] [PATCH 21/25] Monitor: Convert do_info_uuid_print() into do_info_uuid() Luiz Capitulino
2010-12-06 18:24 ` [Qemu-devel] [PATCH 22/25] Monitor: qmp_query_migrate(): Return {} for empty MigrationState Luiz Capitulino
2010-12-06 18:24 ` [Qemu-devel] [PATCH 23/25] Monitor: Convert do_info_migrate_print() into do_info_migrate() Luiz Capitulino
2010-12-06 18:24 ` [Qemu-devel] [PATCH 24/25] Monitor: Introduce do_info_balloon() Luiz Capitulino
2010-12-06 18:24 ` [Qemu-devel] [PATCH 25/25] Monitor: do_info(): Drop unused code Luiz Capitulino

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1291659852-23028-5-git-send-email-lcapitulino@redhat.com \
    --to=lcapitulino@redhat.com \
    --cc=aliguori@us.ibm.com \
    --cc=armbru@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).