* [Qemu-devel] [PATCH 05/18] monitor: union for info handlers
2009-10-07 16:31 [Qemu-devel] [PATCH v3 00/18]: Initial QObject conversion Luiz Capitulino
@ 2009-10-07 16:32 ` Luiz Capitulino
0 siblings, 0 replies; 20+ messages in thread
From: Luiz Capitulino @ 2009-10-07 16:32 UTC (permalink / raw)
To: qemu-devel; +Cc: aliguori, avi
This commit adds a union to mon_cmd_t for info handlers and
converts do_info() and info_cmds[] array to use it.
This improves type safety.
Next commit will convert command handlers.
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
monitor.c | 77 +++++++++++++++++++++++++++++++------------------------------
1 files changed, 39 insertions(+), 38 deletions(-)
diff --git a/monitor.c b/monitor.c
index ae0354a..c0569d5 100644
--- a/monitor.c
+++ b/monitor.c
@@ -74,6 +74,9 @@ typedef struct mon_cmd_t {
void *handler;
const char *params;
const char *help;
+ union {
+ void (*info)(Monitor *mon);
+ } mhandler;
} mon_cmd_t;
/* file descriptors passed via SCM_RIGHTS */
@@ -283,7 +286,6 @@ static void do_info(Monitor *mon, const QDict *qdict)
{
const mon_cmd_t *cmd;
const char *item = qdict_get_try_str(qdict, "item");
- void (*handler)(Monitor *);
if (!item)
goto help;
@@ -295,8 +297,7 @@ static void do_info(Monitor *mon, const QDict *qdict)
help_cmd(mon, "info");
return;
found:
- handler = cmd->handler;
- handler(mon);
+ cmd->mhandler.info(mon);
}
static void do_info_version(Monitor *mon)
@@ -1816,255 +1817,255 @@ static const mon_cmd_t info_cmds[] = {
{
.name = "version",
.args_type = "",
- .handler = do_info_version,
.params = "",
.help = "show the version of QEMU",
+ .mhandler.info = do_info_version,
},
{
.name = "network",
.args_type = "",
- .handler = do_info_network,
.params = "",
.help = "show the network state",
+ .mhandler.info = do_info_network,
},
{
.name = "chardev",
.args_type = "",
- .handler = qemu_chr_info,
.params = "",
.help = "show the character devices",
+ .mhandler.info = qemu_chr_info,
},
{
.name = "block",
.args_type = "",
- .handler = bdrv_info,
.params = "",
.help = "show the block devices",
+ .mhandler.info = bdrv_info,
},
{
.name = "blockstats",
.args_type = "",
- .handler = bdrv_info_stats,
.params = "",
.help = "show block device statistics",
+ .mhandler.info = bdrv_info_stats,
},
{
.name = "registers",
.args_type = "",
- .handler = do_info_registers,
.params = "",
.help = "show the cpu registers",
+ .mhandler.info = do_info_registers,
},
{
.name = "cpus",
.args_type = "",
- .handler = do_info_cpus,
.params = "",
.help = "show infos for each CPU",
+ .mhandler.info = do_info_cpus,
},
{
.name = "history",
.args_type = "",
- .handler = do_info_history,
.params = "",
.help = "show the command line history",
+ .mhandler.info = do_info_history,
},
{
.name = "irq",
.args_type = "",
- .handler = irq_info,
.params = "",
.help = "show the interrupts statistics (if available)",
+ .mhandler.info = irq_info,
},
{
.name = "pic",
.args_type = "",
- .handler = pic_info,
.params = "",
.help = "show i8259 (PIC) state",
+ .mhandler.info = pic_info,
},
{
.name = "pci",
.args_type = "",
- .handler = pci_info,
.params = "",
.help = "show PCI info",
+ .mhandler.info = pci_info,
},
#if defined(TARGET_I386) || defined(TARGET_SH4)
{
.name = "tlb",
.args_type = "",
- .handler = tlb_info,
.params = "",
.help = "show virtual to physical memory mappings",
+ .mhandler.info = tlb_info,
},
#endif
#if defined(TARGET_I386)
{
.name = "mem",
.args_type = "",
- .handler = mem_info,
.params = "",
.help = "show the active virtual memory mappings",
+ .mhandler.info = mem_info,
},
{
.name = "hpet",
.args_type = "",
- .handler = do_info_hpet,
.params = "",
.help = "show state of HPET",
+ .mhandler.info = do_info_hpet,
},
#endif
{
.name = "jit",
.args_type = "",
- .handler = do_info_jit,
.params = "",
.help = "show dynamic compiler info",
+ .mhandler.info = do_info_jit,
},
{
.name = "kvm",
.args_type = "",
- .handler = do_info_kvm,
.params = "",
.help = "show KVM information",
+ .mhandler.info = do_info_kvm,
},
{
.name = "numa",
.args_type = "",
- .handler = do_info_numa,
.params = "",
.help = "show NUMA information",
+ .mhandler.info = do_info_numa,
},
{
.name = "usb",
.args_type = "",
- .handler = usb_info,
.params = "",
.help = "show guest USB devices",
+ .mhandler.info = usb_info,
},
{
.name = "usbhost",
.args_type = "",
- .handler = usb_host_info,
.params = "",
.help = "show host USB devices",
+ .mhandler.info = usb_host_info,
},
{
.name = "profile",
.args_type = "",
- .handler = do_info_profile,
.params = "",
.help = "show profiling information",
+ .mhandler.info = do_info_profile,
},
{
.name = "capture",
.args_type = "",
- .handler = do_info_capture,
.params = "",
.help = "show capture information",
+ .mhandler.info = do_info_capture,
},
{
.name = "snapshots",
.args_type = "",
- .handler = do_info_snapshots,
.params = "",
.help = "show the currently saved VM snapshots",
+ .mhandler.info = do_info_snapshots,
},
{
.name = "status",
.args_type = "",
- .handler = do_info_status,
.params = "",
.help = "show the current VM status (running|paused)",
+ .mhandler.info = do_info_status,
},
{
.name = "pcmcia",
.args_type = "",
- .handler = pcmcia_info,
.params = "",
.help = "show guest PCMCIA status",
+ .mhandler.info = pcmcia_info,
},
{
.name = "mice",
.args_type = "",
- .handler = do_info_mice,
.params = "",
.help = "show which guest mouse is receiving events",
+ .mhandler.info = do_info_mice,
},
{
.name = "vnc",
.args_type = "",
- .handler = do_info_vnc,
.params = "",
.help = "show the vnc server status",
+ .mhandler.info = do_info_vnc,
},
{
.name = "name",
.args_type = "",
- .handler = do_info_name,
.params = "",
.help = "show the current VM name",
+ .mhandler.info = do_info_name,
},
{
.name = "uuid",
.args_type = "",
- .handler = do_info_uuid,
.params = "",
.help = "show the current VM UUID",
+ .mhandler.info = do_info_uuid,
},
#if defined(TARGET_PPC)
{
.name = "cpustats",
.args_type = "",
- .handler = do_info_cpu_stats,
.params = "",
.help = "show CPU statistics",
+ .mhandler.info = do_info_cpu_stats,
},
#endif
#if defined(CONFIG_SLIRP)
{
.name = "usernet",
.args_type = "",
- .handler = do_info_usernet,
.params = "",
.help = "show user network stack connection states",
+ .mhandler.info = do_info_usernet,
},
#endif
{
.name = "migrate",
.args_type = "",
- .handler = do_info_migrate,
.params = "",
.help = "show migration status",
+ .mhandler.info = do_info_migrate,
},
{
.name = "balloon",
.args_type = "",
- .handler = do_info_balloon,
.params = "",
.help = "show balloon information",
+ .mhandler.info = do_info_balloon,
},
{
.name = "qtree",
.args_type = "",
- .handler = do_info_qtree,
.params = "",
.help = "show device tree",
+ .mhandler.info = do_info_qtree,
},
{
.name = "qdm",
.args_type = "",
- .handler = do_info_qdm,
.params = "",
.help = "show qdev device model list",
+ .mhandler.info = do_info_qdm,
},
{
.name = "roms",
.args_type = "",
- .handler = do_info_roms,
.params = "",
.help = "show roms",
+ .mhandler.info = do_info_roms,
},
{
.name = NULL,
--
1.6.5.rc2.17.gdbc1b
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [Qemu-devel] [RESEND v3 00/18]: Initial QObject conversion
@ 2009-10-07 16:41 Luiz Capitulino
2009-10-07 16:41 ` [Qemu-devel] [PATCH 01/18] QObject: Accept NULL Luiz Capitulino
` (17 more replies)
0 siblings, 18 replies; 20+ messages in thread
From: Luiz Capitulino @ 2009-10-07 16:41 UTC (permalink / raw)
To: qemu-devel; +Cc: aliguori, avi
Hi,
I had a problem with my internel connection while the patches
were being sent, resending.
This is a respin to address Anthony's comments.
Changelog:
V2 -> V3:
- Coding style changes in QList
- Better patch split
- Add an union to store info and command handlers
- Minor changes
V1 -> V2:
- Drop error handling code
- More handlers converted
V0 -> V1:
- Introduced MonitorError
- More handlers converted
- Improved patches descriptions
- Minor changes
diffstat:
Makefile | 3 +-
check-qlist.c | 153 ++++++++++++++
configure | 2 +-
monitor.c | 550 +++++++++++++++++++++++++++++++++++++++----------
qemu-monitor.hx | 620 ++++++++++++++++++++++++++++++++++++++++++++-----------
qlist.c | 100 +++++++++
qlist.h | 38 ++++
qobject.h | 8 +-
8 files changed, 1232 insertions(+), 242 deletions(-)
^ permalink raw reply [flat|nested] 20+ messages in thread
* [Qemu-devel] [PATCH 01/18] QObject: Accept NULL
2009-10-07 16:41 [Qemu-devel] [RESEND v3 00/18]: Initial QObject conversion Luiz Capitulino
@ 2009-10-07 16:41 ` Luiz Capitulino
2009-10-07 16:41 ` [Qemu-devel] [PATCH 02/18] Introduce QList Luiz Capitulino
` (16 subsequent siblings)
17 siblings, 0 replies; 20+ messages in thread
From: Luiz Capitulino @ 2009-10-07 16:41 UTC (permalink / raw)
To: qemu-devel; +Cc: aliguori, avi
It is convenient that QDECREF() and QINCREF() accept the QObject
parameter to be NULL, so that we don't duplicate 'if' tests in
the callers.
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
qobject.h | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/qobject.h b/qobject.h
index 39b8649..dcc8c63 100644
--- a/qobject.h
+++ b/qobject.h
@@ -63,12 +63,10 @@ typedef struct QObject {
/* High-level interface for qobject_incref() */
#define QINCREF(obj) \
- assert(obj != NULL); \
qobject_incref(QOBJECT(obj))
/* High-level interface for qobject_decref() */
#define QDECREF(obj) \
- assert(obj != NULL); \
qobject_decref(QOBJECT(obj))
/* Initialize an object to default values */
@@ -81,7 +79,8 @@ typedef struct QObject {
*/
static inline void qobject_incref(QObject *obj)
{
- obj->refcnt++;
+ if (obj)
+ obj->refcnt++;
}
/**
@@ -90,7 +89,7 @@ static inline void qobject_incref(QObject *obj)
*/
static inline void qobject_decref(QObject *obj)
{
- if (--obj->refcnt == 0) {
+ if (obj && --obj->refcnt == 0) {
assert(obj->type != NULL);
assert(obj->type->destroy != NULL);
obj->type->destroy(obj);
--
1.6.5.rc2.17.gdbc1b
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [Qemu-devel] [PATCH 02/18] Introduce QList
2009-10-07 16:41 [Qemu-devel] [RESEND v3 00/18]: Initial QObject conversion Luiz Capitulino
2009-10-07 16:41 ` [Qemu-devel] [PATCH 01/18] QObject: Accept NULL Luiz Capitulino
@ 2009-10-07 16:41 ` Luiz Capitulino
2009-10-07 16:41 ` [Qemu-devel] [PATCH 03/18] Introduce QList unit-tests Luiz Capitulino
` (15 subsequent siblings)
17 siblings, 0 replies; 20+ messages in thread
From: Luiz Capitulino @ 2009-10-07 16:41 UTC (permalink / raw)
To: qemu-devel; +Cc: aliguori, avi
QList is a high-level data type that can be used to store QObjects
in a singly-linked list.
The following functions are available:
- qlist_new() Create a new QList
- qlist_append() Append a QObject to the list
- qlist_iter() Iterate over stored QObjects
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
Makefile | 2 +-
qlist.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
qlist.h | 38 +++++++++++++++++++++++
qobject.h | 1 +
4 files changed, 140 insertions(+), 1 deletions(-)
create mode 100644 qlist.c
create mode 100644 qlist.h
diff --git a/Makefile b/Makefile
index c552739..17bcbe4 100644
--- a/Makefile
+++ b/Makefile
@@ -100,7 +100,7 @@ obj-y += buffered_file.o migration.o migration-tcp.o net.o qemu-sockets.o
obj-y += qemu-char.o aio.o net-checksum.o savevm.o
obj-y += msmouse.o ps2.o
obj-y += qdev.o qdev-properties.o ssi.o
-obj-y += qint.o qstring.o qdict.o qemu-config.o
+obj-y += qint.o qstring.o qdict.o qlist.o qemu-config.o
obj-$(CONFIG_BRLAPI) += baum.o
obj-$(CONFIG_WIN32) += tap-win32.o
diff --git a/qlist.c b/qlist.c
new file mode 100644
index 0000000..ba2c66c
--- /dev/null
+++ b/qlist.c
@@ -0,0 +1,100 @@
+/*
+ * QList data type.
+ *
+ * Copyright (C) 2009 Red Hat Inc.
+ *
+ * Authors:
+ * Luiz Capitulino <lcapitulino@redhat.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2. See
+ * the COPYING file in the top-level directory.
+ */
+#include "qlist.h"
+#include "qobject.h"
+#include "qemu-queue.h"
+#include "qemu-common.h"
+
+static void qlist_destroy_obj(QObject *obj);
+
+static const QType qlist_type = {
+ .code = QTYPE_QLIST,
+ .destroy = qlist_destroy_obj,
+};
+
+/**
+ * qlist_new(): Create a new QList
+ *
+ * Return strong reference.
+ */
+QList *qlist_new(void)
+{
+ QList *qlist;
+
+ qlist = qemu_malloc(sizeof(*qlist));
+ QTAILQ_INIT(&qlist->head);
+ QOBJECT_INIT(qlist, &qlist_type);
+
+ return qlist;
+}
+
+/**
+ * qlist_append_obj(): Append an QObject into QList
+ *
+ * NOTE: ownership of 'value' is transferred to the QList
+ */
+void qlist_append_obj(QList *qlist, QObject *value)
+{
+ QListEntry *entry;
+
+ entry = qemu_malloc(sizeof(*entry));
+ entry->value = value;
+
+ QTAILQ_INSERT_TAIL(&qlist->head, entry, next);
+}
+
+/**
+ * qlist_iter(): Iterate over all the list's stored values.
+ *
+ * This function allows the user to provide an iterator, which will be
+ * called for each stored value in the list.
+ */
+void qlist_iter(const QList *qlist,
+ void (*iter)(QObject *obj, void *opaque), void *opaque)
+{
+ QListEntry *entry;
+
+ QTAILQ_FOREACH(entry, &qlist->head, next)
+ iter(entry->value, opaque);
+}
+
+/**
+ * qobject_to_qlist(): Convert a QObject into a QList
+ */
+QList *qobject_to_qlist(const QObject *obj)
+{
+ if (qobject_type(obj) != QTYPE_QLIST) {
+ return NULL;
+ }
+
+ return container_of(obj, QList, base);
+}
+
+/**
+ * qlist_destroy_obj(): Free all the memory allocated by a QList
+ */
+static void qlist_destroy_obj(QObject *obj)
+{
+ QList *qlist;
+ QListEntry *entry, *next_entry;
+
+ assert(obj != NULL);
+ qlist = qobject_to_qlist(obj);
+
+ QTAILQ_FOREACH_SAFE(entry, &qlist->head, next, next_entry) {
+ QTAILQ_REMOVE(&qlist->head, entry, next);
+ qobject_decref(entry->value);
+ qemu_free(entry);
+ }
+
+ qemu_free(qlist);
+}
diff --git a/qlist.h b/qlist.h
new file mode 100644
index 0000000..3eb1eb8
--- /dev/null
+++ b/qlist.h
@@ -0,0 +1,38 @@
+/*
+ * QList data type header.
+ *
+ * Copyright (C) 2009 Red Hat Inc.
+ *
+ * Authors:
+ * Luiz Capitulino <lcapitulino@redhat.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2. See
+ * the COPYING file in the top-level directory.
+ */
+#ifndef QLIST_H
+#define QLIST_H
+
+#include "qobject.h"
+#include "qemu-queue.h"
+#include "qemu-common.h"
+
+typedef struct QListEntry {
+ QObject *value;
+ QTAILQ_ENTRY(QListEntry) next;
+} QListEntry;
+
+typedef struct QList {
+ QObject_HEAD;
+ QTAILQ_HEAD(,QListEntry) head;
+} QList;
+
+#define qlist_append(qlist, obj) \
+ qlist_append_obj(qlist, QOBJECT(obj))
+
+QList *qlist_new(void);
+void qlist_append_obj(QList *qlist, QObject *obj);
+void qlist_iter(const QList *qlist,
+ void (*iter)(QObject *obj, void *opaque), void *opaque);
+QList *qobject_to_qlist(const QObject *obj);
+
+#endif /* QLIST_H */
diff --git a/qobject.h b/qobject.h
index dcc8c63..4cc9287 100644
--- a/qobject.h
+++ b/qobject.h
@@ -40,6 +40,7 @@ typedef enum {
QTYPE_QINT,
QTYPE_QSTRING,
QTYPE_QDICT,
+ QTYPE_QLIST,
} qtype_code;
struct QObject;
--
1.6.5.rc2.17.gdbc1b
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [Qemu-devel] [PATCH 03/18] Introduce QList unit-tests
2009-10-07 16:41 [Qemu-devel] [RESEND v3 00/18]: Initial QObject conversion Luiz Capitulino
2009-10-07 16:41 ` [Qemu-devel] [PATCH 01/18] QObject: Accept NULL Luiz Capitulino
2009-10-07 16:41 ` [Qemu-devel] [PATCH 02/18] Introduce QList Luiz Capitulino
@ 2009-10-07 16:41 ` Luiz Capitulino
2009-10-07 16:41 ` [Qemu-devel] [PATCH 04/18] monitor: Convert mon_cmd_t initializations to C99 style Luiz Capitulino
` (14 subsequent siblings)
17 siblings, 0 replies; 20+ messages in thread
From: Luiz Capitulino @ 2009-10-07 16:41 UTC (permalink / raw)
To: qemu-devel; +Cc: aliguori, avi
This suite contains tests to assure that QList API works as expected.
To execute it you should have check installed and build QEMU with
check support enabled (--enable-check-utests) and then run:
$ ./check-qlist
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
Makefile | 1 +
check-qlist.c | 153 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
configure | 2 +-
3 files changed, 155 insertions(+), 1 deletions(-)
create mode 100644 check-qlist.c
diff --git a/Makefile b/Makefile
index 17bcbe4..d96fb4b 100644
--- a/Makefile
+++ b/Makefile
@@ -187,6 +187,7 @@ qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx
check-qint: check-qint.o qint.o qemu-malloc.o
check-qstring: check-qstring.o qstring.o qemu-malloc.o
check-qdict: check-qdict.o qdict.o qint.o qstring.o qemu-malloc.o
+check-qlist: check-qlist.o qlist.o qint.o qemu-malloc.o
clean:
# avoid old build problems by removing potentially incorrect old files
diff --git a/check-qlist.c b/check-qlist.c
new file mode 100644
index 0000000..0117ef3
--- /dev/null
+++ b/check-qlist.c
@@ -0,0 +1,153 @@
+/*
+ * QList unit-tests.
+ *
+ * Copyright (C) 2009 Red Hat Inc.
+ *
+ * Authors:
+ * Luiz Capitulino <lcapitulino@redhat.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2. See
+ * the COPYING file in the top-level directory.
+ */
+#include <check.h>
+
+#include "qint.h"
+#include "qlist.h"
+
+/*
+ * Public Interface test-cases
+ *
+ * (with some violations to access 'private' data)
+ */
+
+START_TEST(qlist_new_test)
+{
+ QList *qlist;
+
+ qlist = qlist_new();
+ fail_unless(qlist != NULL);
+ fail_unless(qlist->base.refcnt == 1);
+ fail_unless(qobject_type(QOBJECT(qlist)) == QTYPE_QLIST);
+
+ // destroy doesn't exist yet
+ qemu_free(qlist);
+}
+END_TEST
+
+START_TEST(qlist_append_test)
+{
+ QInt *qi;
+ QList *qlist;
+ QListEntry *entry;
+
+ qi = qint_from_int(42);
+
+ qlist = qlist_new();
+ qlist_append(qlist, qi);
+
+ entry = QTAILQ_FIRST(&qlist->head);
+ fail_unless(entry != NULL);
+ fail_unless(entry->value == QOBJECT(qi));
+
+ // destroy doesn't exist yet
+ QDECREF(qi);
+ qemu_free(entry);
+ qemu_free(qlist);
+}
+END_TEST
+
+START_TEST(qobject_to_qlist_test)
+{
+ QList *qlist;
+
+ qlist = qlist_new();
+
+ fail_unless(qobject_to_qlist(QOBJECT(qlist)) == qlist);
+
+ // destroy doesn't exist yet
+ qemu_free(qlist);
+}
+END_TEST
+
+START_TEST(qlist_destroy_test)
+{
+ int i;
+ QList *qlist;
+
+ qlist = qlist_new();
+
+ for (i = 0; i < 42; i++)
+ qlist_append(qlist, qint_from_int(i));
+
+ QDECREF(qlist);
+}
+END_TEST
+
+static int iter_called;
+static const int iter_max = 42;
+
+static void iter_func(QObject *obj, void *opaque)
+{
+ QInt *qi;
+
+ fail_unless(opaque == NULL);
+
+ qi = qobject_to_qint(obj);
+ fail_unless(qi != NULL);
+ fail_unless((qint_get_int(qi) >= 0) && (qint_get_int(qi) <= iter_max));
+
+ iter_called++;
+}
+
+START_TEST(qlist_iter_test)
+{
+ int i;
+ QList *qlist;
+
+ qlist = qlist_new();
+
+ for (i = 0; i < iter_max; i++)
+ qlist_append(qlist, qint_from_int(i));
+
+ iter_called = 0;
+ qlist_iter(qlist, iter_func, NULL);
+
+ fail_unless(iter_called == iter_max);
+
+ QDECREF(qlist);
+}
+END_TEST
+
+static Suite *QList_suite(void)
+{
+ Suite *s;
+ TCase *qlist_public_tcase;
+
+ s = suite_create("QList suite");
+
+ qlist_public_tcase = tcase_create("Public Interface");
+ suite_add_tcase(s, qlist_public_tcase);
+ tcase_add_test(qlist_public_tcase, qlist_new_test);
+ tcase_add_test(qlist_public_tcase, qlist_append_test);
+ tcase_add_test(qlist_public_tcase, qobject_to_qlist_test);
+ tcase_add_test(qlist_public_tcase, qlist_destroy_test);
+ tcase_add_test(qlist_public_tcase, qlist_iter_test);
+
+ return s;
+}
+
+int main(void)
+{
+ int nf;
+ Suite *s;
+ SRunner *sr;
+
+ s = QList_suite();
+ sr = srunner_create(s);
+
+ srunner_run_all(sr, CK_NORMAL);
+ nf = srunner_ntests_failed(sr);
+ srunner_free(sr);
+
+ return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/configure b/configure
index ad04880..4ea5483 100755
--- a/configure
+++ b/configure
@@ -2017,7 +2017,7 @@ if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then
if [ "$linux" = "yes" ] ; then
tools="qemu-nbd\$(EXESUF) qemu-io\$(EXESUF) $tools"
if [ "$check_utests" = "yes" ]; then
- tools="check-qint check-qstring check-qdict $tools"
+ tools="check-qint check-qstring check-qdict check-qlist $tools"
fi
elif test "$mingw32" = "yes" ; then
tools="qemu-io\$(EXESUF) $tools"
--
1.6.5.rc2.17.gdbc1b
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [Qemu-devel] [PATCH 04/18] monitor: Convert mon_cmd_t initializations to C99 style
2009-10-07 16:41 [Qemu-devel] [RESEND v3 00/18]: Initial QObject conversion Luiz Capitulino
` (2 preceding siblings ...)
2009-10-07 16:41 ` [Qemu-devel] [PATCH 03/18] Introduce QList unit-tests Luiz Capitulino
@ 2009-10-07 16:41 ` Luiz Capitulino
2009-10-07 16:41 ` [Qemu-devel] [PATCH 05/18] monitor: union for info handlers Luiz Capitulino
` (13 subsequent siblings)
17 siblings, 0 replies; 20+ messages in thread
From: Luiz Capitulino @ 2009-10-07 16:41 UTC (permalink / raw)
To: qemu-devel; +Cc: aliguori, avi
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
monitor.c | 318 ++++++++++++++++++++++-------
qemu-monitor.hx | 613 +++++++++++++++++++++++++++++++++++++++++++-----------
2 files changed, 736 insertions(+), 195 deletions(-)
diff --git a/monitor.c b/monitor.c
index f79b833..ae0354a 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1813,84 +1813,262 @@ static const mon_cmd_t mon_cmds[] = {
/* Please update qemu-monitor.hx when adding or changing commands */
static const mon_cmd_t info_cmds[] = {
- { "version", "", do_info_version,
- "", "show the version of QEMU" },
- { "network", "", do_info_network,
- "", "show the network state" },
- { "chardev", "", qemu_chr_info,
- "", "show the character devices" },
- { "block", "", bdrv_info,
- "", "show the block devices" },
- { "blockstats", "", bdrv_info_stats,
- "", "show block device statistics" },
- { "registers", "", do_info_registers,
- "", "show the cpu registers" },
- { "cpus", "", do_info_cpus,
- "", "show infos for each CPU" },
- { "history", "", do_info_history,
- "", "show the command line history", },
- { "irq", "", irq_info,
- "", "show the interrupts statistics (if available)", },
- { "pic", "", pic_info,
- "", "show i8259 (PIC) state", },
- { "pci", "", pci_info,
- "", "show PCI info", },
+ {
+ .name = "version",
+ .args_type = "",
+ .handler = do_info_version,
+ .params = "",
+ .help = "show the version of QEMU",
+ },
+ {
+ .name = "network",
+ .args_type = "",
+ .handler = do_info_network,
+ .params = "",
+ .help = "show the network state",
+ },
+ {
+ .name = "chardev",
+ .args_type = "",
+ .handler = qemu_chr_info,
+ .params = "",
+ .help = "show the character devices",
+ },
+ {
+ .name = "block",
+ .args_type = "",
+ .handler = bdrv_info,
+ .params = "",
+ .help = "show the block devices",
+ },
+ {
+ .name = "blockstats",
+ .args_type = "",
+ .handler = bdrv_info_stats,
+ .params = "",
+ .help = "show block device statistics",
+ },
+ {
+ .name = "registers",
+ .args_type = "",
+ .handler = do_info_registers,
+ .params = "",
+ .help = "show the cpu registers",
+ },
+ {
+ .name = "cpus",
+ .args_type = "",
+ .handler = do_info_cpus,
+ .params = "",
+ .help = "show infos for each CPU",
+ },
+ {
+ .name = "history",
+ .args_type = "",
+ .handler = do_info_history,
+ .params = "",
+ .help = "show the command line history",
+ },
+ {
+ .name = "irq",
+ .args_type = "",
+ .handler = irq_info,
+ .params = "",
+ .help = "show the interrupts statistics (if available)",
+ },
+ {
+ .name = "pic",
+ .args_type = "",
+ .handler = pic_info,
+ .params = "",
+ .help = "show i8259 (PIC) state",
+ },
+ {
+ .name = "pci",
+ .args_type = "",
+ .handler = pci_info,
+ .params = "",
+ .help = "show PCI info",
+ },
#if defined(TARGET_I386) || defined(TARGET_SH4)
- { "tlb", "", tlb_info,
- "", "show virtual to physical memory mappings", },
+ {
+ .name = "tlb",
+ .args_type = "",
+ .handler = tlb_info,
+ .params = "",
+ .help = "show virtual to physical memory mappings",
+ },
#endif
#if defined(TARGET_I386)
- { "mem", "", mem_info,
- "", "show the active virtual memory mappings", },
- { "hpet", "", do_info_hpet,
- "", "show state of HPET", },
+ {
+ .name = "mem",
+ .args_type = "",
+ .handler = mem_info,
+ .params = "",
+ .help = "show the active virtual memory mappings",
+ },
+ {
+ .name = "hpet",
+ .args_type = "",
+ .handler = do_info_hpet,
+ .params = "",
+ .help = "show state of HPET",
+ },
#endif
- { "jit", "", do_info_jit,
- "", "show dynamic compiler info", },
- { "kvm", "", do_info_kvm,
- "", "show KVM information", },
- { "numa", "", do_info_numa,
- "", "show NUMA information", },
- { "usb", "", usb_info,
- "", "show guest USB devices", },
- { "usbhost", "", usb_host_info,
- "", "show host USB devices", },
- { "profile", "", do_info_profile,
- "", "show profiling information", },
- { "capture", "", do_info_capture,
- "", "show capture information" },
- { "snapshots", "", do_info_snapshots,
- "", "show the currently saved VM snapshots" },
- { "status", "", do_info_status,
- "", "show the current VM status (running|paused)" },
- { "pcmcia", "", pcmcia_info,
- "", "show guest PCMCIA status" },
- { "mice", "", do_info_mice,
- "", "show which guest mouse is receiving events" },
- { "vnc", "", do_info_vnc,
- "", "show the vnc server status"},
- { "name", "", do_info_name,
- "", "show the current VM name" },
- { "uuid", "", do_info_uuid,
- "", "show the current VM UUID" },
+ {
+ .name = "jit",
+ .args_type = "",
+ .handler = do_info_jit,
+ .params = "",
+ .help = "show dynamic compiler info",
+ },
+ {
+ .name = "kvm",
+ .args_type = "",
+ .handler = do_info_kvm,
+ .params = "",
+ .help = "show KVM information",
+ },
+ {
+ .name = "numa",
+ .args_type = "",
+ .handler = do_info_numa,
+ .params = "",
+ .help = "show NUMA information",
+ },
+ {
+ .name = "usb",
+ .args_type = "",
+ .handler = usb_info,
+ .params = "",
+ .help = "show guest USB devices",
+ },
+ {
+ .name = "usbhost",
+ .args_type = "",
+ .handler = usb_host_info,
+ .params = "",
+ .help = "show host USB devices",
+ },
+ {
+ .name = "profile",
+ .args_type = "",
+ .handler = do_info_profile,
+ .params = "",
+ .help = "show profiling information",
+ },
+ {
+ .name = "capture",
+ .args_type = "",
+ .handler = do_info_capture,
+ .params = "",
+ .help = "show capture information",
+ },
+ {
+ .name = "snapshots",
+ .args_type = "",
+ .handler = do_info_snapshots,
+ .params = "",
+ .help = "show the currently saved VM snapshots",
+ },
+ {
+ .name = "status",
+ .args_type = "",
+ .handler = do_info_status,
+ .params = "",
+ .help = "show the current VM status (running|paused)",
+ },
+ {
+ .name = "pcmcia",
+ .args_type = "",
+ .handler = pcmcia_info,
+ .params = "",
+ .help = "show guest PCMCIA status",
+ },
+ {
+ .name = "mice",
+ .args_type = "",
+ .handler = do_info_mice,
+ .params = "",
+ .help = "show which guest mouse is receiving events",
+ },
+ {
+ .name = "vnc",
+ .args_type = "",
+ .handler = do_info_vnc,
+ .params = "",
+ .help = "show the vnc server status",
+ },
+ {
+ .name = "name",
+ .args_type = "",
+ .handler = do_info_name,
+ .params = "",
+ .help = "show the current VM name",
+ },
+ {
+ .name = "uuid",
+ .args_type = "",
+ .handler = do_info_uuid,
+ .params = "",
+ .help = "show the current VM UUID",
+ },
#if defined(TARGET_PPC)
- { "cpustats", "", do_info_cpu_stats,
- "", "show CPU statistics", },
+ {
+ .name = "cpustats",
+ .args_type = "",
+ .handler = do_info_cpu_stats,
+ .params = "",
+ .help = "show CPU statistics",
+ },
#endif
#if defined(CONFIG_SLIRP)
- { "usernet", "", do_info_usernet,
- "", "show user network stack connection states", },
+ {
+ .name = "usernet",
+ .args_type = "",
+ .handler = do_info_usernet,
+ .params = "",
+ .help = "show user network stack connection states",
+ },
#endif
- { "migrate", "", do_info_migrate, "", "show migration status" },
- { "balloon", "", do_info_balloon,
- "", "show balloon information" },
- { "qtree", "", do_info_qtree,
- "", "show device tree" },
- { "qdm", "", do_info_qdm,
- "", "show qdev device model list" },
- { "roms", "", do_info_roms,
- "", "show roms" },
- { NULL, NULL, },
+ {
+ .name = "migrate",
+ .args_type = "",
+ .handler = do_info_migrate,
+ .params = "",
+ .help = "show migration status",
+ },
+ {
+ .name = "balloon",
+ .args_type = "",
+ .handler = do_info_balloon,
+ .params = "",
+ .help = "show balloon information",
+ },
+ {
+ .name = "qtree",
+ .args_type = "",
+ .handler = do_info_qtree,
+ .params = "",
+ .help = "show device tree",
+ },
+ {
+ .name = "qdm",
+ .args_type = "",
+ .handler = do_info_qdm,
+ .params = "",
+ .help = "show qdev device model list",
+ },
+ {
+ .name = "roms",
+ .args_type = "",
+ .handler = do_info_roms,
+ .params = "",
+ .help = "show roms",
+ },
+ {
+ .name = NULL,
+ },
};
/*******************************************************************/
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index 784d30e..cdaf5b7 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -9,21 +9,40 @@ STEXI
@table @option
ETEXI
- { "help|?", "name:s?", do_help_cmd, "[cmd]", "show the help" },
+ {
+ .name = "help|?",
+ .args_type = "name:s?",
+ .handler = do_help_cmd,
+ .params = "[cmd]",
+ .help = "show the help",
+ },
+
STEXI
@item help or ? [@var{cmd}]
Show the help for all commands or just for command @var{cmd}.
ETEXI
- { "commit", "device:B", do_commit,
- "device|all", "commit changes to the disk images (if -snapshot is used) or backing files" },
+ {
+ .name = "commit",
+ .args_type = "device:B",
+ .handler = do_commit,
+ .params = "device|all",
+ .help = "commit changes to the disk images (if -snapshot is used) or backing files",
+ },
+
STEXI
@item commit
Commit changes to the disk images (if -snapshot is used) or backing files.
ETEXI
- { "info", "item:s?", do_info,
- "[subcommand]", "show various information about the system state" },
+ {
+ .name = "info",
+ .args_type = "item:s?",
+ .handler = do_info,
+ .params = "[subcommand]",
+ .help = "show various information about the system state",
+ },
+
STEXI
@item info @var{subcommand}
Show various information about the system state.
@@ -94,22 +113,40 @@ show device tree
@end table
ETEXI
- { "q|quit", "", do_quit,
- "", "quit the emulator" },
+ {
+ .name = "q|quit",
+ .args_type = "",
+ .handler = do_quit,
+ .params = "",
+ .help = "quit the emulator",
+ },
+
STEXI
@item q or quit
Quit the emulator.
ETEXI
- { "eject", "force:-f,filename:B", do_eject,
- "[-f] device", "eject a removable medium (use -f to force it)" },
+ {
+ .name = "eject",
+ .args_type = "force:-f,filename:B",
+ .handler = do_eject,
+ .params = "[-f] device",
+ .help = "eject a removable medium (use -f to force it)",
+ },
+
STEXI
@item eject [-f] @var{device}
Eject a removable medium (use -f to force it).
ETEXI
- { "change", "device:B,target:F,arg:s?", do_change,
- "device filename [format]", "change a removable medium, optional format" },
+ {
+ .name = "change",
+ .args_type = "device:B,target:F,arg:s?",
+ .handler = do_change,
+ .params = "device filename [format]",
+ .help = "change a removable medium, optional format",
+ },
+
STEXI
@item change @var{device} @var{setting}
@@ -147,29 +184,53 @@ Password: ********
@end table
ETEXI
- { "screendump", "filename:F", do_screen_dump,
- "filename", "save screen into PPM image 'filename'" },
+ {
+ .name = "screendump",
+ .args_type = "filename:F",
+ .handler = do_screen_dump,
+ .params = "filename",
+ .help = "save screen into PPM image 'filename'",
+ },
+
STEXI
@item screendump @var{filename}
Save screen into PPM image @var{filename}.
ETEXI
- { "logfile", "filename:F", do_logfile,
- "filename", "output logs to 'filename'" },
+ {
+ .name = "logfile",
+ .args_type = "filename:F",
+ .handler = do_logfile,
+ .params = "filename",
+ .help = "output logs to 'filename'",
+ },
+
STEXI
@item logfile @var{filename}
Output logs to @var{filename}.
ETEXI
- { "log", "items:s", do_log,
- "item1[,...]", "activate logging of the specified items to '/tmp/qemu.log'" },
+ {
+ .name = "log",
+ .args_type = "items:s",
+ .handler = do_log,
+ .params = "item1[,...]",
+ .help = "activate logging of the specified items to '/tmp/qemu.log'",
+ },
+
STEXI
@item log @var{item1}[,...]
Activate logging of the specified items to @file{/tmp/qemu.log}.
ETEXI
- { "savevm", "name:s?", do_savevm,
- "[tag|id]", "save a VM snapshot. If no tag or id are provided, a new snapshot is created" },
+ {
+ .name = "savevm",
+ .args_type = "name:s?",
+ .handler = do_savevm,
+ .params = "[tag|id]",
+ .help = "save a VM snapshot. If no tag or id are provided, a new snapshot is created",
+ },
+
STEXI
@item savevm [@var{tag}|@var{id}]
Create a snapshot of the whole virtual machine. If @var{tag} is
@@ -178,59 +239,107 @@ a snapshot with the same tag or ID, it is replaced. More info at
@ref{vm_snapshots}.
ETEXI
- { "loadvm", "name:s", do_loadvm,
- "tag|id", "restore a VM snapshot from its tag or id" },
+ {
+ .name = "loadvm",
+ .args_type = "name:s",
+ .handler = do_loadvm,
+ .params = "tag|id",
+ .help = "restore a VM snapshot from its tag or id",
+ },
+
STEXI
@item loadvm @var{tag}|@var{id}
Set the whole virtual machine to the snapshot identified by the tag
@var{tag} or the unique snapshot ID @var{id}.
ETEXI
- { "delvm", "name:s", do_delvm,
- "tag|id", "delete a VM snapshot from its tag or id" },
+ {
+ .name = "delvm",
+ .args_type = "name:s",
+ .handler = do_delvm,
+ .params = "tag|id",
+ .help = "delete a VM snapshot from its tag or id",
+ },
+
STEXI
@item delvm @var{tag}|@var{id}
Delete the snapshot identified by @var{tag} or @var{id}.
ETEXI
- { "singlestep", "option:s?", do_singlestep,
- "[on|off]", "run emulation in singlestep mode or switch to normal mode", },
+ {
+ .name = "singlestep",
+ .args_type = "option:s?",
+ .handler = do_singlestep,
+ .params = "[on|off]",
+ .help = "run emulation in singlestep mode or switch to normal mode",
+ },
+
STEXI
@item singlestep [off]
Run the emulation in single step mode.
If called with option off, the emulation returns to normal mode.
ETEXI
- { "stop", "", do_stop,
- "", "stop emulation", },
+ {
+ .name = "stop",
+ .args_type = "",
+ .handler = do_stop,
+ .params = "",
+ .help = "stop emulation",
+ },
+
STEXI
@item stop
Stop emulation.
ETEXI
- { "c|cont", "", do_cont,
- "", "resume emulation", },
+ {
+ .name = "c|cont",
+ .args_type = "",
+ .handler = do_cont,
+ .params = "",
+ .help = "resume emulation",
+ },
+
STEXI
@item c or cont
Resume emulation.
ETEXI
- { "gdbserver", "device:s?", do_gdbserver,
- "[device]", "start gdbserver on given device (default 'tcp::1234'), stop with 'none'", },
+ {
+ .name = "gdbserver",
+ .args_type = "device:s?",
+ .handler = do_gdbserver,
+ .params = "[device]",
+ .help = "start gdbserver on given device (default 'tcp::1234'), stop with 'none'",
+ },
+
STEXI
@item gdbserver [@var{port}]
Start gdbserver session (default @var{port}=1234)
ETEXI
- { "x", "fmt:/,addr:l", do_memory_dump,
- "/fmt addr", "virtual memory dump starting at 'addr'", },
+ {
+ .name = "x",
+ .args_type = "fmt:/,addr:l",
+ .handler = do_memory_dump,
+ .params = "/fmt addr",
+ .help = "virtual memory dump starting at 'addr'",
+ },
+
STEXI
@item x/fmt @var{addr}
Virtual memory dump starting at @var{addr}.
ETEXI
- { "xp", "fmt:/,addr:l", do_physical_memory_dump,
- "/fmt addr", "physical memory dump starting at 'addr'", },
+ {
+ .name = "xp",
+ .args_type = "fmt:/,addr:l",
+ .handler = do_physical_memory_dump,
+ .params = "/fmt addr",
+ .help = "physical memory dump starting at 'addr'",
+ },
+
STEXI
@item xp /@var{fmt} @var{addr}
Physical memory dump starting at @var{addr}.
@@ -289,8 +398,14 @@ Dump 80 16 bit values at the start of the video memory.
@end itemize
ETEXI
- { "p|print", "fmt:/,val:l", do_print,
- "/fmt expr", "print expression value (use $reg for CPU register access)", },
+ {
+ .name = "p|print",
+ .args_type = "fmt:/,val:l",
+ .handler = do_print,
+ .params = "/fmt expr",
+ .help = "print expression value (use $reg for CPU register access)",
+ },
+
STEXI
@item p or print/@var{fmt} @var{expr}
@@ -298,20 +413,38 @@ Print expression value. Only the @var{format} part of @var{fmt} is
used.
ETEXI
- { "i", "fmt:/,addr:i,index:i.", do_ioport_read,
- "/fmt addr", "I/O port read" },
+ {
+ .name = "i",
+ .args_type = "fmt:/,addr:i,index:i.",
+ .handler = do_ioport_read,
+ .params = "/fmt addr",
+ .help = "I/O port read",
+ },
+
STEXI
Read I/O port.
ETEXI
- { "o", "fmt:/,addr:i,val:i", do_ioport_write,
- "/fmt addr value", "I/O port write" },
+ {
+ .name = "o",
+ .args_type = "fmt:/,addr:i,val:i",
+ .handler = do_ioport_write,
+ .params = "/fmt addr value",
+ .help = "I/O port write",
+ },
+
STEXI
Write to I/O port.
ETEXI
- { "sendkey", "string:s,hold_time:i?", do_sendkey,
- "keys [hold_ms]", "send keys to the VM (e.g. 'sendkey ctrl-alt-f1', default hold time=100 ms)" },
+ {
+ .name = "sendkey",
+ .args_type = "string:s,hold_time:i?",
+ .handler = do_sendkey,
+ .params = "keys [hold_ms]",
+ .help = "send keys to the VM (e.g. 'sendkey ctrl-alt-f1', default hold time=100 ms)",
+ },
+
STEXI
@item sendkey @var{keys}
@@ -326,32 +459,56 @@ This command is useful to send keys that your graphical user interface
intercepts at low level, such as @code{ctrl-alt-f1} in X Window.
ETEXI
- { "system_reset", "", do_system_reset,
- "", "reset the system" },
+ {
+ .name = "system_reset",
+ .args_type = "",
+ .handler = do_system_reset,
+ .params = "",
+ .help = "reset the system",
+ },
+
STEXI
@item system_reset
Reset the system.
ETEXI
- { "system_powerdown", "", do_system_powerdown,
- "", "send system power down event" },
+ {
+ .name = "system_powerdown",
+ .args_type = "",
+ .handler = do_system_powerdown,
+ .params = "",
+ .help = "send system power down event",
+ },
+
STEXI
@item system_powerdown
Power down the system (if supported).
ETEXI
- { "sum", "start:i,size:i", do_sum,
- "addr size", "compute the checksum of a memory region" },
+ {
+ .name = "sum",
+ .args_type = "start:i,size:i",
+ .handler = do_sum,
+ .params = "addr size",
+ .help = "compute the checksum of a memory region",
+ },
+
STEXI
@item sum @var{addr} @var{size}
Compute the checksum of a memory region.
ETEXI
- { "usb_add", "devname:s", do_usb_add,
- "device", "add USB device (e.g. 'host:bus.addr' or 'host:vendor_id:product_id')" },
+ {
+ .name = "usb_add",
+ .args_type = "devname:s",
+ .handler = do_usb_add,
+ .params = "device",
+ .help = "add USB device (e.g. 'host:bus.addr' or 'host:vendor_id:product_id')",
+ },
+
STEXI
@item usb_add @var{devname}
@@ -359,8 +516,14 @@ Add the USB device @var{devname}. For details of available devices see
@ref{usb_devices}
ETEXI
- { "usb_del", "devname:s", do_usb_del,
- "device", "remove USB device 'bus.addr'" },
+ {
+ .name = "usb_del",
+ .args_type = "devname:s",
+ .handler = do_usb_del,
+ .params = "device",
+ .help = "remove USB device 'bus.addr'",
+ },
+
STEXI
@item usb_del @var{devname}
@@ -369,45 +532,81 @@ hub. @var{devname} has the syntax @code{bus.addr}. Use the monitor
command @code{info usb} to see the devices you can remove.
ETEXI
- { "device_add", "config:s", do_device_add,
- "device", "add device, like -device on the command line" },
+ {
+ .name = "device_add",
+ .args_type = "config:s",
+ .handler = do_device_add,
+ .params = "device",
+ .help = "add device, like -device on the command line",
+ },
+
STEXI
@item device_add @var{config}
Add device.
ETEXI
- { "device_del", "id:s", do_device_del,
- "device", "remove device" },
+ {
+ .name = "device_del",
+ .args_type = "id:s",
+ .handler = do_device_del,
+ .params = "device",
+ .help = "remove device",
+ },
+
STEXI
@item device_del @var{id}
Remove device @var{id}.
ETEXI
- { "cpu", "index:i", do_cpu_set, "index", "set the default CPU" },
+ {
+ .name = "cpu",
+ .args_type = "index:i",
+ .handler = do_cpu_set,
+ .params = "index",
+ .help = "set the default CPU",
+ },
STEXI
Set the default CPU.
ETEXI
- { "mouse_move", "dx_str:s,dy_str:s,dz_str:s?", do_mouse_move,
- "dx dy [dz]", "send mouse move events" },
+ {
+ .name = "mouse_move",
+ .args_type = "dx_str:s,dy_str:s,dz_str:s?",
+ .handler = do_mouse_move,
+ .params = "dx dy [dz]",
+ .help = "send mouse move events",
+ },
+
STEXI
@item mouse_move @var{dx} @var{dy} [@var{dz}]
Move the active mouse to the specified coordinates @var{dx} @var{dy}
with optional scroll axis @var{dz}.
ETEXI
- { "mouse_button", "button_state:i", do_mouse_button,
- "state", "change mouse button state (1=L, 2=M, 4=R)" },
+ {
+ .name = "mouse_button",
+ .args_type = "button_state:i",
+ .handler = do_mouse_button,
+ .params = "state",
+ .help = "change mouse button state (1=L, 2=M, 4=R)",
+ },
+
STEXI
@item mouse_button @var{val}
Change the active mouse button state @var{val} (1=L, 2=M, 4=R).
ETEXI
- { "mouse_set", "index:i", do_mouse_set,
- "index", "set which mouse device receives events" },
+ {
+ .name = "mouse_set",
+ .args_type = "index:i",
+ .handler = do_mouse_set,
+ .params = "index",
+ .help = "set which mouse device receives events",
+ },
+
STEXI
@item mouse_set @var{index}
Set which mouse device receives events at given @var{index}, index
@@ -418,9 +617,13 @@ info mice
ETEXI
#ifdef HAS_AUDIO
- { "wavcapture", "path:F,freq:i?,bits:i?,nchannels:i?", do_wav_capture,
- "path [frequency [bits [channels]]]",
- "capture audio to a wave file (default frequency=44100 bits=16 channels=2)" },
+ {
+ .name = "wavcapture",
+ .args_type = "path:F,freq:i?,bits:i?,nchannels:i?",
+ .handler = do_wav_capture,
+ .params = "path [frequency [bits [channels]]]",
+ .help = "capture audio to a wave file (default frequency=44100 bits=16 channels=2)",
+ },
#endif
STEXI
@item wavcapture @var{filename} [@var{frequency} [@var{bits} [@var{channels}]]]
@@ -436,8 +639,13 @@ Defaults:
ETEXI
#ifdef HAS_AUDIO
- { "stopcapture", "n:i", do_stop_capture,
- "capture index", "stop capture" },
+ {
+ .name = "stopcapture",
+ .args_type = "n:i",
+ .handler = do_stop_capture,
+ .params = "capture index",
+ .help = "stop capture",
+ },
#endif
STEXI
@item stopcapture @var{index}
@@ -447,22 +655,40 @@ info capture
@end example
ETEXI
- { "memsave", "val:l,size:i,filename:s", do_memory_save,
- "addr size file", "save to disk virtual memory dump starting at 'addr' of size 'size'", },
+ {
+ .name = "memsave",
+ .args_type = "val:l,size:i,filename:s",
+ .handler = do_memory_save,
+ .params = "addr size file",
+ .help = "save to disk virtual memory dump starting at 'addr' of size 'size'",
+ },
+
STEXI
@item memsave @var{addr} @var{size} @var{file}
save to disk virtual memory dump starting at @var{addr} of size @var{size}.
ETEXI
- { "pmemsave", "val:l,size:i,filename:s", do_physical_memory_save,
- "addr size file", "save to disk physical memory dump starting at 'addr' of size 'size'", },
+ {
+ .name = "pmemsave",
+ .args_type = "val:l,size:i,filename:s",
+ .handler = do_physical_memory_save,
+ .params = "addr size file",
+ .help = "save to disk physical memory dump starting at 'addr' of size 'size'",
+ },
+
STEXI
@item pmemsave @var{addr} @var{size} @var{file}
save to disk physical memory dump starting at @var{addr} of size @var{size}.
ETEXI
- { "boot_set", "bootdevice:s", do_boot_set,
- "bootdevice", "define new values for the boot device list" },
+ {
+ .name = "boot_set",
+ .args_type = "bootdevice:s",
+ .handler = do_boot_set,
+ .params = "bootdevice",
+ .help = "define new values for the boot device list",
+ },
+
STEXI
@item boot_set @var{bootdevicelist}
@@ -474,37 +700,65 @@ the same that can be specified in the @code{-boot} command line option.
ETEXI
#if defined(TARGET_I386)
- { "nmi", "cpu_index:i", do_inject_nmi,
- "cpu", "inject an NMI on the given CPU", },
+ {
+ .name = "nmi",
+ .args_type = "cpu_index:i",
+ .handler = do_inject_nmi,
+ .params = "cpu",
+ .help = "inject an NMI on the given CPU",
+ },
#endif
STEXI
@item nmi @var{cpu}
Inject an NMI on the given CPU (x86 only).
ETEXI
- { "migrate", "detach:-d,uri:s", do_migrate,
- "[-d] uri", "migrate to URI (using -d to not wait for completion)" },
+ {
+ .name = "migrate",
+ .args_type = "detach:-d,uri:s",
+ .handler = do_migrate,
+ .params = "[-d] uri",
+ .help = "migrate to URI (using -d to not wait for completion)",
+ },
+
STEXI
@item migrate [-d] @var{uri}
Migrate to @var{uri} (using -d to not wait for completion).
ETEXI
- { "migrate_cancel", "", do_migrate_cancel,
- "", "cancel the current VM migration" },
+ {
+ .name = "migrate_cancel",
+ .args_type = "",
+ .handler = do_migrate_cancel,
+ .params = "",
+ .help = "cancel the current VM migration",
+ },
+
STEXI
@item migrate_cancel
Cancel the current VM migration.
ETEXI
- { "migrate_set_speed", "value:s", do_migrate_set_speed,
- "value", "set maximum speed (in bytes) for migrations" },
+ {
+ .name = "migrate_set_speed",
+ .args_type = "value:s",
+ .handler = do_migrate_set_speed,
+ .params = "value",
+ .help = "set maximum speed (in bytes) for migrations",
+ },
+
STEXI
@item migrate_set_speed @var{value}
Set maximum speed to @var{value} (in bytes) for migrations.
ETEXI
- { "migrate_set_downtime", "value:s", do_migrate_set_downtime,
- "value", "set maximum tolerated downtime (in seconds) for migrations" },
+ {
+ .name = "migrate_set_downtime",
+ .args_type = "value:s",
+ .handler = do_migrate_set_downtime,
+ .params = "value",
+ .help = "set maximum tolerated downtime (in seconds) for migrations",
+ },
STEXI
@item migrate_set_downtime @var{second}
@@ -512,85 +766,150 @@ Set maximum tolerated downtime (in seconds) for migration.
ETEXI
#if defined(TARGET_I386)
- { "drive_add", "pci_addr:s,opts:s", drive_hot_add,
- "[[<domain>:]<bus>:]<slot>\n"
- "[file=file][,if=type][,bus=n]\n"
- "[,unit=m][,media=d][index=i]\n"
- "[,cyls=c,heads=h,secs=s[,trans=t]]\n"
- "[snapshot=on|off][,cache=on|off]",
- "add drive to PCI storage controller" },
+ {
+ .name = "drive_add",
+ .args_type = "pci_addr:s,opts:s",
+ .handler = drive_hot_add,
+ .params = "[[<domain>:]<bus>:]<slot>\n"
+ "[file=file][,if=type][,bus=n]\n"
+ "[,unit=m][,media=d][index=i]\n"
+ "[,cyls=c,heads=h,secs=s[,trans=t]]\n"
+ "[snapshot=on|off][,cache=on|off]",
+ .help = "add drive to PCI storage controller",
+ },
#endif
+
STEXI
@item drive_add
Add drive to PCI storage controller.
ETEXI
#if defined(TARGET_I386)
- { "pci_add", "pci_addr:s,type:s,opts:s?", pci_device_hot_add, "auto|[[<domain>:]<bus>:]<slot> nic|storage [[vlan=n][,macaddr=addr][,model=type]] [file=file][,if=type][,bus=nr]...", "hot-add PCI device" },
+ {
+ .name = "pci_add",
+ .args_type = "pci_addr:s,type:s,opts:s?",
+ .handler = pci_device_hot_add,
+ .params = "auto|[[<domain>:]<bus>:]<slot> nic|storage [[vlan=n][,macaddr=addr][,model=type]] [file=file][,if=type][,bus=nr]...",
+ .help = "hot-add PCI device",
+ },
#endif
+
STEXI
@item pci_add
Hot-add PCI device.
ETEXI
#if defined(TARGET_I386)
- { "pci_del", "pci_addr:s", do_pci_device_hot_remove, "[[<domain>:]<bus>:]<slot>", "hot remove PCI device" },
+ {
+ .name = "pci_del",
+ .args_type = "pci_addr:s",
+ .handler = do_pci_device_hot_remove,
+ .params = "[[<domain>:]<bus>:]<slot>",
+ .help = "hot remove PCI device",
+ },
#endif
+
STEXI
@item pci_del
Hot remove PCI device.
ETEXI
- { "host_net_add", "device:s,opts:s?", net_host_device_add,
- "tap|user|socket|vde|dump [options]", "add host VLAN client" },
+ {
+ .name = "host_net_add",
+ .args_type = "device:s,opts:s?",
+ .handler = net_host_device_add,
+ .params = "tap|user|socket|vde|dump [options]",
+ .help = "add host VLAN client",
+ },
+
STEXI
@item host_net_add
Add host VLAN client.
ETEXI
- { "host_net_remove", "vlan_id:i,device:s", net_host_device_remove,
- "vlan_id name", "remove host VLAN client" },
+ {
+ .name = "host_net_remove",
+ .args_type = "vlan_id:i,device:s",
+ .handler = net_host_device_remove,
+ .params = "vlan_id name",
+ .help = "remove host VLAN client",
+ },
+
STEXI
@item host_net_remove
Remove host VLAN client.
ETEXI
#ifdef CONFIG_SLIRP
- { "hostfwd_add", "arg1:s,arg2:s?,arg3:s?", net_slirp_hostfwd_add,
- "[vlan_id name] [tcp|udp]:[hostaddr]:hostport-[guestaddr]:guestport",
- "redirect TCP or UDP connections from host to guest (requires -net user)" },
- { "hostfwd_remove", "arg1:s,arg2:s?,arg3:s?", net_slirp_hostfwd_remove,
- "[vlan_id name] [tcp|udp]:[hostaddr]:hostport",
- "remove host-to-guest TCP or UDP redirection" },
+ {
+ .name = "hostfwd_add",
+ .args_type = "arg1:s,arg2:s?,arg3:s?",
+ .handler = net_slirp_hostfwd_add,
+ .params = "[vlan_id name] [tcp|udp]:[hostaddr]:hostport-[guestaddr]:guestport",
+ .help = "redirect TCP or UDP connections from host to guest (requires -net user)",
+ },
+
+ {
+ .name = "hostfwd_remove",
+ .args_type = "arg1:s,arg2:s?,arg3:s?",
+ .handler = net_slirp_hostfwd_remove,
+ .params = "[vlan_id name] [tcp|udp]:[hostaddr]:hostport",
+ .help = "remove host-to-guest TCP or UDP redirection",
+ },
+
#endif
STEXI
@item host_net_redir
Redirect TCP or UDP connections from host to guest (requires -net user).
ETEXI
- { "balloon", "value:i", do_balloon,
- "target", "request VM to change it's memory allocation (in MB)" },
+ {
+ .name = "balloon",
+ .args_type = "value:i",
+ .handler = do_balloon,
+ .params = "target",
+ .help = "request VM to change it's memory allocation (in MB)",
+ },
+
STEXI
@item balloon @var{value}
Request VM to change its memory allocation to @var{value} (in MB).
ETEXI
- { "set_link", "name:s,up_or_down:s", do_set_link,
- "name up|down", "change the link status of a network adapter" },
+ {
+ .name = "set_link",
+ .args_type = "name:s,up_or_down:s",
+ .handler = do_set_link,
+ .params = "name up|down",
+ .help = "change the link status of a network adapter",
+ },
+
STEXI
@item set_link @var{name} [up|down]
Set link @var{name} up or down.
ETEXI
- { "watchdog_action", "action:s", do_watchdog_action,
- "[reset|shutdown|poweroff|pause|debug|none]", "change watchdog action" },
+ {
+ .name = "watchdog_action",
+ .args_type = "action:s",
+ .handler = do_watchdog_action,
+ .params = "[reset|shutdown|poweroff|pause|debug|none]",
+ .help = "change watchdog action",
+ },
+
STEXI
@item watchdog_action
Change watchdog action.
ETEXI
- { "acl_show", "aclname:s", do_acl_show, "aclname",
- "list rules in the access control list" },
+ {
+ .name = "acl_show",
+ .args_type = "aclname:s",
+ .handler = do_acl_show,
+ .params = "aclname",
+ .help = "list rules in the access control list",
+ },
+
STEXI
@item acl_show @var{aclname}
List all the matching rules in the access control list, and the default
@@ -599,8 +918,14 @@ policy. There are currently two named access control lists,
certificate distinguished name, and SASL username respectively.
ETEXI
- { "acl_policy", "aclname:s,policy:s", do_acl_policy, "aclname allow|deny",
- "set default access control list policy" },
+ {
+ .name = "acl_policy",
+ .args_type = "aclname:s,policy:s",
+ .handler = do_acl_policy,
+ .params = "aclname allow|deny",
+ .help = "set default access control list policy",
+ },
+
STEXI
@item acl_policy @var{aclname} @code{allow|deny}
Set the default access control list policy, used in the event that
@@ -608,8 +933,14 @@ none of the explicit rules match. The default policy at startup is
always @code{deny}.
ETEXI
- { "acl_add", "aclname:s,match:s,policy:s,index:i?", do_acl_add, "aclname match allow|deny [index]",
- "add a match rule to the access control list" },
+ {
+ .name = "acl_add",
+ .args_type = "aclname:s,match:s,policy:s,index:i?",
+ .handler = do_acl_add,
+ .params = "aclname match allow|deny [index]",
+ .help = "add a match rule to the access control list",
+ },
+
STEXI
@item acl_allow @var{aclname} @var{match} @code{allow|deny} [@var{index}]
Add a match rule to the access control list, allowing or denying access.
@@ -620,15 +951,27 @@ normally be appended to the end of the ACL, but can be inserted
earlier in the list if the optional @var{index} parameter is supplied.
ETEXI
- { "acl_remove", "aclname:s,match:s", do_acl_remove, "aclname match",
- "remove a match rule from the access control list" },
+ {
+ .name = "acl_remove",
+ .args_type = "aclname:s,match:s",
+ .handler = do_acl_remove,
+ .params = "aclname match",
+ .help = "remove a match rule from the access control list",
+ },
+
STEXI
@item acl_remove @var{aclname} @var{match}
Remove the specified match rule from the access control list.
ETEXI
- { "acl_reset", "aclname:s", do_acl_reset, "aclname",
- "reset the access control list" },
+ {
+ .name = "acl_reset",
+ .args_type = "aclname:s",
+ .handler = do_acl_reset,
+ .params = "aclname",
+ .help = "reset the access control list",
+ },
+
STEXI
@item acl_remove @var{aclname} @var{match}
Remove all matches from the access control list, and set the default
@@ -636,15 +979,29 @@ policy back to @code{deny}.
ETEXI
#if defined(TARGET_I386)
- { "mce", "cpu_index:i,bank:i,status:l,mcg_status:l,addr:l,misc:l", do_inject_mce, "cpu bank status mcgstatus addr misc", "inject a MCE on the given CPU"},
+
+ {
+ .name = "mce",
+ .args_type = "cpu_index:i,bank:i,status:l,mcg_status:l,addr:l,misc:l",
+ .handler = do_inject_mce,
+ .params = "cpu bank status mcgstatus addr misc",
+ .help = "inject a MCE on the given CPU",
+ },
+
#endif
STEXI
@item mce @var{cpu} @var{bank} @var{status} @var{mcgstatus} @var{addr} @var{misc}
Inject an MCE on the given CPU (x86 only).
ETEXI
- { "getfd", "fdname:s", do_getfd, "getfd name",
- "receive a file descriptor via SCM rights and assign it a name" },
+ {
+ .name = "getfd",
+ .args_type = "fdname:s",
+ .handler = do_getfd,
+ .params = "getfd name",
+ .help = "receive a file descriptor via SCM rights and assign it a name",
+ },
+
STEXI
@item getfd @var{fdname}
If a file descriptor is passed alongside this command using the SCM_RIGHTS
@@ -652,8 +1009,14 @@ mechanism on unix sockets, it is stored using the name @var{fdname} for
later use by other monitor commands.
ETEXI
- { "closefd", "fdname:s", do_closefd, "closefd name",
- "close a file descriptor previously passed via SCM rights" },
+ {
+ .name = "closefd",
+ .args_type = "fdname:s",
+ .handler = do_closefd,
+ .params = "closefd name",
+ .help = "close a file descriptor previously passed via SCM rights",
+ },
+
STEXI
@item closefd @var{fdname}
Close the file descriptor previously assigned to @var{fdname} using the
--
1.6.5.rc2.17.gdbc1b
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [Qemu-devel] [PATCH 05/18] monitor: union for info handlers
2009-10-07 16:41 [Qemu-devel] [RESEND v3 00/18]: Initial QObject conversion Luiz Capitulino
` (3 preceding siblings ...)
2009-10-07 16:41 ` [Qemu-devel] [PATCH 04/18] monitor: Convert mon_cmd_t initializations to C99 style Luiz Capitulino
@ 2009-10-07 16:41 ` Luiz Capitulino
2009-10-07 16:41 ` [Qemu-devel] [PATCH 06/18] monitor: union for command handlers Luiz Capitulino
` (12 subsequent siblings)
17 siblings, 0 replies; 20+ messages in thread
From: Luiz Capitulino @ 2009-10-07 16:41 UTC (permalink / raw)
To: qemu-devel; +Cc: aliguori, avi
This commit adds a union to mon_cmd_t for info handlers and
converts do_info() and info_cmds[] array to use it.
This improves type safety.
Next commit will convert command handlers.
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
monitor.c | 77 +++++++++++++++++++++++++++++++------------------------------
1 files changed, 39 insertions(+), 38 deletions(-)
diff --git a/monitor.c b/monitor.c
index ae0354a..c0569d5 100644
--- a/monitor.c
+++ b/monitor.c
@@ -74,6 +74,9 @@ typedef struct mon_cmd_t {
void *handler;
const char *params;
const char *help;
+ union {
+ void (*info)(Monitor *mon);
+ } mhandler;
} mon_cmd_t;
/* file descriptors passed via SCM_RIGHTS */
@@ -283,7 +286,6 @@ static void do_info(Monitor *mon, const QDict *qdict)
{
const mon_cmd_t *cmd;
const char *item = qdict_get_try_str(qdict, "item");
- void (*handler)(Monitor *);
if (!item)
goto help;
@@ -295,8 +297,7 @@ static void do_info(Monitor *mon, const QDict *qdict)
help_cmd(mon, "info");
return;
found:
- handler = cmd->handler;
- handler(mon);
+ cmd->mhandler.info(mon);
}
static void do_info_version(Monitor *mon)
@@ -1816,255 +1817,255 @@ static const mon_cmd_t info_cmds[] = {
{
.name = "version",
.args_type = "",
- .handler = do_info_version,
.params = "",
.help = "show the version of QEMU",
+ .mhandler.info = do_info_version,
},
{
.name = "network",
.args_type = "",
- .handler = do_info_network,
.params = "",
.help = "show the network state",
+ .mhandler.info = do_info_network,
},
{
.name = "chardev",
.args_type = "",
- .handler = qemu_chr_info,
.params = "",
.help = "show the character devices",
+ .mhandler.info = qemu_chr_info,
},
{
.name = "block",
.args_type = "",
- .handler = bdrv_info,
.params = "",
.help = "show the block devices",
+ .mhandler.info = bdrv_info,
},
{
.name = "blockstats",
.args_type = "",
- .handler = bdrv_info_stats,
.params = "",
.help = "show block device statistics",
+ .mhandler.info = bdrv_info_stats,
},
{
.name = "registers",
.args_type = "",
- .handler = do_info_registers,
.params = "",
.help = "show the cpu registers",
+ .mhandler.info = do_info_registers,
},
{
.name = "cpus",
.args_type = "",
- .handler = do_info_cpus,
.params = "",
.help = "show infos for each CPU",
+ .mhandler.info = do_info_cpus,
},
{
.name = "history",
.args_type = "",
- .handler = do_info_history,
.params = "",
.help = "show the command line history",
+ .mhandler.info = do_info_history,
},
{
.name = "irq",
.args_type = "",
- .handler = irq_info,
.params = "",
.help = "show the interrupts statistics (if available)",
+ .mhandler.info = irq_info,
},
{
.name = "pic",
.args_type = "",
- .handler = pic_info,
.params = "",
.help = "show i8259 (PIC) state",
+ .mhandler.info = pic_info,
},
{
.name = "pci",
.args_type = "",
- .handler = pci_info,
.params = "",
.help = "show PCI info",
+ .mhandler.info = pci_info,
},
#if defined(TARGET_I386) || defined(TARGET_SH4)
{
.name = "tlb",
.args_type = "",
- .handler = tlb_info,
.params = "",
.help = "show virtual to physical memory mappings",
+ .mhandler.info = tlb_info,
},
#endif
#if defined(TARGET_I386)
{
.name = "mem",
.args_type = "",
- .handler = mem_info,
.params = "",
.help = "show the active virtual memory mappings",
+ .mhandler.info = mem_info,
},
{
.name = "hpet",
.args_type = "",
- .handler = do_info_hpet,
.params = "",
.help = "show state of HPET",
+ .mhandler.info = do_info_hpet,
},
#endif
{
.name = "jit",
.args_type = "",
- .handler = do_info_jit,
.params = "",
.help = "show dynamic compiler info",
+ .mhandler.info = do_info_jit,
},
{
.name = "kvm",
.args_type = "",
- .handler = do_info_kvm,
.params = "",
.help = "show KVM information",
+ .mhandler.info = do_info_kvm,
},
{
.name = "numa",
.args_type = "",
- .handler = do_info_numa,
.params = "",
.help = "show NUMA information",
+ .mhandler.info = do_info_numa,
},
{
.name = "usb",
.args_type = "",
- .handler = usb_info,
.params = "",
.help = "show guest USB devices",
+ .mhandler.info = usb_info,
},
{
.name = "usbhost",
.args_type = "",
- .handler = usb_host_info,
.params = "",
.help = "show host USB devices",
+ .mhandler.info = usb_host_info,
},
{
.name = "profile",
.args_type = "",
- .handler = do_info_profile,
.params = "",
.help = "show profiling information",
+ .mhandler.info = do_info_profile,
},
{
.name = "capture",
.args_type = "",
- .handler = do_info_capture,
.params = "",
.help = "show capture information",
+ .mhandler.info = do_info_capture,
},
{
.name = "snapshots",
.args_type = "",
- .handler = do_info_snapshots,
.params = "",
.help = "show the currently saved VM snapshots",
+ .mhandler.info = do_info_snapshots,
},
{
.name = "status",
.args_type = "",
- .handler = do_info_status,
.params = "",
.help = "show the current VM status (running|paused)",
+ .mhandler.info = do_info_status,
},
{
.name = "pcmcia",
.args_type = "",
- .handler = pcmcia_info,
.params = "",
.help = "show guest PCMCIA status",
+ .mhandler.info = pcmcia_info,
},
{
.name = "mice",
.args_type = "",
- .handler = do_info_mice,
.params = "",
.help = "show which guest mouse is receiving events",
+ .mhandler.info = do_info_mice,
},
{
.name = "vnc",
.args_type = "",
- .handler = do_info_vnc,
.params = "",
.help = "show the vnc server status",
+ .mhandler.info = do_info_vnc,
},
{
.name = "name",
.args_type = "",
- .handler = do_info_name,
.params = "",
.help = "show the current VM name",
+ .mhandler.info = do_info_name,
},
{
.name = "uuid",
.args_type = "",
- .handler = do_info_uuid,
.params = "",
.help = "show the current VM UUID",
+ .mhandler.info = do_info_uuid,
},
#if defined(TARGET_PPC)
{
.name = "cpustats",
.args_type = "",
- .handler = do_info_cpu_stats,
.params = "",
.help = "show CPU statistics",
+ .mhandler.info = do_info_cpu_stats,
},
#endif
#if defined(CONFIG_SLIRP)
{
.name = "usernet",
.args_type = "",
- .handler = do_info_usernet,
.params = "",
.help = "show user network stack connection states",
+ .mhandler.info = do_info_usernet,
},
#endif
{
.name = "migrate",
.args_type = "",
- .handler = do_info_migrate,
.params = "",
.help = "show migration status",
+ .mhandler.info = do_info_migrate,
},
{
.name = "balloon",
.args_type = "",
- .handler = do_info_balloon,
.params = "",
.help = "show balloon information",
+ .mhandler.info = do_info_balloon,
},
{
.name = "qtree",
.args_type = "",
- .handler = do_info_qtree,
.params = "",
.help = "show device tree",
+ .mhandler.info = do_info_qtree,
},
{
.name = "qdm",
.args_type = "",
- .handler = do_info_qdm,
.params = "",
.help = "show qdev device model list",
+ .mhandler.info = do_info_qdm,
},
{
.name = "roms",
.args_type = "",
- .handler = do_info_roms,
.params = "",
.help = "show roms",
+ .mhandler.info = do_info_roms,
},
{
.name = NULL,
--
1.6.5.rc2.17.gdbc1b
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [Qemu-devel] [PATCH 06/18] monitor: union for command handlers
2009-10-07 16:41 [Qemu-devel] [RESEND v3 00/18]: Initial QObject conversion Luiz Capitulino
` (4 preceding siblings ...)
2009-10-07 16:41 ` [Qemu-devel] [PATCH 05/18] monitor: union for info handlers Luiz Capitulino
@ 2009-10-07 16:41 ` Luiz Capitulino
2009-10-07 16:41 ` [Qemu-devel] [PATCH 07/18] monitor: Add user_print() to mon_cmd_t Luiz Capitulino
` (11 subsequent siblings)
17 siblings, 0 replies; 20+ messages in thread
From: Luiz Capitulino @ 2009-10-07 16:41 UTC (permalink / raw)
To: qemu-devel; +Cc: aliguori, avi
This commits adds a new union member to mon_cmd_t for command
handlers and convert monitor_handle_command() and qemu-monitor.hx
to use it.
This improves type safety.
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
monitor.c | 9 +---
qemu-monitor.hx | 122 +++++++++++++++++++++++++++---------------------------
2 files changed, 63 insertions(+), 68 deletions(-)
diff --git a/monitor.c b/monitor.c
index c0569d5..2bf82f3 100644
--- a/monitor.c
+++ b/monitor.c
@@ -71,11 +71,11 @@
typedef struct mon_cmd_t {
const char *name;
const char *args_type;
- void *handler;
const char *params;
const char *help;
union {
void (*info)(Monitor *mon);
+ void (*cmd)(Monitor *mon, const QDict *qdict);
} mhandler;
} mon_cmd_t;
@@ -3014,13 +3014,8 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline)
cmd = monitor_parse_command(mon, cmdline, qdict);
if (cmd) {
- void (*handler)(Monitor *mon, const QDict *qdict);
-
qemu_errors_to_mon(mon);
-
- handler = cmd->handler;
- handler(mon, qdict);
-
+ cmd->mhandler.cmd(mon, qdict);
qemu_errors_to_previous();
}
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index cdaf5b7..c689a07 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -12,9 +12,9 @@ ETEXI
{
.name = "help|?",
.args_type = "name:s?",
- .handler = do_help_cmd,
.params = "[cmd]",
.help = "show the help",
+ .mhandler.cmd = do_help_cmd,
},
STEXI
@@ -25,9 +25,9 @@ ETEXI
{
.name = "commit",
.args_type = "device:B",
- .handler = do_commit,
.params = "device|all",
.help = "commit changes to the disk images (if -snapshot is used) or backing files",
+ .mhandler.cmd = do_commit,
},
STEXI
@@ -38,9 +38,9 @@ ETEXI
{
.name = "info",
.args_type = "item:s?",
- .handler = do_info,
.params = "[subcommand]",
.help = "show various information about the system state",
+ .mhandler.cmd = do_info,
},
STEXI
@@ -116,9 +116,9 @@ ETEXI
{
.name = "q|quit",
.args_type = "",
- .handler = do_quit,
.params = "",
.help = "quit the emulator",
+ .mhandler.cmd = do_quit,
},
STEXI
@@ -129,9 +129,9 @@ ETEXI
{
.name = "eject",
.args_type = "force:-f,filename:B",
- .handler = do_eject,
.params = "[-f] device",
.help = "eject a removable medium (use -f to force it)",
+ .mhandler.cmd = do_eject,
},
STEXI
@@ -142,9 +142,9 @@ ETEXI
{
.name = "change",
.args_type = "device:B,target:F,arg:s?",
- .handler = do_change,
.params = "device filename [format]",
.help = "change a removable medium, optional format",
+ .mhandler.cmd = do_change,
},
STEXI
@@ -187,9 +187,9 @@ ETEXI
{
.name = "screendump",
.args_type = "filename:F",
- .handler = do_screen_dump,
.params = "filename",
.help = "save screen into PPM image 'filename'",
+ .mhandler.cmd = do_screen_dump,
},
STEXI
@@ -200,9 +200,9 @@ ETEXI
{
.name = "logfile",
.args_type = "filename:F",
- .handler = do_logfile,
.params = "filename",
.help = "output logs to 'filename'",
+ .mhandler.cmd = do_logfile,
},
STEXI
@@ -213,9 +213,9 @@ ETEXI
{
.name = "log",
.args_type = "items:s",
- .handler = do_log,
.params = "item1[,...]",
.help = "activate logging of the specified items to '/tmp/qemu.log'",
+ .mhandler.cmd = do_log,
},
STEXI
@@ -226,9 +226,9 @@ ETEXI
{
.name = "savevm",
.args_type = "name:s?",
- .handler = do_savevm,
.params = "[tag|id]",
.help = "save a VM snapshot. If no tag or id are provided, a new snapshot is created",
+ .mhandler.cmd = do_savevm,
},
STEXI
@@ -242,9 +242,9 @@ ETEXI
{
.name = "loadvm",
.args_type = "name:s",
- .handler = do_loadvm,
.params = "tag|id",
.help = "restore a VM snapshot from its tag or id",
+ .mhandler.cmd = do_loadvm,
},
STEXI
@@ -256,9 +256,9 @@ ETEXI
{
.name = "delvm",
.args_type = "name:s",
- .handler = do_delvm,
.params = "tag|id",
.help = "delete a VM snapshot from its tag or id",
+ .mhandler.cmd = do_delvm,
},
STEXI
@@ -269,9 +269,9 @@ ETEXI
{
.name = "singlestep",
.args_type = "option:s?",
- .handler = do_singlestep,
.params = "[on|off]",
.help = "run emulation in singlestep mode or switch to normal mode",
+ .mhandler.cmd = do_singlestep,
},
STEXI
@@ -283,9 +283,9 @@ ETEXI
{
.name = "stop",
.args_type = "",
- .handler = do_stop,
.params = "",
.help = "stop emulation",
+ .mhandler.cmd = do_stop,
},
STEXI
@@ -296,9 +296,9 @@ ETEXI
{
.name = "c|cont",
.args_type = "",
- .handler = do_cont,
.params = "",
.help = "resume emulation",
+ .mhandler.cmd = do_cont,
},
STEXI
@@ -309,9 +309,9 @@ ETEXI
{
.name = "gdbserver",
.args_type = "device:s?",
- .handler = do_gdbserver,
.params = "[device]",
.help = "start gdbserver on given device (default 'tcp::1234'), stop with 'none'",
+ .mhandler.cmd = do_gdbserver,
},
STEXI
@@ -322,9 +322,9 @@ ETEXI
{
.name = "x",
.args_type = "fmt:/,addr:l",
- .handler = do_memory_dump,
.params = "/fmt addr",
.help = "virtual memory dump starting at 'addr'",
+ .mhandler.cmd = do_memory_dump,
},
STEXI
@@ -335,9 +335,9 @@ ETEXI
{
.name = "xp",
.args_type = "fmt:/,addr:l",
- .handler = do_physical_memory_dump,
.params = "/fmt addr",
.help = "physical memory dump starting at 'addr'",
+ .mhandler.cmd = do_physical_memory_dump,
},
STEXI
@@ -401,9 +401,9 @@ ETEXI
{
.name = "p|print",
.args_type = "fmt:/,val:l",
- .handler = do_print,
.params = "/fmt expr",
.help = "print expression value (use $reg for CPU register access)",
+ .mhandler.cmd = do_print,
},
STEXI
@@ -416,9 +416,9 @@ ETEXI
{
.name = "i",
.args_type = "fmt:/,addr:i,index:i.",
- .handler = do_ioport_read,
.params = "/fmt addr",
.help = "I/O port read",
+ .mhandler.cmd = do_ioport_read,
},
STEXI
@@ -428,9 +428,9 @@ ETEXI
{
.name = "o",
.args_type = "fmt:/,addr:i,val:i",
- .handler = do_ioport_write,
.params = "/fmt addr value",
.help = "I/O port write",
+ .mhandler.cmd = do_ioport_write,
},
STEXI
@@ -440,9 +440,9 @@ ETEXI
{
.name = "sendkey",
.args_type = "string:s,hold_time:i?",
- .handler = do_sendkey,
.params = "keys [hold_ms]",
.help = "send keys to the VM (e.g. 'sendkey ctrl-alt-f1', default hold time=100 ms)",
+ .mhandler.cmd = do_sendkey,
},
STEXI
@@ -462,9 +462,9 @@ ETEXI
{
.name = "system_reset",
.args_type = "",
- .handler = do_system_reset,
.params = "",
.help = "reset the system",
+ .mhandler.cmd = do_system_reset,
},
STEXI
@@ -476,9 +476,9 @@ ETEXI
{
.name = "system_powerdown",
.args_type = "",
- .handler = do_system_powerdown,
.params = "",
.help = "send system power down event",
+ .mhandler.cmd = do_system_powerdown,
},
STEXI
@@ -490,9 +490,9 @@ ETEXI
{
.name = "sum",
.args_type = "start:i,size:i",
- .handler = do_sum,
.params = "addr size",
.help = "compute the checksum of a memory region",
+ .mhandler.cmd = do_sum,
},
STEXI
@@ -504,9 +504,9 @@ ETEXI
{
.name = "usb_add",
.args_type = "devname:s",
- .handler = do_usb_add,
.params = "device",
.help = "add USB device (e.g. 'host:bus.addr' or 'host:vendor_id:product_id')",
+ .mhandler.cmd = do_usb_add,
},
STEXI
@@ -519,9 +519,9 @@ ETEXI
{
.name = "usb_del",
.args_type = "devname:s",
- .handler = do_usb_del,
.params = "device",
.help = "remove USB device 'bus.addr'",
+ .mhandler.cmd = do_usb_del,
},
STEXI
@@ -535,9 +535,9 @@ ETEXI
{
.name = "device_add",
.args_type = "config:s",
- .handler = do_device_add,
.params = "device",
.help = "add device, like -device on the command line",
+ .mhandler.cmd = do_device_add,
},
STEXI
@@ -549,9 +549,9 @@ ETEXI
{
.name = "device_del",
.args_type = "id:s",
- .handler = do_device_del,
.params = "device",
.help = "remove device",
+ .mhandler.cmd = do_device_del,
},
STEXI
@@ -563,9 +563,9 @@ ETEXI
{
.name = "cpu",
.args_type = "index:i",
- .handler = do_cpu_set,
.params = "index",
.help = "set the default CPU",
+ .mhandler.cmd = do_cpu_set,
},
STEXI
@@ -575,9 +575,9 @@ ETEXI
{
.name = "mouse_move",
.args_type = "dx_str:s,dy_str:s,dz_str:s?",
- .handler = do_mouse_move,
.params = "dx dy [dz]",
.help = "send mouse move events",
+ .mhandler.cmd = do_mouse_move,
},
STEXI
@@ -589,9 +589,9 @@ ETEXI
{
.name = "mouse_button",
.args_type = "button_state:i",
- .handler = do_mouse_button,
.params = "state",
.help = "change mouse button state (1=L, 2=M, 4=R)",
+ .mhandler.cmd = do_mouse_button,
},
STEXI
@@ -602,9 +602,9 @@ ETEXI
{
.name = "mouse_set",
.args_type = "index:i",
- .handler = do_mouse_set,
.params = "index",
.help = "set which mouse device receives events",
+ .mhandler.cmd = do_mouse_set,
},
STEXI
@@ -620,9 +620,9 @@ ETEXI
{
.name = "wavcapture",
.args_type = "path:F,freq:i?,bits:i?,nchannels:i?",
- .handler = do_wav_capture,
.params = "path [frequency [bits [channels]]]",
.help = "capture audio to a wave file (default frequency=44100 bits=16 channels=2)",
+ .mhandler.cmd = do_wav_capture,
},
#endif
STEXI
@@ -642,9 +642,9 @@ ETEXI
{
.name = "stopcapture",
.args_type = "n:i",
- .handler = do_stop_capture,
.params = "capture index",
.help = "stop capture",
+ .mhandler.cmd = do_stop_capture,
},
#endif
STEXI
@@ -658,9 +658,9 @@ ETEXI
{
.name = "memsave",
.args_type = "val:l,size:i,filename:s",
- .handler = do_memory_save,
.params = "addr size file",
.help = "save to disk virtual memory dump starting at 'addr' of size 'size'",
+ .mhandler.cmd = do_memory_save,
},
STEXI
@@ -671,9 +671,9 @@ ETEXI
{
.name = "pmemsave",
.args_type = "val:l,size:i,filename:s",
- .handler = do_physical_memory_save,
.params = "addr size file",
.help = "save to disk physical memory dump starting at 'addr' of size 'size'",
+ .mhandler.cmd = do_physical_memory_save,
},
STEXI
@@ -684,9 +684,9 @@ ETEXI
{
.name = "boot_set",
.args_type = "bootdevice:s",
- .handler = do_boot_set,
.params = "bootdevice",
.help = "define new values for the boot device list",
+ .mhandler.cmd = do_boot_set,
},
STEXI
@@ -703,9 +703,9 @@ ETEXI
{
.name = "nmi",
.args_type = "cpu_index:i",
- .handler = do_inject_nmi,
.params = "cpu",
.help = "inject an NMI on the given CPU",
+ .mhandler.cmd = do_inject_nmi,
},
#endif
STEXI
@@ -716,9 +716,9 @@ ETEXI
{
.name = "migrate",
.args_type = "detach:-d,uri:s",
- .handler = do_migrate,
.params = "[-d] uri",
.help = "migrate to URI (using -d to not wait for completion)",
+ .mhandler.cmd = do_migrate,
},
STEXI
@@ -729,9 +729,9 @@ ETEXI
{
.name = "migrate_cancel",
.args_type = "",
- .handler = do_migrate_cancel,
.params = "",
.help = "cancel the current VM migration",
+ .mhandler.cmd = do_migrate_cancel,
},
STEXI
@@ -742,9 +742,9 @@ ETEXI
{
.name = "migrate_set_speed",
.args_type = "value:s",
- .handler = do_migrate_set_speed,
.params = "value",
.help = "set maximum speed (in bytes) for migrations",
+ .mhandler.cmd = do_migrate_set_speed,
},
STEXI
@@ -755,9 +755,9 @@ ETEXI
{
.name = "migrate_set_downtime",
.args_type = "value:s",
- .handler = do_migrate_set_downtime,
.params = "value",
.help = "set maximum tolerated downtime (in seconds) for migrations",
+ .mhandler.cmd = do_migrate_set_downtime,
},
STEXI
@@ -769,13 +769,13 @@ ETEXI
{
.name = "drive_add",
.args_type = "pci_addr:s,opts:s",
- .handler = drive_hot_add,
.params = "[[<domain>:]<bus>:]<slot>\n"
"[file=file][,if=type][,bus=n]\n"
"[,unit=m][,media=d][index=i]\n"
"[,cyls=c,heads=h,secs=s[,trans=t]]\n"
"[snapshot=on|off][,cache=on|off]",
.help = "add drive to PCI storage controller",
+ .mhandler.cmd = drive_hot_add,
},
#endif
@@ -788,9 +788,9 @@ ETEXI
{
.name = "pci_add",
.args_type = "pci_addr:s,type:s,opts:s?",
- .handler = pci_device_hot_add,
.params = "auto|[[<domain>:]<bus>:]<slot> nic|storage [[vlan=n][,macaddr=addr][,model=type]] [file=file][,if=type][,bus=nr]...",
.help = "hot-add PCI device",
+ .mhandler.cmd = pci_device_hot_add,
},
#endif
@@ -803,9 +803,9 @@ ETEXI
{
.name = "pci_del",
.args_type = "pci_addr:s",
- .handler = do_pci_device_hot_remove,
.params = "[[<domain>:]<bus>:]<slot>",
.help = "hot remove PCI device",
+ .mhandler.cmd = do_pci_device_hot_remove,
},
#endif
@@ -817,9 +817,9 @@ ETEXI
{
.name = "host_net_add",
.args_type = "device:s,opts:s?",
- .handler = net_host_device_add,
.params = "tap|user|socket|vde|dump [options]",
.help = "add host VLAN client",
+ .mhandler.cmd = net_host_device_add,
},
STEXI
@@ -830,9 +830,9 @@ ETEXI
{
.name = "host_net_remove",
.args_type = "vlan_id:i,device:s",
- .handler = net_host_device_remove,
.params = "vlan_id name",
.help = "remove host VLAN client",
+ .mhandler.cmd = net_host_device_remove,
},
STEXI
@@ -844,17 +844,17 @@ ETEXI
{
.name = "hostfwd_add",
.args_type = "arg1:s,arg2:s?,arg3:s?",
- .handler = net_slirp_hostfwd_add,
.params = "[vlan_id name] [tcp|udp]:[hostaddr]:hostport-[guestaddr]:guestport",
.help = "redirect TCP or UDP connections from host to guest (requires -net user)",
+ .mhandler.cmd = net_slirp_hostfwd_add,
},
{
.name = "hostfwd_remove",
.args_type = "arg1:s,arg2:s?,arg3:s?",
- .handler = net_slirp_hostfwd_remove,
.params = "[vlan_id name] [tcp|udp]:[hostaddr]:hostport",
.help = "remove host-to-guest TCP or UDP redirection",
+ .mhandler.cmd = net_slirp_hostfwd_remove,
},
#endif
@@ -866,9 +866,9 @@ ETEXI
{
.name = "balloon",
.args_type = "value:i",
- .handler = do_balloon,
.params = "target",
.help = "request VM to change it's memory allocation (in MB)",
+ .mhandler.cmd = do_balloon,
},
STEXI
@@ -879,9 +879,9 @@ ETEXI
{
.name = "set_link",
.args_type = "name:s,up_or_down:s",
- .handler = do_set_link,
.params = "name up|down",
.help = "change the link status of a network adapter",
+ .mhandler.cmd = do_set_link,
},
STEXI
@@ -892,9 +892,9 @@ ETEXI
{
.name = "watchdog_action",
.args_type = "action:s",
- .handler = do_watchdog_action,
.params = "[reset|shutdown|poweroff|pause|debug|none]",
.help = "change watchdog action",
+ .mhandler.cmd = do_watchdog_action,
},
STEXI
@@ -905,9 +905,9 @@ ETEXI
{
.name = "acl_show",
.args_type = "aclname:s",
- .handler = do_acl_show,
.params = "aclname",
.help = "list rules in the access control list",
+ .mhandler.cmd = do_acl_show,
},
STEXI
@@ -921,9 +921,9 @@ ETEXI
{
.name = "acl_policy",
.args_type = "aclname:s,policy:s",
- .handler = do_acl_policy,
.params = "aclname allow|deny",
.help = "set default access control list policy",
+ .mhandler.cmd = do_acl_policy,
},
STEXI
@@ -936,9 +936,9 @@ ETEXI
{
.name = "acl_add",
.args_type = "aclname:s,match:s,policy:s,index:i?",
- .handler = do_acl_add,
.params = "aclname match allow|deny [index]",
.help = "add a match rule to the access control list",
+ .mhandler.cmd = do_acl_add,
},
STEXI
@@ -954,9 +954,9 @@ ETEXI
{
.name = "acl_remove",
.args_type = "aclname:s,match:s",
- .handler = do_acl_remove,
.params = "aclname match",
.help = "remove a match rule from the access control list",
+ .mhandler.cmd = do_acl_remove,
},
STEXI
@@ -967,9 +967,9 @@ ETEXI
{
.name = "acl_reset",
.args_type = "aclname:s",
- .handler = do_acl_reset,
.params = "aclname",
.help = "reset the access control list",
+ .mhandler.cmd = do_acl_reset,
},
STEXI
@@ -983,9 +983,9 @@ ETEXI
{
.name = "mce",
.args_type = "cpu_index:i,bank:i,status:l,mcg_status:l,addr:l,misc:l",
- .handler = do_inject_mce,
.params = "cpu bank status mcgstatus addr misc",
.help = "inject a MCE on the given CPU",
+ .mhandler.cmd = do_inject_mce,
},
#endif
@@ -997,9 +997,9 @@ ETEXI
{
.name = "getfd",
.args_type = "fdname:s",
- .handler = do_getfd,
.params = "getfd name",
.help = "receive a file descriptor via SCM rights and assign it a name",
+ .mhandler.cmd = do_getfd,
},
STEXI
@@ -1012,9 +1012,9 @@ ETEXI
{
.name = "closefd",
.args_type = "fdname:s",
- .handler = do_closefd,
.params = "closefd name",
.help = "close a file descriptor previously passed via SCM rights",
+ .mhandler.cmd = do_closefd,
},
STEXI
--
1.6.5.rc2.17.gdbc1b
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [Qemu-devel] [PATCH 07/18] monitor: Add user_print() to mon_cmd_t
2009-10-07 16:41 [Qemu-devel] [RESEND v3 00/18]: Initial QObject conversion Luiz Capitulino
` (5 preceding siblings ...)
2009-10-07 16:41 ` [Qemu-devel] [PATCH 06/18] monitor: union for command handlers Luiz Capitulino
@ 2009-10-07 16:41 ` Luiz Capitulino
2009-10-07 16:41 ` [Qemu-devel] [PATCH 08/18] monitor: Handle new and old style handlers Luiz Capitulino
` (10 subsequent siblings)
17 siblings, 0 replies; 20+ messages in thread
From: Luiz Capitulino @ 2009-10-07 16:41 UTC (permalink / raw)
To: qemu-devel; +Cc: aliguori, avi
This new struct member will store a pointer to a function that
should be used to output data in the user protocol format.
It will also serve as a flag to say if a given handler has already
been converted to the new QObject style.
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
monitor.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/monitor.c b/monitor.c
index 2bf82f3..b589d98 100644
--- a/monitor.c
+++ b/monitor.c
@@ -73,6 +73,7 @@ typedef struct mon_cmd_t {
const char *args_type;
const char *params;
const char *help;
+ void (*user_print)(Monitor *mon, const QObject *data);
union {
void (*info)(Monitor *mon);
void (*cmd)(Monitor *mon, const QDict *qdict);
--
1.6.5.rc2.17.gdbc1b
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [Qemu-devel] [PATCH 08/18] monitor: Handle new and old style handlers
2009-10-07 16:41 [Qemu-devel] [RESEND v3 00/18]: Initial QObject conversion Luiz Capitulino
` (6 preceding siblings ...)
2009-10-07 16:41 ` [Qemu-devel] [PATCH 07/18] monitor: Add user_print() to mon_cmd_t Luiz Capitulino
@ 2009-10-07 16:41 ` Luiz Capitulino
2009-10-07 16:41 ` [Qemu-devel] [PATCH 09/18] monitor: do_info(): handle new and old info handlers Luiz Capitulino
` (9 subsequent siblings)
17 siblings, 0 replies; 20+ messages in thread
From: Luiz Capitulino @ 2009-10-07 16:41 UTC (permalink / raw)
To: qemu-devel; +Cc: aliguori, avi
This commit changes monitor_handle_command() to support old style
_and_ new style handlers.
New style handlers are protocol independent, they return their
data to the Monitor, which in turn decides how to print them
(ie. user protocol vs. machine protocol).
Converted handlers will use the 'user_print' member of 'mon_cmd_t'
to define its user protocol function, which will be called to print
data in the user protocol format.
Handlers which don't have 'user_print' defined are not converted
and are handled as usual.
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
monitor.c | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/monitor.c b/monitor.c
index b589d98..d545124 100644
--- a/monitor.c
+++ b/monitor.c
@@ -77,6 +77,7 @@ typedef struct mon_cmd_t {
union {
void (*info)(Monitor *mon);
void (*cmd)(Monitor *mon, const QDict *qdict);
+ void (*cmd_new)(Monitor *mon, const QDict *params, QObject **ret_data);
} mhandler;
} mon_cmd_t;
@@ -214,6 +215,11 @@ static int monitor_fprintf(FILE *stream, const char *fmt, ...)
return 0;
}
+static inline int monitor_handler_ported(const mon_cmd_t *cmd)
+{
+ return cmd->user_print != NULL;
+}
+
static int compare_cmd(const char *name, const char *list)
{
const char *p, *pstart;
@@ -3014,12 +3020,26 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline)
qdict = qdict_new();
cmd = monitor_parse_command(mon, cmdline, qdict);
- if (cmd) {
- qemu_errors_to_mon(mon);
+ if (!cmd)
+ goto out;
+
+ qemu_errors_to_mon(mon);
+
+ if (monitor_handler_ported(cmd)) {
+ QObject *data = NULL;
+
+ cmd->mhandler.cmd_new(mon, qdict, &data);
+ if (data)
+ cmd->user_print(mon, data);
+
+ qobject_decref(data);
+ } else {
cmd->mhandler.cmd(mon, qdict);
- qemu_errors_to_previous();
}
+ qemu_errors_to_previous();
+
+out:
QDECREF(qdict);
}
--
1.6.5.rc2.17.gdbc1b
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [Qemu-devel] [PATCH 09/18] monitor: do_info(): handle new and old info handlers
2009-10-07 16:41 [Qemu-devel] [RESEND v3 00/18]: Initial QObject conversion Luiz Capitulino
` (7 preceding siblings ...)
2009-10-07 16:41 ` [Qemu-devel] [PATCH 08/18] monitor: Handle new and old style handlers Luiz Capitulino
@ 2009-10-07 16:41 ` Luiz Capitulino
2009-10-07 16:41 ` [Qemu-devel] [PATCH 10/18] monitor: Convert do_quit() do QObject Luiz Capitulino
` (8 subsequent siblings)
17 siblings, 0 replies; 20+ messages in thread
From: Luiz Capitulino @ 2009-10-07 16:41 UTC (permalink / raw)
To: qemu-devel; +Cc: aliguori, avi
do_info() is special, its job is to call 'info handlers'.
This is similar to what monitor_handle_command() does,
therefore do_info() also has to distinguish among new and
old style info handlers.
This commit converts do_info() to the new QObject style and
makes the appropriate changes so that it can handle both
info handlers styles.
In the future, when all handlers are converted to QObject's
style, it will be possible to share more code with
monitor_handle_command().
This commit also introduces a new function called
monitor_user_noop(), it should be used by handlers which do
not have data to print.
This is the case of do_info().
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
monitor.c | 29 ++++++++++++++++++++++-------
qemu-monitor.hx | 3 ++-
2 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/monitor.c b/monitor.c
index d545124..cc1b501 100644
--- a/monitor.c
+++ b/monitor.c
@@ -76,6 +76,7 @@ typedef struct mon_cmd_t {
void (*user_print)(Monitor *mon, const QObject *data);
union {
void (*info)(Monitor *mon);
+ void (*info_new)(Monitor *mon, QObject **ret_data);
void (*cmd)(Monitor *mon, const QDict *qdict);
void (*cmd_new)(Monitor *mon, const QDict *params, QObject **ret_data);
} mhandler;
@@ -215,6 +216,8 @@ static int monitor_fprintf(FILE *stream, const char *fmt, ...)
return 0;
}
+static void monitor_user_noop(Monitor *mon, const QObject *data) { }
+
static inline int monitor_handler_ported(const mon_cmd_t *cmd)
{
return cmd->user_print != NULL;
@@ -289,22 +292,34 @@ static void do_commit(Monitor *mon, const QDict *qdict)
}
}
-static void do_info(Monitor *mon, const QDict *qdict)
+static void do_info(Monitor *mon, const QDict *qdict, QObject **ret_data)
{
const mon_cmd_t *cmd;
const char *item = qdict_get_try_str(qdict, "item");
if (!item)
goto help;
- for(cmd = info_cmds; cmd->name != NULL; cmd++) {
+
+ for (cmd = info_cmds; cmd->name != NULL; cmd++) {
if (compare_cmd(item, cmd->name))
- goto found;
+ break;
}
- help:
- help_cmd(mon, "info");
+
+ if (cmd->name == NULL)
+ goto help;
+
+ if (monitor_handler_ported(cmd)) {
+ cmd->mhandler.info_new(mon, ret_data);
+ if (*ret_data)
+ cmd->user_print(mon, *ret_data);
+ } else {
+ cmd->mhandler.info(mon);
+ }
+
return;
- found:
- cmd->mhandler.info(mon);
+
+help:
+ help_cmd(mon, "info");
}
static void do_info_version(Monitor *mon)
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index c689a07..c37b0cb 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -40,7 +40,8 @@ ETEXI
.args_type = "item:s?",
.params = "[subcommand]",
.help = "show various information about the system state",
- .mhandler.cmd = do_info,
+ .user_print = monitor_user_noop,
+ .mhandler.cmd_new = do_info,
},
STEXI
--
1.6.5.rc2.17.gdbc1b
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [Qemu-devel] [PATCH 10/18] monitor: Convert do_quit() do QObject
2009-10-07 16:41 [Qemu-devel] [RESEND v3 00/18]: Initial QObject conversion Luiz Capitulino
` (8 preceding siblings ...)
2009-10-07 16:41 ` [Qemu-devel] [PATCH 09/18] monitor: do_info(): handle new and old info handlers Luiz Capitulino
@ 2009-10-07 16:41 ` Luiz Capitulino
2009-10-07 16:41 ` [Qemu-devel] [PATCH 11/18] monitor: Convert do_stop() to QObject Luiz Capitulino
` (7 subsequent siblings)
17 siblings, 0 replies; 20+ messages in thread
From: Luiz Capitulino @ 2009-10-07 16:41 UTC (permalink / raw)
To: qemu-devel; +Cc: aliguori, avi
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
monitor.c | 5 ++++-
qemu-monitor.hx | 3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/monitor.c b/monitor.c
index cc1b501..4ba415c 100644
--- a/monitor.c
+++ b/monitor.c
@@ -457,7 +457,10 @@ static void do_info_cpu_stats(Monitor *mon)
}
#endif
-static void do_quit(Monitor *mon, const QDict *qdict)
+/**
+ * do_quit(): Quit QEMU execution
+ */
+static void do_quit(Monitor *mon, const QDict *qdict, QObject **ret_data)
{
exit(0);
}
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index c37b0cb..51c7673 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -119,7 +119,8 @@ ETEXI
.args_type = "",
.params = "",
.help = "quit the emulator",
- .mhandler.cmd = do_quit,
+ .user_print = monitor_user_noop,
+ .mhandler.cmd_new = do_quit,
},
STEXI
--
1.6.5.rc2.17.gdbc1b
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [Qemu-devel] [PATCH 11/18] monitor: Convert do_stop() to QObject
2009-10-07 16:41 [Qemu-devel] [RESEND v3 00/18]: Initial QObject conversion Luiz Capitulino
` (9 preceding siblings ...)
2009-10-07 16:41 ` [Qemu-devel] [PATCH 10/18] monitor: Convert do_quit() do QObject Luiz Capitulino
@ 2009-10-07 16:41 ` Luiz Capitulino
2009-10-07 16:41 ` [Qemu-devel] [PATCH 12/18] monitor: Convert do_system_reset() " Luiz Capitulino
` (6 subsequent siblings)
17 siblings, 0 replies; 20+ messages in thread
From: Luiz Capitulino @ 2009-10-07 16:41 UTC (permalink / raw)
To: qemu-devel; +Cc: aliguori, avi
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
monitor.c | 5 ++++-
qemu-monitor.hx | 3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/monitor.c b/monitor.c
index 4ba415c..ae0a567 100644
--- a/monitor.c
+++ b/monitor.c
@@ -599,7 +599,10 @@ static void do_singlestep(Monitor *mon, const QDict *qdict)
}
}
-static void do_stop(Monitor *mon, const QDict *qdict)
+/**
+ * do_stop(): Stop VM execution
+ */
+static void do_stop(Monitor *mon, const QDict *qdict, QObject **ret_data)
{
vm_stop(EXCP_INTERRUPT);
}
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index 51c7673..8fcba24 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -287,7 +287,8 @@ ETEXI
.args_type = "",
.params = "",
.help = "stop emulation",
- .mhandler.cmd = do_stop,
+ .user_print = monitor_user_noop,
+ .mhandler.cmd_new = do_stop,
},
STEXI
--
1.6.5.rc2.17.gdbc1b
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [Qemu-devel] [PATCH 12/18] monitor: Convert do_system_reset() to QObject
2009-10-07 16:41 [Qemu-devel] [RESEND v3 00/18]: Initial QObject conversion Luiz Capitulino
` (10 preceding siblings ...)
2009-10-07 16:41 ` [Qemu-devel] [PATCH 11/18] monitor: Convert do_stop() to QObject Luiz Capitulino
@ 2009-10-07 16:41 ` Luiz Capitulino
2009-10-07 16:41 ` [Qemu-devel] [PATCH 13/18] monitor: Convert do_system_powerdown() " Luiz Capitulino
` (5 subsequent siblings)
17 siblings, 0 replies; 20+ messages in thread
From: Luiz Capitulino @ 2009-10-07 16:41 UTC (permalink / raw)
To: qemu-devel; +Cc: aliguori, avi
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
monitor.c | 6 +++++-
qemu-monitor.hx | 3 ++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/monitor.c b/monitor.c
index ae0a567..3209875 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1292,7 +1292,11 @@ static void do_boot_set(Monitor *mon, const QDict *qdict)
}
}
-static void do_system_reset(Monitor *mon, const QDict *qdict)
+/**
+ * do_system_reset(): Issue a machine reset
+ */
+static void do_system_reset(Monitor *mon, const QDict *qdict,
+ QObject **ret_data)
{
qemu_system_reset_request();
}
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index 8fcba24..b116b5e 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -467,7 +467,8 @@ ETEXI
.args_type = "",
.params = "",
.help = "reset the system",
- .mhandler.cmd = do_system_reset,
+ .user_print = monitor_user_noop,
+ .mhandler.cmd_new = do_system_reset,
},
STEXI
--
1.6.5.rc2.17.gdbc1b
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [Qemu-devel] [PATCH 13/18] monitor: Convert do_system_powerdown() to QObject
2009-10-07 16:41 [Qemu-devel] [RESEND v3 00/18]: Initial QObject conversion Luiz Capitulino
` (11 preceding siblings ...)
2009-10-07 16:41 ` [Qemu-devel] [PATCH 12/18] monitor: Convert do_system_reset() " Luiz Capitulino
@ 2009-10-07 16:41 ` Luiz Capitulino
2009-10-07 16:42 ` [Qemu-devel] [PATCH 14/18] monitor: Convert do_cont() " Luiz Capitulino
` (4 subsequent siblings)
17 siblings, 0 replies; 20+ messages in thread
From: Luiz Capitulino @ 2009-10-07 16:41 UTC (permalink / raw)
To: qemu-devel; +Cc: aliguori, avi
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
monitor.c | 6 +++++-
qemu-monitor.hx | 3 ++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/monitor.c b/monitor.c
index 3209875..ab15289 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1301,7 +1301,11 @@ static void do_system_reset(Monitor *mon, const QDict *qdict,
qemu_system_reset_request();
}
-static void do_system_powerdown(Monitor *mon, const QDict *qdict)
+/**
+ * do_system_powerdown(): Issue a machine powerdown
+ */
+static void do_system_powerdown(Monitor *mon, const QDict *qdict,
+ QObject **ret_data)
{
qemu_system_powerdown_request();
}
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index b116b5e..3efc716 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -482,7 +482,8 @@ ETEXI
.args_type = "",
.params = "",
.help = "send system power down event",
- .mhandler.cmd = do_system_powerdown,
+ .user_print = monitor_user_noop,
+ .mhandler.cmd_new = do_system_powerdown,
},
STEXI
--
1.6.5.rc2.17.gdbc1b
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [Qemu-devel] [PATCH 14/18] monitor: Convert do_cont() to QObject
2009-10-07 16:41 [Qemu-devel] [RESEND v3 00/18]: Initial QObject conversion Luiz Capitulino
` (12 preceding siblings ...)
2009-10-07 16:41 ` [Qemu-devel] [PATCH 13/18] monitor: Convert do_system_powerdown() " Luiz Capitulino
@ 2009-10-07 16:42 ` Luiz Capitulino
2009-10-07 16:42 ` [Qemu-devel] [PATCH 15/18] monitor: Convert do_balloon() " Luiz Capitulino
` (3 subsequent siblings)
17 siblings, 0 replies; 20+ messages in thread
From: Luiz Capitulino @ 2009-10-07 16:42 UTC (permalink / raw)
To: qemu-devel; +Cc: aliguori, avi
Appropriate error handling support will be needed to have
encrypted images working under the future machine protocol,
but this initial conversion will work with the current
user protocol.
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
monitor.c | 7 +++++--
qemu-monitor.hx | 3 ++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/monitor.c b/monitor.c
index ab15289..d393ad5 100644
--- a/monitor.c
+++ b/monitor.c
@@ -614,7 +614,10 @@ struct bdrv_iterate_context {
int err;
};
-static void do_cont(Monitor *mon, const QDict *qdict)
+/**
+ * do_cont(): Resume emulation.
+ */
+static void do_cont(Monitor *mon, const QDict *qdict, QObject **ret_data)
{
struct bdrv_iterate_context context = { mon, 0 };
@@ -630,7 +633,7 @@ static void bdrv_key_cb(void *opaque, int err)
/* another key was set successfully, retry to continue */
if (!err)
- do_cont(mon, NULL);
+ do_cont(mon, NULL, NULL);
}
static void encrypted_bdrv_it(void *opaque, BlockDriverState *bs)
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index 3efc716..8dca4f1 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -301,7 +301,8 @@ ETEXI
.args_type = "",
.params = "",
.help = "resume emulation",
- .mhandler.cmd = do_cont,
+ .user_print = monitor_user_noop,
+ .mhandler.cmd_new = do_cont,
},
STEXI
--
1.6.5.rc2.17.gdbc1b
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [Qemu-devel] [PATCH 15/18] monitor: Convert do_balloon() to QObject
2009-10-07 16:41 [Qemu-devel] [RESEND v3 00/18]: Initial QObject conversion Luiz Capitulino
` (13 preceding siblings ...)
2009-10-07 16:42 ` [Qemu-devel] [PATCH 14/18] monitor: Convert do_cont() " Luiz Capitulino
@ 2009-10-07 16:42 ` Luiz Capitulino
2009-10-07 16:42 ` [Qemu-devel] [PATCH 16/18] monitor: Convert do_info_version() " Luiz Capitulino
` (2 subsequent siblings)
17 siblings, 0 replies; 20+ messages in thread
From: Luiz Capitulino @ 2009-10-07 16:42 UTC (permalink / raw)
To: qemu-devel; +Cc: aliguori, avi
It is important to note that it never fails, as big refactoring
of the virtio code would be needed to get the proper error code.
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
monitor.c | 6 ++++--
qemu-monitor.hx | 3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/monitor.c b/monitor.c
index d393ad5..22e87ab 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1602,8 +1602,10 @@ static void do_info_status(Monitor *mon)
monitor_printf(mon, "VM status: paused\n");
}
-
-static void do_balloon(Monitor *mon, const QDict *qdict)
+/**
+ * do_balloon(): Request VM to change its memory allocation
+ */
+static void do_balloon(Monitor *mon, const QDict *qdict, QObject **ret_data)
{
int value = qdict_get_int(qdict, "value");
ram_addr_t target = value;
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index 8dca4f1..29999c6 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -874,7 +874,8 @@ ETEXI
.args_type = "value:i",
.params = "target",
.help = "request VM to change it's memory allocation (in MB)",
- .mhandler.cmd = do_balloon,
+ .user_print = monitor_user_noop,
+ .mhandler.cmd_new = do_balloon,
},
STEXI
--
1.6.5.rc2.17.gdbc1b
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [Qemu-devel] [PATCH 16/18] monitor: Convert do_info_version() to QObject
2009-10-07 16:41 [Qemu-devel] [RESEND v3 00/18]: Initial QObject conversion Luiz Capitulino
` (14 preceding siblings ...)
2009-10-07 16:42 ` [Qemu-devel] [PATCH 15/18] monitor: Convert do_balloon() " Luiz Capitulino
@ 2009-10-07 16:42 ` Luiz Capitulino
2009-10-07 16:42 ` [Qemu-devel] [PATCH 17/18] monitor: Convert do_info_balloon() " Luiz Capitulino
2009-10-07 16:42 ` [Qemu-devel] [PATCH 18/18] monitor: Convert do_info_cpus() " Luiz Capitulino
17 siblings, 0 replies; 20+ messages in thread
From: Luiz Capitulino @ 2009-10-07 16:42 UTC (permalink / raw)
To: qemu-devel; +Cc: aliguori, avi
The returned data is always a QString.
Also introduces monitor_print_qobject(), which can be used as
a standard way to print QObjects in the user protocol format.
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
monitor.c | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/monitor.c b/monitor.c
index 22e87ab..8c9cc9b 100644
--- a/monitor.c
+++ b/monitor.c
@@ -223,6 +223,24 @@ static inline int monitor_handler_ported(const mon_cmd_t *cmd)
return cmd->user_print != NULL;
}
+static void monitor_print_qobject(Monitor *mon, const QObject *data)
+{
+ switch (qobject_type(data)) {
+ case QTYPE_QSTRING:
+ monitor_printf(mon, "%s",qstring_get_str(qobject_to_qstring(data)));
+ break;
+ case QTYPE_QINT:
+ monitor_printf(mon, "%" PRId64,qint_get_int(qobject_to_qint(data)));
+ break;
+ default:
+ monitor_printf(mon, "ERROR: unsupported type: %d",
+ qobject_type(data));
+ break;
+ }
+
+ monitor_puts(mon, "\n");
+}
+
static int compare_cmd(const char *name, const char *list)
{
const char *p, *pstart;
@@ -322,9 +340,12 @@ help:
help_cmd(mon, "info");
}
-static void do_info_version(Monitor *mon)
+/**
+ * do_info_version(): Show QEMU version
+ */
+static void do_info_version(Monitor *mon, QObject **ret_data)
{
- monitor_printf(mon, "%s\n", QEMU_VERSION QEMU_PKGVERSION);
+ *ret_data = QOBJECT(qstring_from_str(QEMU_VERSION QEMU_PKGVERSION));
}
static void do_info_name(Monitor *mon)
@@ -1860,7 +1881,8 @@ static const mon_cmd_t info_cmds[] = {
.args_type = "",
.params = "",
.help = "show the version of QEMU",
- .mhandler.info = do_info_version,
+ .user_print = monitor_print_qobject,
+ .mhandler.info_new = do_info_version,
},
{
.name = "network",
--
1.6.5.rc2.17.gdbc1b
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [Qemu-devel] [PATCH 17/18] monitor: Convert do_info_balloon() to QObject
2009-10-07 16:41 [Qemu-devel] [RESEND v3 00/18]: Initial QObject conversion Luiz Capitulino
` (15 preceding siblings ...)
2009-10-07 16:42 ` [Qemu-devel] [PATCH 16/18] monitor: Convert do_info_version() " Luiz Capitulino
@ 2009-10-07 16:42 ` Luiz Capitulino
2009-10-07 16:42 ` [Qemu-devel] [PATCH 18/18] monitor: Convert do_info_cpus() " Luiz Capitulino
17 siblings, 0 replies; 20+ messages in thread
From: Luiz Capitulino @ 2009-10-07 16:42 UTC (permalink / raw)
To: qemu-devel; +Cc: aliguori, avi
On success return a QInt with the balloon's value.
This also introduces monitor_print_balloon() to print the
balloon information in the user protocol.
Please, note that errors are not being converted yet.
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
monitor.c | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/monitor.c b/monitor.c
index 8c9cc9b..9983f34 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1633,7 +1633,16 @@ static void do_balloon(Monitor *mon, const QDict *qdict, QObject **ret_data)
qemu_balloon(target << 20);
}
-static void do_info_balloon(Monitor *mon)
+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)));
+}
+
+/**
+ * do_info_balloon(): Balloon information
+ */
+static void do_info_balloon(Monitor *mon, QObject **ret_data)
{
ram_addr_t actual;
@@ -1644,7 +1653,7 @@ static void do_info_balloon(Monitor *mon)
else if (actual == 0)
monitor_printf(mon, "Ballooning not activated in VM\n");
else
- monitor_printf(mon, "balloon: actual=%d\n", (int)(actual >> 20));
+ *ret_data = QOBJECT(qint_from_int((int)(actual >> 20)));
}
static qemu_acl *find_acl(Monitor *mon, const char *name)
@@ -2107,7 +2116,8 @@ static const mon_cmd_t info_cmds[] = {
.args_type = "",
.params = "",
.help = "show balloon information",
- .mhandler.info = do_info_balloon,
+ .user_print = monitor_print_balloon,
+ .mhandler.info_new = do_info_balloon,
},
{
.name = "qtree",
--
1.6.5.rc2.17.gdbc1b
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [Qemu-devel] [PATCH 18/18] monitor: Convert do_info_cpus() to QObject
2009-10-07 16:41 [Qemu-devel] [RESEND v3 00/18]: Initial QObject conversion Luiz Capitulino
` (16 preceding siblings ...)
2009-10-07 16:42 ` [Qemu-devel] [PATCH 17/18] monitor: Convert do_info_balloon() " Luiz Capitulino
@ 2009-10-07 16:42 ` Luiz Capitulino
17 siblings, 0 replies; 20+ messages in thread
From: Luiz Capitulino @ 2009-10-07 16:42 UTC (permalink / raw)
To: qemu-devel; +Cc: aliguori, avi
Each CPU information is stored in a QDict and the returned
QObject is a QList of all CPUs.
The QDict contains the following information:
- "CPU": cpu index
- "current": "yes" or "no"
- "pc": current PC
- "halted": "yes" or "no"
The user output in the Monitor should not change and the
future monitor protocol is expected to emit something like:
[ { "CPU": 0, "current": "yes", "pc": 0x..., "halted": "no" },
{ "CPU": 1, "current": "no", "pc": 0x..., "halted": "yes" } ]
which corresponds to the following user output:
* CPU #0: pc=0x00000000fffffff0
CPU #1: pc=0x00000000fffffff0 (halted)
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
monitor.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 81 insertions(+), 14 deletions(-)
diff --git a/monitor.c b/monitor.c
index 9983f34..3424e60 100644
--- a/monitor.c
+++ b/monitor.c
@@ -46,6 +46,7 @@
#include "kvm.h"
#include "acl.h"
#include "qint.h"
+#include "qlist.h"
#include "qdict.h"
#include "qstring.h"
@@ -409,33 +410,98 @@ static void do_info_registers(Monitor *mon)
#endif
}
-static void do_info_cpus(Monitor *mon)
+static void print_cpu_iter(QObject *obj, void *opaque)
+{
+ QDict *cpu;
+ int active = ' ';
+ Monitor *mon = opaque;
+
+ assert(qobject_type(obj) == QTYPE_QDICT);
+ cpu = qobject_to_qdict(obj);
+
+ if (strcmp(qdict_get_str(cpu, "current"), "yes") == 0)
+ active = '*';
+
+ monitor_printf(mon, "%c CPU #%d: ", active, (int)qdict_get_int(cpu, "CPU"));
+
+#if defined(TARGET_I386)
+ monitor_printf(mon, "pc=0x" TARGET_FMT_lx,
+ (target_ulong) qdict_get_int(cpu, "pc"));
+#elif defined(TARGET_PPC)
+ monitor_printf(mon, "nip=0x" TARGET_FMT_lx,
+ (target_long) qdict_get_int(cpu, "nip"));
+#elif defined(TARGET_SPARC)
+ monitor_printf(mon, "pc=0x " TARGET_FMT_lx,
+ (target_long) qdict_get_int(cpu, "pc"));
+ monitor_printf(mon, "npc=0x" TARGET_FMT_lx,
+ (target_long) qdict_get_int(cpu, "npc"));
+#elif defined(TARGET_MIPS)
+ monitor_printf(mon, "PC=0x" TARGET_FMT_lx,
+ (target_long) qdict_get_int(cpu, "PC"));
+#endif
+
+ if (strcmp(qdict_get_str(cpu, "halted"), "yes") == 0)
+ monitor_printf(mon, " (halted)");
+
+ monitor_printf(mon, "\n");
+}
+
+static void monitor_print_cpus(Monitor *mon, const QObject *data)
+{
+ QList *cpu_list;
+
+ assert(qobject_type(data) == QTYPE_QLIST);
+ cpu_list = qobject_to_qlist(data);
+ qlist_iter(cpu_list, print_cpu_iter, mon);
+}
+
+/**
+ * do_info_cpus(): Show CPU information
+ *
+ * Return a QList with a QDict for each CPU.
+ *
+ * For example:
+ *
+ * [ { "CPU": 0, "current": "yes", "pc": 0x..., "halted": "no" },
+ * { "CPU": 1, "current": "no", "pc": 0x..., "halted": "yes" } ]
+ */
+static void do_info_cpus(Monitor *mon, QObject **ret_data)
{
CPUState *env;
+ QList *cpu_list;
+
+ cpu_list = qlist_new();
/* just to set the default cpu if not already done */
mon_get_cpu();
for(env = first_cpu; env != NULL; env = env->next_cpu) {
+ const char *answer;
+ QDict *cpu = qdict_new();
+
cpu_synchronize_state(env);
- monitor_printf(mon, "%c CPU #%d:",
- (env == mon->mon_cpu) ? '*' : ' ',
- env->cpu_index);
+
+ qdict_put(cpu, "CPU", qint_from_int(env->cpu_index));
+ answer = (env == mon->mon_cpu) ? "yes" : "no";
+ qdict_put(cpu, "current", qstring_from_str(answer));
+
#if defined(TARGET_I386)
- monitor_printf(mon, " pc=0x" TARGET_FMT_lx,
- env->eip + env->segs[R_CS].base);
+ qdict_put(cpu, "pc", qint_from_int(env->eip + env->segs[R_CS].base));
#elif defined(TARGET_PPC)
- monitor_printf(mon, " nip=0x" TARGET_FMT_lx, env->nip);
+ qdict_put(cpu, "nip", qint_from_int(env->nip));
#elif defined(TARGET_SPARC)
- monitor_printf(mon, " pc=0x" TARGET_FMT_lx " npc=0x" TARGET_FMT_lx,
- env->pc, env->npc);
+ qdict_put(cpu, "pc", qint_from_int(env->pc));
+ qdict_put(cpu, "npc", qint_from_int(env->npc));
#elif defined(TARGET_MIPS)
- monitor_printf(mon, " PC=0x" TARGET_FMT_lx, env->active_tc.PC);
+ qdict_put(cpu, "PC", qint_from_int(env->active_tc.PC));
#endif
- if (env->halted)
- monitor_printf(mon, " (halted)");
- monitor_printf(mon, "\n");
+ answer = env->halted ? "yes" : "no";
+ qdict_put(cpu, "halted", qstring_from_str(answer));
+
+ qlist_append(cpu_list, cpu);
}
+
+ *ret_data = QOBJECT(cpu_list);
}
static void do_cpu_set(Monitor *mon, const QDict *qdict)
@@ -1933,7 +1999,8 @@ static const mon_cmd_t info_cmds[] = {
.args_type = "",
.params = "",
.help = "show infos for each CPU",
- .mhandler.info = do_info_cpus,
+ .user_print = monitor_print_cpus,
+ .mhandler.info_new = do_info_cpus,
},
{
.name = "history",
--
1.6.5.rc2.17.gdbc1b
^ permalink raw reply related [flat|nested] 20+ messages in thread
end of thread, other threads:[~2009-10-07 16:43 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-07 16:41 [Qemu-devel] [RESEND v3 00/18]: Initial QObject conversion Luiz Capitulino
2009-10-07 16:41 ` [Qemu-devel] [PATCH 01/18] QObject: Accept NULL Luiz Capitulino
2009-10-07 16:41 ` [Qemu-devel] [PATCH 02/18] Introduce QList Luiz Capitulino
2009-10-07 16:41 ` [Qemu-devel] [PATCH 03/18] Introduce QList unit-tests Luiz Capitulino
2009-10-07 16:41 ` [Qemu-devel] [PATCH 04/18] monitor: Convert mon_cmd_t initializations to C99 style Luiz Capitulino
2009-10-07 16:41 ` [Qemu-devel] [PATCH 05/18] monitor: union for info handlers Luiz Capitulino
2009-10-07 16:41 ` [Qemu-devel] [PATCH 06/18] monitor: union for command handlers Luiz Capitulino
2009-10-07 16:41 ` [Qemu-devel] [PATCH 07/18] monitor: Add user_print() to mon_cmd_t Luiz Capitulino
2009-10-07 16:41 ` [Qemu-devel] [PATCH 08/18] monitor: Handle new and old style handlers Luiz Capitulino
2009-10-07 16:41 ` [Qemu-devel] [PATCH 09/18] monitor: do_info(): handle new and old info handlers Luiz Capitulino
2009-10-07 16:41 ` [Qemu-devel] [PATCH 10/18] monitor: Convert do_quit() do QObject Luiz Capitulino
2009-10-07 16:41 ` [Qemu-devel] [PATCH 11/18] monitor: Convert do_stop() to QObject Luiz Capitulino
2009-10-07 16:41 ` [Qemu-devel] [PATCH 12/18] monitor: Convert do_system_reset() " Luiz Capitulino
2009-10-07 16:41 ` [Qemu-devel] [PATCH 13/18] monitor: Convert do_system_powerdown() " Luiz Capitulino
2009-10-07 16:42 ` [Qemu-devel] [PATCH 14/18] monitor: Convert do_cont() " Luiz Capitulino
2009-10-07 16:42 ` [Qemu-devel] [PATCH 15/18] monitor: Convert do_balloon() " Luiz Capitulino
2009-10-07 16:42 ` [Qemu-devel] [PATCH 16/18] monitor: Convert do_info_version() " Luiz Capitulino
2009-10-07 16:42 ` [Qemu-devel] [PATCH 17/18] monitor: Convert do_info_balloon() " Luiz Capitulino
2009-10-07 16:42 ` [Qemu-devel] [PATCH 18/18] monitor: Convert do_info_cpus() " Luiz Capitulino
-- strict thread matches above, loose matches on Subject: below --
2009-10-07 16:31 [Qemu-devel] [PATCH v3 00/18]: Initial QObject conversion Luiz Capitulino
2009-10-07 16:32 ` [Qemu-devel] [PATCH 05/18] monitor: union for info handlers Luiz Capitulino
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).