OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

char: Convert qemu_chr_info() to QObject 

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 <lcapitulino@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Luiz Capitulino 2009-12-10 17:16:08 -02:00 committed by Anthony Liguori
parent 218a536a7a
commit 588b383201
3 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
monitor.c
View File

@ -2356,7 +2356,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",

43
qemu-char.c
View File

@ -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>
@ -2469,13 +2470,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)

4
qemu-char.h
View File

@ -5,6 +5,7 @@
#include "qemu-queue.h"
#include "qemu-option.h"
#include "qemu-config.h"
#include "qobject.h"
/* character device */
@ -88,7 +89,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;