[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/5] console: qom-ify QemuConsole
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 1/5] console: qom-ify QemuConsole |
Date: |
Thu, 18 Apr 2013 11:01:15 +0200 |
Just the minimal bits to turn QemuConsoles into Objects.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
include/ui/console.h | 15 +++++++++++++++
ui/console.c | 15 ++++++++++++++-
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/include/ui/console.h b/include/ui/console.h
index e591d74..c8a274d 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -2,6 +2,7 @@
#define CONSOLE_H
#include "ui/qemu-pixman.h"
+#include "qom/object.h"
#include "qapi/qmp/qdict.h"
#include "qemu/notify.h"
#include "monitor/monitor.h"
@@ -106,6 +107,20 @@ void kbd_put_keysym(int keysym);
/* consoles */
+#define TYPE_QEMU_CONSOLE "qemu-console"
+#define QEMU_CONSOLE(obj) \
+ OBJECT_CHECK(QemuConsole, (obj), TYPE_QEMU_CONSOLE)
+#define QEMU_CONSOLE_GET_CLASS(obj) \
+ OBJECT_GET_CLASS(QemuConsoleClass, (obj), TYPE_QEMU_CONSOLE)
+#define QEMU_CONSOLE_CLASS(klass) \
+ OBJECT_CLASS_CHECK(QemuConsoleClass, (klass), TYPE_QEMU_CONSOLE)
+
+typedef struct QemuConsoleClass QemuConsoleClass;
+
+struct QemuConsoleClass {
+ ObjectClass parent_class;
+};
+
#define QEMU_BIG_ENDIAN_FLAG 0x01
#define QEMU_ALLOCATED_FLAG 0x02
diff --git a/ui/console.c b/ui/console.c
index 4f9219e..e9f3080 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -113,6 +113,8 @@ typedef enum {
} console_type_t;
struct QemuConsole {
+ Object parent;
+
int index;
console_type_t console_type;
DisplayState *ds;
@@ -1197,12 +1199,14 @@ static void text_console_update(void *opaque,
console_ch_t *chardata)
static QemuConsole *new_console(DisplayState *ds, console_type_t console_type)
{
+ Object *obj;
QemuConsole *s;
int i;
if (nb_consoles >= MAX_CONSOLES)
return NULL;
- s = g_malloc0(sizeof(QemuConsole));
+ obj = object_new(TYPE_QEMU_CONSOLE);
+ s = QEMU_CONSOLE(obj);
if (!active_console || ((active_console->console_type != GRAPHIC_CONSOLE)
&&
(console_type == GRAPHIC_CONSOLE))) {
active_console = s;
@@ -1920,8 +1924,17 @@ static void qemu_chr_parse_vc(QemuOpts *opts,
ChardevBackend *backend,
}
}
+static const TypeInfo qemu_console_info = {
+ .name = TYPE_QEMU_CONSOLE,
+ .parent = TYPE_OBJECT,
+ .instance_size = sizeof(QemuConsole),
+ .class_size = sizeof(QemuConsoleClass),
+};
+
+
static void register_types(void)
{
+ type_register_static(&qemu_console_info);
register_char_driver_qapi("vc", CHARDEV_BACKEND_KIND_VC,
qemu_chr_parse_vc);
}
--
1.7.9.7
- [Qemu-devel] [RfC PATCH 0/5] console: qom-ify & extent screendump monitor command, Gerd Hoffmann, 2013/04/18
- [Qemu-devel] [PATCH 2/5] console: Hook QemuConsoles into qom tree, Gerd Hoffmann, 2013/04/18
- [Qemu-devel] [PATCH 4/5] console: add qemu_console_lookup_by_device, Gerd Hoffmann, 2013/04/18
- [Qemu-devel] [PATCH 1/5] console: qom-ify QemuConsole,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 5/5] console: extend screendump monitor cmd, Gerd Hoffmann, 2013/04/18
- [Qemu-devel] [PATCH 3/5] console: add device link to QemuConsoles, Gerd Hoffmann, 2013/04/18
- Re: [Qemu-devel] [RfC PATCH 0/5] console: qom-ify & extent screendump monitor command, Eric Blake, 2013/04/18
- Re: [Qemu-devel] [RfC PATCH 0/5] console: qom-ify & extent screendump monitor command, Markus Armbruster, 2013/04/19