[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/17] char: Convert qemu_chr_info() to QObject
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 15/17] char: Convert qemu_chr_info() to QObject |
Date: |
Mon, 23 Nov 2009 18:06:21 -0200 |
Each device is represented by a QDict. The returned QObject is a QList
of all devices.
This commit should not change user output.
Signed-off-by: Luiz Capitulino <address@hidden>
---
monitor.c | 3 ++-
qemu-char.c | 43 +++++++++++++++++++++++++++++++++++++++++--
qemu-char.h | 4 +++-
3 files changed, 46 insertions(+), 4 deletions(-)
diff --git a/monitor.c b/monitor.c
index d1a4f02..138de74 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2046,7 +2046,8 @@ static const mon_cmd_t info_cmds[] = {
.args_type = "",
.params = "",
.help = "show the character devices",
- .mhandler.info = qemu_chr_info,
+ .user_print = qemu_chr_info_print,
+ .mhandler.info_new = qemu_chr_info,
},
{
.name = "block",
diff --git a/qemu-char.c b/qemu-char.c
index 5a81e8f..fc0f959 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -32,6 +32,7 @@
#include "hw/usb.h"
#include "hw/baum.h"
#include "hw/msmouse.h"
+#include "qemu-objects.h"
#include <unistd.h>
#include <fcntl.h>
@@ -2465,13 +2466,51 @@ void qemu_chr_close(CharDriverState *chr)
qemu_free(chr);
}
-void qemu_chr_info(Monitor *mon)
+static void qemu_chr_qlist_iter(QObject *obj, void *opaque)
{
+ QDict *chr_dict;
+ Monitor *mon = opaque;
+
+ chr_dict = qobject_to_qdict(obj);
+ monitor_printf(mon, "%s: filename=%s\n", qdict_get_str(chr_dict, "label"),
+ qdict_get_str(chr_dict, "filename"));
+}
+
+void qemu_chr_info_print(Monitor *mon, const QObject *ret_data)
+{
+ qlist_iter(qobject_to_qlist(ret_data), qemu_chr_qlist_iter, mon);
+}
+
+/**
+ * qemu_chr_info(): Character devices information
+ *
+ * Each device is represented by a QDict. The returned QObject is a QList
+ * of all devices.
+ *
+ * The QDict contains the following:
+ *
+ * - "label": device's label
+ * - "filename": device's file
+ *
+ * Example:
+ *
+ * [ { "label": "monitor", "filename", "stdio" },
+ * { "label": "serial0", "filename": "vc" } ]
+ */
+void qemu_chr_info(Monitor *mon, QObject **ret_data)
+{
+ QList *chr_list;
CharDriverState *chr;
+ chr_list = qlist_new();
+
QTAILQ_FOREACH(chr, &chardevs, next) {
- monitor_printf(mon, "%s: filename=%s\n", chr->label, chr->filename);
+ QObject *obj = qobject_from_jsonf("{ 'label': %s, 'filename': %s }",
+ chr->label, chr->filename);
+ qlist_append_obj(chr_list, obj);
}
+
+ *ret_data = QOBJECT(chr_list);
}
CharDriverState *qemu_chr_find(const char *name)
diff --git a/qemu-char.h b/qemu-char.h
index 9957db1..48f54d8 100644
--- a/qemu-char.h
+++ b/qemu-char.h
@@ -5,6 +5,7 @@
#include "qemu-queue.h"
#include "qemu-option.h"
#include "qemu-config.h"
+#include "qobject.h"
/* character device */
@@ -87,7 +88,8 @@ int qemu_chr_can_read(CharDriverState *s);
void qemu_chr_read(CharDriverState *s, uint8_t *buf, int len);
int qemu_chr_get_msgfd(CharDriverState *s);
void qemu_chr_accept_input(CharDriverState *s);
-void qemu_chr_info(Monitor *mon);
+void qemu_chr_info_print(Monitor *mon, const QObject *ret_data);
+void qemu_chr_info(Monitor *mon, QObject **ret_data);
CharDriverState *qemu_chr_find(const char *name);
extern int term_escape_char;
--
1.6.5.3.148.g785c5
- [Qemu-devel] [PATCH 04/17] QDict: Introduce qdict_get_qlist(), (continued)
- [Qemu-devel] [PATCH 04/17] QDict: Introduce qdict_get_qlist(), Luiz Capitulino, 2009/11/23
- [Qemu-devel] [PATCH 05/17] monitor: Fix do_info_balloon() output, Luiz Capitulino, 2009/11/23
- [Qemu-devel] [PATCH 06/17] monitor: Convert do_info_status() to QObject, Luiz Capitulino, 2009/11/23
- [Qemu-devel] [PATCH 07/17] monitor: Convert do_info_kvm() to QObject, Luiz Capitulino, 2009/11/23
- [Qemu-devel] [PATCH 08/17] monitor: Convert do_info_name() to QObject, Luiz Capitulino, 2009/11/23
- [Qemu-devel] [PATCH 09/17] monitor: Convert do_info_hpet() to QObject, Luiz Capitulino, 2009/11/23
- [Qemu-devel] [PATCH 10/17] monitor: Convert do_info_uuid() to QObject, Luiz Capitulino, 2009/11/23
- [Qemu-devel] [PATCH 11/17] monitor: Convert do_info_mice() to QObject, Luiz Capitulino, 2009/11/23
- [Qemu-devel] [PATCH 12/17] migration: Convert do_info_migrate() to QObject, Luiz Capitulino, 2009/11/23
- [Qemu-devel] [PATCH 13/17] block: Convert bdrv_info() to QObject, Luiz Capitulino, 2009/11/23
- [Qemu-devel] [PATCH 15/17] char: Convert qemu_chr_info() to QObject,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 14/17] block: Convert bdrv_info_stats() to QObject, Luiz Capitulino, 2009/11/23
- [Qemu-devel] [PATCH 16/17] PCI: Convert pci_device_hot_add() to QObject, Luiz Capitulino, 2009/11/23
- [Qemu-devel] [PATCH 17/17] VNC: Convert do_info_vnc() to QObject, Luiz Capitulino, 2009/11/23