Commit 08d0ab3f authored by Lei Li's avatar Lei Li Committed by Anthony Liguori
Browse files

chardev: Make consistent with udp device for new qapi backend 



When register and open a chardev udp, the backend name should be udp
not dgram, and we do not have backend dgram in the chardev list. This
patch makes the new qapi udp backend consistent with the original
udp device.

Signed-off-by: default avatarLei Li <lilei@linux.vnet.ibm.com>
Message-id: 1369032665-18159-2-git-send-email-lilei@linux.vnet.ibm.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent b9b5df6f

qapi-schema.json

+4 −4
Original line number Diff line number Diff line
@@ -3210,7 +3210,7 @@ 
                                     '*telnet'  : 'bool' } }



##

# @ChardevDgram:

# @ChardevUdp:

#

# Configuration info for datagram socket chardevs.

#
@@ -3219,7 +3219,7 @@ 
#

# Since: 1.5

##

{ 'type': 'ChardevDgram', 'data': { 'remote' : 'SocketAddress',

{ 'type': 'ChardevUdp', 'data': { 'remote' : 'SocketAddress',

                                  '*local' : 'SocketAddress' } }



##
@@ -3310,7 +3310,7 @@ 
                                       'parallel': 'ChardevHostdev',

                                       'pipe'   : 'ChardevHostdev',

                                       'socket' : 'ChardevSocket',

                                       'dgram'  : 'ChardevDgram',

                                       'udp'    : 'ChardevUdp',

                                       'pty'    : 'ChardevDummy',

                                       'null'   : 'ChardevDummy',

                                       'mux'    : 'ChardevMux',

qemu-char.c

+5 −5
Original line number Diff line number Diff line
@@ -3698,12 +3698,12 @@ static CharDriverState *qmp_chardev_open_socket(ChardevSocket *sock, 
                                   is_telnet, is_waitconnect, errp);

}



static CharDriverState *qmp_chardev_open_dgram(ChardevDgram *dgram,

static CharDriverState *qmp_chardev_open_udp(ChardevUdp *udp,

                                             Error **errp)

{

    int fd;



    fd = socket_dgram(dgram->remote, dgram->local, errp);

    fd = socket_dgram(udp->remote, udp->local, errp);

    if (error_is_set(errp)) {

        return NULL;

    }
@@ -3739,8 +3739,8 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend, 
    case CHARDEV_BACKEND_KIND_SOCKET:

        chr = qmp_chardev_open_socket(backend->socket, errp);

        break;

    case CHARDEV_BACKEND_KIND_DGRAM:

        chr = qmp_chardev_open_dgram(backend->dgram, errp);

    case CHARDEV_BACKEND_KIND_UDP:

        chr = qmp_chardev_open_udp(backend->udp, errp);

        break;

#ifdef HAVE_CHARDEV_TTY

    case CHARDEV_BACKEND_KIND_PTY: