From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=36275 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PxZ4J-0003jW-D6
	for qemu-devel@nongnu.org; Thu, 10 Mar 2011 01:09:54 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <amit.shah@redhat.com>) id 1PxZ4H-0007gJ-Ae
	for qemu-devel@nongnu.org; Thu, 10 Mar 2011 01:09:50 -0500
Received: from mx1.redhat.com ([209.132.183.28]:34456)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <amit.shah@redhat.com>) id 1PxZ4H-0007gB-14
	for qemu-devel@nongnu.org; Thu, 10 Mar 2011 01:09:49 -0500
Date: Thu, 10 Mar 2011 11:39:45 +0530
From: Amit Shah <amit.shah@redhat.com>
Message-ID: <20110310060945.GA17376@amit-x200.redhat.com>
References: <8f43fd1ff301acf02f7a5b9adf59af68a7a80659.1298882215.git.amit.shah@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <8f43fd1ff301acf02f7a5b9adf59af68a7a80659.1298882215.git.amit.shah@redhat.com>
Subject: [Qemu-devel] Re: [PATCH (resend,
 rebased)] char: Prevent multiple devices opening same chardev
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu list <qemu-devel@nongnu.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>, Markus Armbruster <armbru@redhat.com>

On (Mon) 28 Feb 2011 [14:06:57], Amit Shah wrote:
> 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>

Ping?

> ---
>  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
> 

		Amit