[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 7/7] char: Prevent multiple devices opening same cha
From: |
Amit Shah |
Subject: |
[Qemu-devel] [PATCH 7/7] char: Prevent multiple devices opening same chardev |
Date: |
Mon, 21 Mar 2011 18:39:22 +0530 |
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 <address@hidden>
Signed-off-by: Amit Shah <address@hidden>
---
hw/qdev-properties.c | 7 ++++++-
qemu-char.c | 4 ++++
qemu-char.h | 1 +
3 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index a45b61e..1088a26 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 cad35d7..c4557c3 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 56d9954..fb96eef 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;
};
--
1.7.4
- [Qemu-devel] [PULL #7 0/7] virtio-serial fixes, enhancements, Amit Shah, 2011/03/21
- [Qemu-devel] [PATCH 1/7] virtio-serial: Use a struct to pass config information from proxy, Amit Shah, 2011/03/21
- [Qemu-devel] [PATCH 2/7] virtio-serial: Disallow generic ports at id 0, Amit Shah, 2011/03/21
- [Qemu-devel] [PATCH 3/7] virtio-serial: Enable ioeventfd, Amit Shah, 2011/03/21
- [Qemu-devel] [PATCH 4/7] virtio-serial-bus: Simplify handle_output() function, Amit Shah, 2011/03/21
- [Qemu-devel] [PATCH 5/7] virtio-serial: Don't clear ->have_data() pointer after unplug, Amit Shah, 2011/03/21
- [Qemu-devel] [PATCH 6/7] virtio-console: Keep chardev open for other users after hot-unplug, Amit Shah, 2011/03/21
- [Qemu-devel] [PATCH 7/7] char: Prevent multiple devices opening same chardev,
Amit Shah <=
- [Qemu-devel] Re: [PULL #7 0/7] virtio-serial fixes, enhancements, Juan Quintela, 2011/03/23