summary refs log tree commit diff stats
path: root/hw/sh_serial.c
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2013-03-27 20:29:40 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2013-04-04 19:21:25 -0500
commit456d60692310e7ac25cf822cc1e98192ad636ece (patch)
tree864cec4d85706b465de5c1e23b9f01417b5eff80 /hw/sh_serial.c
parent44c473decd4de5559487430f876de53c607b1e9d (diff)
downloadfocaccia-qemu-456d60692310e7ac25cf822cc1e98192ad636ece.tar.gz
focaccia-qemu-456d60692310e7ac25cf822cc1e98192ad636ece.zip
qemu-char: Call fe_claim / fe_release when not using qdev chr properties
chardev-frontends need to explictly check, increase and decrement the
avail_connections "property" of the chardev when they are not using a
qdev-chardev-property for the chardev.

This fixes things like:
qemu-kvm -chardev stdio,id=foo -device isa-serial,chardev=foo \
  -mon chardev=foo

Working, where they should fail. Most of the changes here are due to
old hardware emulation code which is using serial_hds directly rather then
a qdev-chardev-property.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Message-id: 1364412581-3672-3-git-send-email-hdegoede@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/sh_serial.c')
-rw-r--r--hw/sh_serial.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/sh_serial.c b/hw/sh_serial.c
index 40e797c5a2..462969557c 100644
--- a/hw/sh_serial.c
+++ b/hw/sh_serial.c
@@ -396,9 +396,11 @@ void sh_serial_init(MemoryRegion *sysmem,
 
     s->chr = chr;
 
-    if (chr)
+    if (chr) {
+        qemu_chr_fe_claim_no_fail(chr);
         qemu_chr_add_handlers(chr, sh_serial_can_receive1, sh_serial_receive1,
 			      sh_serial_event, s);
+    }
 
     s->eri = eri_source;
     s->rxi = rxi_source;