From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50635) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zn0jH-0004d0-6w for qemu-devel@nongnu.org; Fri, 16 Oct 2015 04:51:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zn0jB-0007Hq-R9 for qemu-devel@nongnu.org; Fri, 16 Oct 2015 04:51:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36539) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zn0jB-0007He-Lz for qemu-devel@nongnu.org; Fri, 16 Oct 2015 04:51:05 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 4D3C8C0B83C2 for ; Fri, 16 Oct 2015 08:51:05 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-112-80.ams2.redhat.com [10.36.112.80]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t9G8oCaq010200 for ; Fri, 16 Oct 2015 04:51:04 -0400 From: Paolo Bonzini Date: Fri, 16 Oct 2015 10:49:53 +0200 Message-Id: <1444985411-17803-32-git-send-email-pbonzini@redhat.com> In-Reply-To: <1444985411-17803-1-git-send-email-pbonzini@redhat.com> References: <1444985411-17803-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 31/49] qemu-char: convert UDP backend to data-driven creation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Reviewed-by: Eric Blake Signed-off-by: Paolo Bonzini --- qemu-char.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 4fe9545..4f9bd14 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -4232,9 +4232,12 @@ static CharDriverState *qmp_chardev_open_socket(const char *id, return chr; } -static CharDriverState *qmp_chardev_open_udp(ChardevUdp *udp, +static CharDriverState *qmp_chardev_open_udp(const char *id, + ChardevBackend *backend, + ChardevReturn *ret, Error **errp) { + ChardevUdp *udp = backend->udp; int fd; fd = socket_dgram(udp->remote, udp->local, errp); @@ -4291,7 +4294,7 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, abort(); break; case CHARDEV_BACKEND_KIND_UDP: - chr = qmp_chardev_open_udp(backend->udp, &local_err); + abort(); break; #ifdef HAVE_CHARDEV_PTY case CHARDEV_BACKEND_KIND_PTY: @@ -4406,7 +4409,7 @@ static void register_types(void) register_char_driver("socket", CHARDEV_BACKEND_KIND_SOCKET, qemu_chr_parse_socket, qmp_chardev_open_socket); register_char_driver("udp", CHARDEV_BACKEND_KIND_UDP, qemu_chr_parse_udp, - NULL); + qmp_chardev_open_udp); register_char_driver("ringbuf", CHARDEV_BACKEND_KIND_RINGBUF, qemu_chr_parse_ringbuf, NULL); register_char_driver("file", CHARDEV_BACKEND_KIND_FILE, -- 2.5.0