[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/41] char: remove chr_free
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PULL 16/41] char: remove chr_free |
Date: |
Tue, 31 Jan 2017 20:20:57 +0400 |
Now it uses Object instance_finalize instead.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
include/sysemu/char.h | 8 --------
qemu-char.c | 10 +---------
2 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/include/sysemu/char.h b/include/sysemu/char.h
index da0e7dd494..5e5594f305 100644
--- a/include/sysemu/char.h
+++ b/include/sysemu/char.h
@@ -185,13 +185,6 @@ Chardev *qemu_chr_new_noreplay(const char *label, const
char *filename);
void qemu_chr_delete(Chardev *chr);
/**
- * @qemu_chr_free:
- *
- * Destroy a character backend.
- */
-void qemu_chr_free(Chardev *chr);
-
-/**
* @qemu_chr_fe_set_echo:
*
* Ask the backend to override its normal echo setting. This only really
@@ -496,7 +489,6 @@ typedef struct ChardevClass {
int (*set_msgfds)(Chardev *s, int *fds, int num);
int (*chr_add_client)(Chardev *chr, int fd);
int (*chr_wait_connected)(Chardev *chr, Error **errp);
- void (*chr_free)(Chardev *chr);
void (*chr_disconnect)(Chardev *chr);
void (*chr_accept_input)(Chardev *chr);
void (*chr_set_echo)(Chardev *chr, bool echo);
diff --git a/qemu-char.c b/qemu-char.c
index 3d0d690999..c239418c25 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -4371,18 +4371,10 @@ void qemu_chr_fe_disconnect(CharBackend *be)
}
}
-void qemu_chr_free(Chardev *chr)
-{
- if (CHARDEV_GET_CLASS(chr)->chr_free) {
- CHARDEV_GET_CLASS(chr)->chr_free(chr);
- }
- object_unref(OBJECT(chr));
-}
-
void qemu_chr_delete(Chardev *chr)
{
QTAILQ_REMOVE(&chardevs, chr, next);
- qemu_chr_free(chr);
+ object_unref(OBJECT(chr));
}
ChardevInfoList *qmp_query_chardev(Error **errp)
--
2.11.0.295.gd7dffce1c.dirty
- [Qemu-devel] [PULL 06/41] char-udp: convert to finalize, (continued)
- [Qemu-devel] [PULL 06/41] char-udp: convert to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 07/41] char-socket: convert to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 08/41] char-pty: convert to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 09/41] char-ringbuf: convert to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 10/41] char-parallel: convert parallel to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 11/41] char-stdio: convert to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 12/41] char-win-stdio: convert to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 13/41] char-win: do not override chr_free, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 14/41] char-win: convert to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 15/41] char-fd: convert to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 16/41] char: remove chr_free,
Marc-André Lureau <=
- [Qemu-devel] [PULL 18/41] char: rename remaining CharDriver to Chardev, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 17/41] char: get rid of CharDriver, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 19/41] char: remove class kind field, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 20/41] char: move to chardev/, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 22/41] char: make null_chr_write() the default method, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 21/41] char: create chardev-obj-y, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 23/41] char: move null chardev to its own file, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 24/41] char: move mux to its own file, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 25/41] char: move ringbuf/memory to its own file, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 26/41] char: rename and move to header CHR_READ_BUF_LEN, Marc-André Lureau, 2017/01/31