* [Qemu-devel] [PATCH (resend, rebased)] char: Prevent multiple devices opening same chardev
@ 2011-02-28 8:36 Amit Shah
2011-03-10 6:09 ` [Qemu-devel] " Amit Shah
0 siblings, 1 reply; 2+ messages in thread
From: Amit Shah @ 2011-02-28 8:36 UTC (permalink / raw)
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 <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(-)
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
^ permalink raw reply related [flat|nested] 2+ messages in thread* [Qemu-devel] Re: [PATCH (resend, rebased)] char: Prevent multiple devices opening same chardev
2011-02-28 8:36 [Qemu-devel] [PATCH (resend, rebased)] char: Prevent multiple devices opening same chardev Amit Shah
@ 2011-03-10 6:09 ` Amit Shah
0 siblings, 0 replies; 2+ messages in thread
From: Amit Shah @ 2011-03-10 6:09 UTC (permalink / raw)
To: qemu list; +Cc: Gerd Hoffmann, Markus Armbruster
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-03-10 6:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-28 8:36 [Qemu-devel] [PATCH (resend, rebased)] char: Prevent multiple devices opening same chardev Amit Shah
2011-03-10 6:09 ` [Qemu-devel] " Amit Shah
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).