From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38414) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFL0d-0005nk-NI for qemu-devel@nongnu.org; Tue, 12 Mar 2013 04:56:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UFL0a-0003yH-Pr for qemu-devel@nongnu.org; Tue, 12 Mar 2013 04:56:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41636) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFL0a-0003xK-HR for qemu-devel@nongnu.org; Tue, 12 Mar 2013 04:56:32 -0400 From: Gerd Hoffmann Date: Tue, 12 Mar 2013 09:56:13 +0100 Message-Id: <1363078589-15233-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1363078589-15233-1-git-send-email-kraxel@redhat.com> References: <1363078589-15233-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 03/19] chardev: switch null init to qapi List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Gerd Hoffmann This patch switches over the 'null' chardev initialization to the new qapi code path. Signed-off-by: Gerd Hoffmann --- qemu-char.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 38890ed..2bf12cd 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -217,7 +217,7 @@ static int null_chr_write(CharDriverState *chr, const uint8_t *buf, int len) return len; } -static CharDriverState *qemu_chr_open_null(QemuOpts *opts) +static CharDriverState *qemu_chr_open_null(void) { CharDriverState *chr; @@ -3684,7 +3684,7 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, } #endif case CHARDEV_BACKEND_KIND_NULL: - chr = qemu_chr_open_null(NULL); + chr = qemu_chr_open_null(); break; case CHARDEV_BACKEND_KIND_MUX: base = qemu_chr_find(backend->mux->chardev); @@ -3734,7 +3734,7 @@ void qmp_chardev_remove(const char *id, Error **errp) static void register_types(void) { - register_char_driver("null", qemu_chr_open_null); + register_char_driver_qapi("null", CHARDEV_BACKEND_KIND_NULL, NULL); register_char_driver("socket", qemu_chr_open_socket); register_char_driver("udp", qemu_chr_open_udp); register_char_driver("memory", qemu_chr_open_ringbuf); -- 1.7.9.7