From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=41718 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PtybT-0005ft-0n for qemu-devel@nongnu.org; Mon, 28 Feb 2011 03:37:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PtybN-0006pK-3c for qemu-devel@nongnu.org; Mon, 28 Feb 2011 03:37:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:1025) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PtybM-0006oo-LI for qemu-devel@nongnu.org; Mon, 28 Feb 2011 03:37:09 -0500 From: Amit Shah Date: Mon, 28 Feb 2011 14:06:57 +0530 Message-Id: <8f43fd1ff301acf02f7a5b9adf59af68a7a80659.1298882215.git.amit.shah@redhat.com> Subject: [Qemu-devel] [PATCH (resend, rebased)] char: Prevent multiple devices opening same chardev List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu list Cc: Amit Shah , Gerd Hoffmann , Markus Armbruster 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.h | 1 + 2 files changed, 7 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.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