Merge remote-tracking branch 'public/tags/tracing-pull-request' into staging

[qemu.git] / hw / char / etraxfs_ser.c

diff --git a/hw/char/etraxfs_ser.c b/hw/char/etraxfs_ser.c
index 99c4801ba6434009b5854810b1353bdc6c9b9909..54383878e03d9ed880e0379877d0ef4667da1aae 100644 (file)
--- a/hw/char/etraxfs_ser.c
+++ b/hw/char/etraxfs_ser.c
@@ -128,7 +128,7 @@ ser_write(void *opaque, hwaddr addr,
         case RW_DOUT:
             /* XXX this blocks entire thread. Rewrite to use
              * qemu_chr_fe_write and background I/O callbacks */
         case RW_DOUT:
             /* XXX this blocks entire thread. Rewrite to use
              * qemu_chr_fe_write and background I/O callbacks */

-            qemu_chr_fe_write_all(s->chr.chr, &ch, 1);
+            qemu_chr_fe_write_all(&s->chr, &ch, 1);

             s->regs[R_INTR] |= 3;
             s->pending_tx = 1;
             s->regs[addr] = value;
             s->regs[R_INTR] |= 3;
             s->pending_tx = 1;
             s->regs[addr] = value;


@@ -231,11 +231,9 @@ static void etraxfs_ser_realize(DeviceState *dev, Error **errp)
 {
     ETRAXSerial *s = ETRAX_SERIAL(dev);
 
 {
     ETRAXSerial *s = ETRAX_SERIAL(dev);
 

-    if (s->chr.chr) {
-        qemu_chr_add_handlers(s->chr.chr,
-                              serial_can_receive, serial_receive,
-                              serial_event, s);
-    }
+    qemu_chr_fe_set_handlers(&s->chr,
+                             serial_can_receive, serial_receive,
+                             serial_event, s, NULL, true);

 }
 
 static void etraxfs_ser_class_init(ObjectClass *klass, void *data)
 }
 
 static void etraxfs_ser_class_init(ObjectClass *klass, void *data)