[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/20] monitor: Fix do_info_balloon() output
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 05/20] monitor: Fix do_info_balloon() output |
Date: |
Thu, 10 Dec 2009 12:43:20 -0200 |
Monitor commands should always return values in bytes and info
commands should always return a QDict.
Signed-off-by: Luiz Capitulino <address@hidden>
---
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
- [Qemu-devel] [FOR 0.12 v4 00/20]: info handlers conversions to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 01/20] Introduce qemu-objects.h header file, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 03/20] QDict: Introduce qdict_get_qbool(), Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 02/20] Makefile: move QObject objs to their own entry, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 04/20] QDict: Introduce qdict_get_qlist(), Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 05/20] monitor: Fix do_info_balloon() output,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 06/20] monitor: Fix do_info_commands() output, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 08/20] monitor: do_info_version(): Use QDict, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 07/20] monitor: do_info_cpus(): Use QBool, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 09/20] monitor: Convert do_info_status() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 10/20] monitor: Convert do_info_kvm() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 11/20] monitor: Convert do_info_name() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 12/20] monitor: Convert do_info_hpet() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 13/20] monitor: Convert do_info_uuid() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 14/20] monitor: Convert do_info_mice() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 15/20] migration: Convert do_info_migrate() to QObject, Luiz Capitulino, 2009/12/10