Commit 2d6c1ef4 authored by Amit Shah's avatar Amit Shah
Browse files

char: Prevent multiple devices opening same chardev 



Prevent:

-chardev socket,path=/tmp/foo,server,nowait,id=c0 \
-device virtserialport,chardev=c0,id=vs0 \
-device virtserialport,chardev=c0,id=vs1

Reported-by: default avatarMike Cao <bcao@redhat.com>
Signed-off-by: default avatarAmit Shah <amit.shah@redhat.com>
parent f9a90f18

hw/qdev-properties.c

+6 −1
Original line number Diff line number Diff line
@@ -351,8 +351,13 @@ static int parse_chr(DeviceState *dev, Property *prop, const char *str) 
    CharDriverState **ptr = qdev_get_prop_ptr(dev, prop);



    *ptr = qemu_chr_find(str);

    if (*ptr == NULL)

    if (*ptr == NULL) {

        return -ENOENT;

    }

    if ((*ptr)->assigned) {

        return -EEXIST;

    }

    (*ptr)->assigned = 1;

    return 0;

}

qemu-char.c

+4 −0
Original line number Diff line number Diff line
@@ -197,6 +197,10 @@ void qemu_chr_add_handlers(CharDriverState *s, 
                           IOEventHandler *fd_event,

                           void *opaque)

{

    if (!opaque) {

        /* chr driver being released. */

        s->assigned = 0;

    }

    s->chr_can_read = fd_can_read;

    s->chr_read = fd_read;

    s->chr_event = fd_event;

qemu-char.h

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ struct CharDriverState { 
    char *label;

    char *filename;

    int opened;

    int assigned; /* chardev assigned to a device */

    QTAILQ_ENTRY(CharDriverState) next;

};