qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Marc-André Lureau" <marcandre.lureau@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [Qemu-devel] [PULL 11/41] char-stdio: convert to finalize
Date: Tue, 31 Jan 2017 20:20:52 +0400	[thread overview]
Message-ID: <20170131162122.29408-12-marcandre.lureau@redhat.com> (raw)
In-Reply-To: <20170131162122.29408-1-marcandre.lureau@redhat.com>

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 qemu-char.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/qemu-char.c b/qemu-char.c
index 1981058f45..390e6a99de 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -1422,10 +1422,10 @@ static void qemu_chr_set_echo_stdio(Chardev *chr, bool echo)
     tcsetattr (0, TCSANOW, &tty);
 }
 
-static void qemu_chr_free_stdio(struct Chardev *chr)
+static void char_stdio_finalize(Object *obj)
 {
     term_exit();
-    fd_chr_free(chr);
+    fd_chr_free(CHARDEV(chr));
 }
 
 static void qemu_chr_open_stdio(Chardev *chr,
@@ -3859,7 +3859,6 @@ static void char_stdio_class_init(ObjectClass *oc, void *data)
     cc->chr_free = win_stdio_free;
 #else
     cc->chr_set_echo = qemu_chr_set_echo_stdio;
-    cc->chr_free = qemu_chr_free_stdio;
 #endif
 }
 
@@ -3869,6 +3868,7 @@ static const TypeInfo char_stdio_type_info = {
     .parent = TYPE_CHARDEV_WIN_STDIO,
 #else
     .parent = TYPE_CHARDEV_FD,
+    .instance_finalize = char_stdio_finalize,
 #endif
     .class_init = char_stdio_class_init,
 };
-- 
2.11.0.295.gd7dffce1c.dirty

  parent reply	other threads:[~2017-01-31 16:22 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-31 16:20 [Qemu-devel] [PULL 00/41] Chr split patches Marc-André Lureau
2017-01-31 16:20 ` [Qemu-devel] [PULL 01/41] MAINTAINERS: add myself to qemu-char.c Marc-André Lureau
2017-01-31 16:20 ` [Qemu-devel] [PULL 02/41] spice-qemu-char: convert to finalize Marc-André Lureau
2017-01-31 16:20 ` [Qemu-devel] [PULL 03/41] baum: " Marc-André Lureau
2017-01-31 16:20 ` [Qemu-devel] [PULL 04/41] msmouse: " Marc-André Lureau
2017-01-31 16:20 ` [Qemu-devel] [PULL 05/41] mux: " Marc-André Lureau
2017-01-31 16:20 ` [Qemu-devel] [PULL 06/41] char-udp: " Marc-André Lureau
2017-01-31 16:20 ` [Qemu-devel] [PULL 07/41] char-socket: " Marc-André Lureau
2017-01-31 16:20 ` [Qemu-devel] [PULL 08/41] char-pty: " Marc-André Lureau
2017-01-31 16:20 ` [Qemu-devel] [PULL 09/41] char-ringbuf: " Marc-André Lureau
2017-01-31 16:20 ` [Qemu-devel] [PULL 10/41] char-parallel: convert parallel " Marc-André Lureau
2017-01-31 16:20 ` Marc-André Lureau [this message]
2017-01-31 16:20 ` [Qemu-devel] [PULL 12/41] char-win-stdio: convert " Marc-André Lureau
2017-01-31 16:20 ` [Qemu-devel] [PULL 13/41] char-win: do not override chr_free Marc-André Lureau
2017-01-31 16:20 ` [Qemu-devel] [PULL 14/41] char-win: convert to finalize Marc-André Lureau
2017-01-31 16:20 ` [Qemu-devel] [PULL 15/41] char-fd: " Marc-André Lureau
2017-01-31 16:20 ` [Qemu-devel] [PULL 16/41] char: remove chr_free Marc-André Lureau
2017-01-31 16:20 ` [Qemu-devel] [PULL 17/41] char: get rid of CharDriver Marc-André Lureau
2017-01-31 16:20 ` [Qemu-devel] [PULL 18/41] char: rename remaining CharDriver to Chardev Marc-André Lureau
2017-01-31 16:21 ` [Qemu-devel] [PULL 19/41] char: remove class kind field Marc-André Lureau
2017-01-31 16:21 ` [Qemu-devel] [PULL 20/41] char: move to chardev/ Marc-André Lureau
2017-01-31 16:21 ` [Qemu-devel] [PULL 21/41] char: create chardev-obj-y Marc-André Lureau
2017-01-31 16:21 ` [Qemu-devel] [PULL 22/41] char: make null_chr_write() the default method Marc-André Lureau
2017-01-31 16:21 ` [Qemu-devel] [PULL 23/41] char: move null chardev to its own file Marc-André Lureau
2017-01-31 16:21 ` [Qemu-devel] [PULL 24/41] char: move mux " Marc-André Lureau
2017-01-31 16:21 ` [Qemu-devel] [PULL 25/41] char: move ringbuf/memory " Marc-André Lureau
2017-01-31 16:21 ` [Qemu-devel] [PULL 26/41] char: rename and move to header CHR_READ_BUF_LEN Marc-André Lureau
2017-01-31 16:21 ` [Qemu-devel] [PULL 27/41] char: remove unused READ_RETRIES Marc-André Lureau
2017-01-31 16:21 ` [Qemu-devel] [PULL 28/41] char: move QIOChannel-related stuff to char-io.h Marc-André Lureau
2017-01-31 16:21 ` [Qemu-devel] [PULL 29/41] char: move fd chardev in its own file Marc-André Lureau
2017-01-31 16:21 ` [Qemu-devel] [PULL 30/41] char: move win chardev base class " Marc-André Lureau
2017-01-31 16:21 ` [Qemu-devel] [PULL 31/41] char: move win-stdio into " Marc-André Lureau
2017-01-31 16:21 ` [Qemu-devel] [PULL 32/41] char: move socket chardev to " Marc-André Lureau
2017-01-31 16:21 ` [Qemu-devel] [PULL 33/41] char: move udp chardev in " Marc-André Lureau
2017-01-31 16:21 ` [Qemu-devel] [PULL 34/41] char: move file " Marc-André Lureau
2017-01-31 16:21 ` [Qemu-devel] [PULL 35/41] char: move stdio " Marc-André Lureau
2017-01-31 16:21 ` [Qemu-devel] [PULL 36/41] char: move console " Marc-André Lureau
2017-01-31 16:21 ` [Qemu-devel] [PULL 37/41] char: move pipe chardev " Marc-André Lureau
2017-01-31 16:21 ` [Qemu-devel] [PULL 38/41] char: move pty " Marc-André Lureau
2017-01-31 16:21 ` [Qemu-devel] [PULL 39/41] char: move serial chardev to " Marc-André Lureau
2017-01-31 16:21 ` [Qemu-devel] [PULL 40/41] char: move parallel chardev in " Marc-André Lureau
2017-01-31 16:21 ` [Qemu-devel] [PULL 41/41] char: headers clean-up Marc-André Lureau
2017-01-31 17:57 ` [Qemu-devel] [PULL 00/41] Chr split patches no-reply
2017-01-31 18:41 ` Peter Maydell
2017-01-31 18:55   ` Marc-André Lureau
2017-01-31 19:00     ` Eric Blake
2017-01-31 19:37       ` Marc-André Lureau
2017-01-31 20:02         ` Peter Maydell
2017-02-02 11:03         ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170131162122.29408-12-marcandre.lureau@redhat.com \
    --to=marcandre.lureau@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).