aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Shah <amit.shah@redhat.com>2011-02-10 12:55:20 +0530
committerAmit Shah <amit.shah@redhat.com>2011-03-21 16:57:13 +0530
commit2d6c1ef40f3678ab47a4d14fb5dadaa486bfcda6 (patch)
treec23a1a315307a23e0e97704a06226ed8288e5729
parentf9a90f189c780e066039f2de3906c73c48071bb7 (diff)
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: Mike Cao <bcao@redhat.com> Signed-off-by: Amit Shah <amit.shah@redhat.com>
-rw-r--r--hw/qdev-properties.c7
-rw-r--r--qemu-char.c4
-rw-r--r--qemu-char.h1
3 files changed, 11 insertions, 1 deletions
diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index a45b61e7ed..1088a26f8e 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -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;
}
diff --git a/qemu-char.c b/qemu-char.c
index cad35d7717..c4557c30d0 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -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;
diff --git a/qemu-char.h b/qemu-char.h
index 56d9954c52..fb96eef3de 100644
--- a/qemu-char.h
+++ b/qemu-char.h
@@ -70,6 +70,7 @@ struct CharDriverState {
char *label;
char *filename;
int opened;
+ int assigned; /* chardev assigned to a device */
QTAILQ_ENTRY(CharDriverState) next;
};