From: Luiz Capitulino <lcapitulino@redhat.com>
To: qemu-devel@nongnu.org
Cc: aliguori@us.ibm.com
Subject: [Qemu-devel] [PATCH 05/20] monitor: Fix do_info_balloon() output
Date: Thu, 10 Dec 2009 12:43:20 -0200 [thread overview]
Message-ID: <1260456215-31022-6-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1260456215-31022-1-git-send-email-lcapitulino@redhat.com>
Monitor commands should always return values in bytes and info
commands should always return a QDict.
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
monitor.c | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/monitor.c b/monitor.c
index a38a103..aa56ec7 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1919,12 +1919,24 @@ static void do_balloon(Monitor *mon, const QDict *qdict, QObject **ret_data)
static void monitor_print_balloon(Monitor *mon, const QObject *data)
{
- monitor_printf(mon, "balloon: actual=%d\n",
- (int)qint_get_int(qobject_to_qint(data)));
+ QDict *qdict;
+
+ qdict = qobject_to_qdict(data);
+
+ monitor_printf(mon, "balloon: actual=%" PRId64 "\n",
+ qdict_get_int(qdict, "balloon") >> 20);
}
/**
* do_info_balloon(): Balloon information
+ *
+ * Return a QDict with the following information:
+ *
+ * - "balloon": current balloon value in bytes
+ *
+ * Example:
+ *
+ * { "balloon": 1073741824 }
*/
static void do_info_balloon(Monitor *mon, QObject **ret_data)
{
@@ -1936,7 +1948,8 @@ static void do_info_balloon(Monitor *mon, QObject **ret_data)
else if (actual == 0)
qemu_error_new(QERR_DEVICE_NOT_ACTIVE, "balloon");
else
- *ret_data = QOBJECT(qint_from_int((int)(actual >> 20)));
+ *ret_data = qobject_from_jsonf("{ 'balloon': %" PRId64 "}",
+ (int64_t) actual);
}
static qemu_acl *find_acl(Monitor *mon, const char *name)
--
1.6.6.rc1.39.g9a42
next prev parent reply other threads:[~2009-12-10 14:44 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-10 14:43 [Qemu-devel] [FOR 0.12 v4 00/20]: info handlers conversions to QObject Luiz Capitulino
2009-12-10 14:43 ` [Qemu-devel] [PATCH 01/20] Introduce qemu-objects.h header file Luiz Capitulino
2009-12-10 14:43 ` [Qemu-devel] [PATCH 02/20] Makefile: move QObject objs to their own entry Luiz Capitulino
2009-12-10 14:43 ` [Qemu-devel] [PATCH 03/20] QDict: Introduce qdict_get_qbool() Luiz Capitulino
2009-12-10 14:43 ` [Qemu-devel] [PATCH 04/20] QDict: Introduce qdict_get_qlist() Luiz Capitulino
2009-12-10 14:43 ` Luiz Capitulino [this message]
2009-12-10 14:43 ` [Qemu-devel] [PATCH 06/20] monitor: Fix do_info_commands() output Luiz Capitulino
2009-12-10 14:43 ` [Qemu-devel] [PATCH 07/20] monitor: do_info_cpus(): Use QBool Luiz Capitulino
2009-12-10 14:43 ` [Qemu-devel] [PATCH 08/20] monitor: do_info_version(): Use QDict Luiz Capitulino
2009-12-10 14:43 ` [Qemu-devel] [PATCH 09/20] monitor: Convert do_info_status() to QObject Luiz Capitulino
2009-12-10 14:43 ` [Qemu-devel] [PATCH 10/20] monitor: Convert do_info_kvm() " Luiz Capitulino
2009-12-10 14:43 ` [Qemu-devel] [PATCH 11/20] monitor: Convert do_info_name() " Luiz Capitulino
2009-12-10 14:43 ` [Qemu-devel] [PATCH 12/20] monitor: Convert do_info_hpet() " Luiz Capitulino
2009-12-10 14:43 ` [Qemu-devel] [PATCH 13/20] monitor: Convert do_info_uuid() " Luiz Capitulino
2009-12-10 14:43 ` [Qemu-devel] [PATCH 14/20] monitor: Convert do_info_mice() " Luiz Capitulino
2009-12-10 14:43 ` [Qemu-devel] [PATCH 15/20] migration: Convert do_info_migrate() " Luiz Capitulino
2009-12-10 14:43 ` [Qemu-devel] [PATCH 16/20] block: Convert bdrv_info() " Luiz Capitulino
2009-12-10 14:43 ` [Qemu-devel] [PATCH 17/20] block: Convert bdrv_info_stats() " Luiz Capitulino
2009-12-10 14:43 ` [Qemu-devel] [PATCH 18/20] char: Convert qemu_chr_info() " Luiz Capitulino
2009-12-10 14:43 ` [Qemu-devel] [PATCH 19/20] PCI: Convert pci_device_hot_add() " Luiz Capitulino
2009-12-10 14:43 ` [Qemu-devel] [PATCH 20/20] VNC: Convert do_info_vnc() " Luiz Capitulino
2009-12-10 15:26 ` malc
2009-12-10 15:30 ` Anthony Liguori
2009-12-10 18:37 ` Luiz Capitulino
-- strict thread matches above, loose matches on Subject: below --
2009-12-10 19:15 [Qemu-devel] [FOR 0.12 v5 00/20]: info handlers conversions " Luiz Capitulino
2009-12-10 19:15 ` [Qemu-devel] [PATCH 05/20] monitor: Fix do_info_balloon() output 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=1260456215-31022-6-git-send-email-lcapitulino@redhat.com \
--to=lcapitulino@redhat.com \
--cc=aliguori@us.ibm.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).