From patchwork Mon Feb 21 09:04:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 83813 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D6985B712D for ; Mon, 21 Feb 2011 21:15:31 +1100 (EST) Received: from localhost ([127.0.0.1]:58939 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PrSZP-0000vM-R2 for incoming@patchwork.ozlabs.org; Mon, 21 Feb 2011 05:00:43 -0500 Received: from [140.186.70.92] (port=34746 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PrRhi-0003Bk-QG for qemu-devel@nongnu.org; Mon, 21 Feb 2011 04:05:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PrRh5-000454-47 for qemu-devel@nongnu.org; Mon, 21 Feb 2011 04:04:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48657) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PrRh4-00044w-Sa for qemu-devel@nongnu.org; Mon, 21 Feb 2011 04:04:35 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p1L94XpQ012824 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 21 Feb 2011 04:04:33 -0500 Received: from localhost (ovpn-113-38.phx2.redhat.com [10.3.113.38]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p1L94V8B003505; Mon, 21 Feb 2011 04:04:32 -0500 From: Amit Shah To: qemu list Date: Mon, 21 Feb 2011 14:34:28 +0530 Message-Id: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Amit Shah Subject: [Qemu-devel] [PATCH RESEND] char: Prevent multiple devices opening same chardev X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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; };