Patchwork [(resend,rebased)] char: Prevent multiple devices opening same chardev

login
register
mail settings
Submitter Amit Shah
Date Feb. 28, 2011, 8:36 a.m.
Message ID <8f43fd1ff301acf02f7a5b9adf59af68a7a80659.1298882215.git.amit.shah@redhat.com>
Download mbox | patch
Permalink /patch/84744/
State New
Headers show

Comments

Amit Shah - Feb. 28, 2011, 8:36 a.m.
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>
---
 hw/qdev-properties.c |    7 ++++++-
 qemu-char.h          |    1 +
 2 files changed, 7 insertions(+), 1 deletions(-)
Amit Shah - March 10, 2011, 6:09 a.m.
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

Patch

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