From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=40690 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q1erl-0005Ho-Oa for qemu-devel@nongnu.org; Mon, 21 Mar 2011 09:09:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q1erk-0007Qk-9o for qemu-devel@nongnu.org; Mon, 21 Mar 2011 09:09:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33817) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q1erj-0007Qd-UJ for qemu-devel@nongnu.org; Mon, 21 Mar 2011 09:09:48 -0400 From: Amit Shah Date: Mon, 21 Mar 2011 18:39:22 +0530 Message-Id: <2d6c1ef40f3678ab47a4d14fb5dadaa486bfcda6.1300712809.git.amit.shah@redhat.com> In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH 7/7] char: Prevent multiple devices opening same chardev List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Amit Shah , qemu list 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 Signed-off-by: Amit Shah --- 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