This just adds an Object to all chardev objects.
Signed-off-by: Anthony Liguori <aligu...@us.ibm.com>
---
console.c | 4 ++--
qemu-char.c | 47 ++++++++++++++++++++++++++++++-----------------
qemu-char.h | 6 ++++++
spice-qemu-char.c | 2 +-
4 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/console.c b/console.c
index 3f3d254..33bf7e7 100644
--- a/console.c
+++ b/console.c
@@ -1547,7 +1547,7 @@ CharDriverState *text_console_init(QemuOpts *opts)
unsigned width;
unsigned height;
- chr = g_malloc0(sizeof(CharDriverState));
+ chr = CHARDEV(object_new(TYPE_CHARDEV));
width = qemu_opt_get_number(opts, "width", 0);
if (width == 0)
@@ -1564,7 +1564,7 @@ CharDriverState *text_console_init(QemuOpts *opts)
}
if (!s) {
- g_free(chr);
+ object_delete(OBJECT(chr));
return NULL;
}
diff --git a/qemu-char.c b/qemu-char.c
index b082bae..8c5a80e 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -225,7 +225,7 @@ static CharDriverState *qemu_chr_open_null(QemuOpts *opts)
{
CharDriverState *chr;
- chr = g_malloc0(sizeof(CharDriverState));
+ chr = CHARDEV(object_new(TYPE_CHARDEV));
chr->chr_write = null_chr_write;
return chr;
}
@@ -472,7 +472,7 @@ static CharDriverState *qemu_chr_open_mux(CharDriverState
*drv)
CharDriverState *chr;
MuxDriver *d;
- chr = g_malloc0(sizeof(CharDriverState));
+ chr = CHARDEV(object_new(TYPE_CHARDEV));
d = g_malloc0(sizeof(MuxDriver));
chr->opaque = d;
@@ -623,7 +623,7 @@ static CharDriverState *qemu_chr_open_fd(int fd_in, int
fd_out)
CharDriverState *chr;
FDCharDriver *s;
- chr = g_malloc0(sizeof(CharDriverState));
+ chr = CHARDEV(object_new(TYPE_CHARDEV));
s = g_malloc0(sizeof(FDCharDriver));
s->fd_in = fd_in;
s->fd_out = fd_out;
@@ -999,7 +999,7 @@ static CharDriverState *qemu_chr_open_pty(QemuOpts *opts)
tcsetattr(slave_fd, TCSAFLUSH, &tty);
close(slave_fd);
- chr = g_malloc0(sizeof(CharDriverState));
+ chr = CHARDEV(object_new(TYPE_CHARDEV));
len = strlen(q_ptsname(master_fd)) + 5;
chr->filename = g_malloc(len);
@@ -1371,7 +1371,7 @@ static CharDriverState *qemu_chr_open_pp(QemuOpts *opts)
drv->fd = fd;
drv->mode = IEEE1284_MODE_COMPAT;
- chr = g_malloc0(sizeof(CharDriverState));
+ chr = CHARDEV(object_new(TYPE_CHARDEV));
chr->chr_write = null_chr_write;
chr->chr_ioctl = pp_ioctl;
chr->chr_close = pp_close;
@@ -1432,7 +1432,7 @@ static CharDriverState *qemu_chr_open_pp(QemuOpts *opts)
return NULL;
}
- chr = g_malloc0(sizeof(CharDriverState));
+ chr = CHARDEV(object_new(TYPE_CHARDEV));
chr->opaque = (void *)(intptr_t)fd;
chr->chr_write = null_chr_write;
chr->chr_ioctl = pp_ioctl;
@@ -1658,7 +1658,7 @@ static CharDriverState *qemu_chr_open_win(QemuOpts *opts)
CharDriverState *chr;
WinCharState *s;
- chr = g_malloc0(sizeof(CharDriverState));
+ chr = CHARDEV(object_new(TYPE_CHARDEV));
s = g_malloc0(sizeof(WinCharState));
chr->opaque = s;
chr->chr_write = win_chr_write;
@@ -1666,7 +1666,7 @@ static CharDriverState *qemu_chr_open_win(QemuOpts *opts)
if (win_chr_init(chr, filename) < 0) {
g_free(s);
- g_free(chr);
+ object_delete(OBJECT(chr));
return NULL;
}
qemu_chr_generic_open(chr);
@@ -1758,7 +1758,7 @@ static CharDriverState *qemu_chr_open_win_pipe(QemuOpts
*opts)
CharDriverState *chr;
WinCharState *s;
- chr = g_malloc0(sizeof(CharDriverState));
+ chr = CHARDEV(object_new(TYPE_CHARDEV));
s = g_malloc0(sizeof(WinCharState));
chr->opaque = s;
chr->chr_write = win_chr_write;
@@ -1766,7 +1766,7 @@ static CharDriverState *qemu_chr_open_win_pipe(QemuOpts
*opts)
if (win_chr_pipe_init(chr, filename) < 0) {
g_free(s);
- g_free(chr);
+ object_delete(OBJECT(chr));
return NULL;
}
qemu_chr_generic_open(chr);
@@ -1778,7 +1778,7 @@ static CharDriverState *qemu_chr_open_win_file(HANDLE
fd_out)
CharDriverState *chr;
WinCharState *s;
- chr = g_malloc0(sizeof(CharDriverState));
+ chr = CHARDEV(object_new(TYPE_CHARDEV));
s = g_malloc0(sizeof(WinCharState));
s->hcom = fd_out;
chr->opaque = s;
@@ -1940,7 +1940,7 @@ static void win_stdio_close(CharDriverState *chr)
}
g_free(chr->opaque);
- g_free(chr);
+ object_delete(OBJECT(chr));
stdio_nb_clients--;
}
@@ -2099,7 +2099,7 @@ static CharDriverState *qemu_chr_open_udp(QemuOpts *opts)
NetCharDriver *s = NULL;
int fd = -1;
- chr = g_malloc0(sizeof(CharDriverState));
+ chr = CHARDEV(object_new(TYPE_CHARDEV));
s = g_malloc0(sizeof(NetCharDriver));
fd = inet_dgram_opts(opts);
@@ -2118,7 +2118,7 @@ static CharDriverState *qemu_chr_open_udp(QemuOpts *opts)
return chr;
return_err:
- g_free(chr);
+ object_delete(OBJECT(chr));
g_free(s);
if (fd >= 0) {
closesocket(fd);
@@ -2443,7 +2443,7 @@ static CharDriverState *qemu_chr_open_socket(QemuOpts
*opts)
if (!is_listen)
is_waitconnect = 0;
- chr = g_malloc0(sizeof(CharDriverState));
+ chr = CHARDEV(object_new(TYPE_CHARDEV));
s = g_malloc0(sizeof(TCPCharDriver));
if (is_unix) {
@@ -2520,7 +2520,7 @@ static CharDriverState *qemu_chr_open_socket(QemuOpts
*opts)
if (fd >= 0)
closesocket(fd);
g_free(s);
- g_free(chr);
+ object_delete(OBJECT(chr));
return NULL;
}
@@ -2858,7 +2858,7 @@ void qemu_chr_delete(CharDriverState *chr)
chr->chr_close(chr);
g_free(chr->filename);
g_free(chr->label);
- g_free(chr);
+ object_delete(OBJECT(chr));
}
ChardevInfoList *qmp_query_chardev(Error **errp)
@@ -2900,3 +2900,16 @@ CharDriverState *qemu_char_get_next_serial(void)
return serial_hds[next_serial++];
}
+static const TypeInfo chardev_info = {
+ .name = TYPE_CHARDEV,
+ .parent = TYPE_OBJECT,
+ .instance_size = sizeof(CharDriverState),
+ .class_size = sizeof(ObjectClass),
+};
+
+static void register_types(void)
+{
+ type_register_static(&chardev_info);
+}
+
+type_init(register_types);
diff --git a/qemu-char.h b/qemu-char.h
index 486644b..229b16d 100644
--- a/qemu-char.h
+++ b/qemu-char.h
@@ -1,6 +1,7 @@
#ifndef QEMU_CHAR_H
#define QEMU_CHAR_H
+#include "qemu/object.h"
#include "qemu-common.h"
#include "qemu-queue.h"
#include "qemu-option.h"
@@ -50,9 +51,14 @@ typedef struct {
#define CHR_TIOCM_DTR 0x002
#define CHR_TIOCM_RTS 0x004
+#define TYPE_CHARDEV "chardev"
+#define CHARDEV(obj) OBJECT_CHECK(CharDriverState, (obj), TYPE_CHARDEV)
+
typedef void IOEventHandler(void *opaque, int event);
struct CharDriverState {
+ Object parent_obj;
+
void (*init)(struct CharDriverState *s);
int (*chr_write)(struct CharDriverState *s, const uint8_t *buf, int len);
void (*chr_update_read_handler)(struct CharDriverState *s);
diff --git a/spice-qemu-char.c b/spice-qemu-char.c
index 09aa22d..4badddc 100644
--- a/spice-qemu-char.c
+++ b/spice-qemu-char.c
@@ -214,7 +214,7 @@ CharDriverState *qemu_chr_open_spice(QemuOpts *opts)
return NULL;
}
- chr = g_malloc0(sizeof(CharDriverState));
+ chr = CHARDEV(object_new(TYPE_CHARDEV));
s = g_malloc0(sizeof(SpiceCharDriver));
s->chr = chr;
s->debug = debug;
--
1.7.5.4
