diff options
author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2016-10-22 12:52:51 +0300 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-10-24 15:27:20 +0200 |
commit | becdfa00cfa2995e859ccefa4b7d72a72eb96581 (patch) | |
tree | 8973236c181dcde0dbcd9fd36d122fc7a4bac6d7 /hw/char/virtio-console.c | |
parent | ecb672d14f092f481000ac9cd9d7dc0500692eba (diff) | |
download | qemu-becdfa00cfa2995e859ccefa4b7d72a72eb96581.zip qemu-becdfa00cfa2995e859ccefa4b7d72a72eb96581.tar.gz qemu-becdfa00cfa2995e859ccefa4b7d72a72eb96581.tar.bz2 |
char: replace PROP_CHR with CharBackend
Store the property in a CharBackend instead of CharDriverState*. This
also replace systematically chr by chr.chr to access the
CharDriverState*. The following patches will replace it with calls to
qemu_chr_fe CharBackend functions.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20161022095318.17775-12-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/char/virtio-console.c')
-rw-r--r-- | hw/char/virtio-console.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c index d44c18c..a4730ba 100644 --- a/hw/char/virtio-console.c +++ b/hw/char/virtio-console.c @@ -24,7 +24,7 @@ typedef struct VirtConsole { VirtIOSerialPort parent_obj; - CharDriverState *chr; + CharBackend chr; guint watch; } VirtConsole; @@ -49,12 +49,12 @@ static ssize_t flush_buf(VirtIOSerialPort *port, VirtConsole *vcon = VIRTIO_CONSOLE(port); ssize_t ret; - if (!vcon->chr) { + if (!vcon->chr.chr) { /* If there's no backend, we can just say we consumed all data. */ return len; } - ret = qemu_chr_fe_write(vcon->chr, buf, len); + ret = qemu_chr_fe_write(vcon->chr.chr, buf, len); trace_virtio_console_flush_buf(port->id, len, ret); if (ret < len) { @@ -92,8 +92,8 @@ static ssize_t flush_buf(VirtIOSerialPort *port, if (!k->is_console) { virtio_serial_throttle_port(port, true); if (!vcon->watch) { - vcon->watch = qemu_chr_fe_add_watch(vcon->chr, - G_IO_OUT|G_IO_HUP, + vcon->watch = qemu_chr_fe_add_watch(vcon->chr.chr, + G_IO_OUT | G_IO_HUP, chr_write_unblocked, vcon); } } @@ -108,8 +108,8 @@ static void set_guest_connected(VirtIOSerialPort *port, int guest_connected) DeviceState *dev = DEVICE(port); VirtIOSerialPortClass *k = VIRTIO_SERIAL_PORT_GET_CLASS(port); - if (vcon->chr && !k->is_console) { - qemu_chr_fe_set_open(vcon->chr, guest_connected); + if (vcon->chr.chr && !k->is_console) { + qemu_chr_fe_set_open(vcon->chr.chr, guest_connected); } if (dev->id) { @@ -122,8 +122,8 @@ static void guest_writable(VirtIOSerialPort *port) { VirtConsole *vcon = VIRTIO_CONSOLE(port); - if (vcon->chr) { - qemu_chr_accept_input(vcon->chr); + if (vcon->chr.chr) { + qemu_chr_accept_input(vcon->chr.chr); } } @@ -177,7 +177,7 @@ static void virtconsole_realize(DeviceState *dev, Error **errp) return; } - if (vcon->chr) { + if (vcon->chr.chr) { /* * For consoles we don't block guest data transfer just * because nothing is connected - we'll just let it go @@ -188,13 +188,13 @@ static void virtconsole_realize(DeviceState *dev, Error **errp) * trigger open/close of the device */ if (k->is_console) { - vcon->chr->explicit_fe_open = 0; - qemu_chr_add_handlers(vcon->chr, chr_can_read, chr_read, + vcon->chr.chr->explicit_fe_open = 0; + qemu_chr_add_handlers(vcon->chr.chr, chr_can_read, chr_read, NULL, vcon); virtio_serial_open(port); } else { - vcon->chr->explicit_fe_open = 1; - qemu_chr_add_handlers(vcon->chr, chr_can_read, chr_read, + vcon->chr.chr->explicit_fe_open = 1; + qemu_chr_add_handlers(vcon->chr.chr, chr_can_read, chr_read, chr_event, vcon); } } |