bce6261eb2
The virtio-console.c file handles both serial consoles and interactive consoles, since they're backed by the same device model. Since serial devices are expected to be reliable and need to notify the guest when the backend is opened or closed, the virtio-console.c file wires up support for chardev events. This affects both serial consoles and interactive consoles, using a network connection based chardev backend such as 'socket', but not when using a PTY based backend or plain 'file' backends. When the host side is not connected the handle_output() method in virtio-serial-bus.c will drop any data sent by the guest, before it even reaches the virtio-console.c code. This means that if the chardev has a logfile configured, the data will never get logged. Consider for example, configuring a x86_64 guest with a plain UART serial port -chardev socket,id=charserial1,host=127.0.0.1,port=9001,server,nowait,logfile=console1.log,logappend=on -device isa-serial,chardev=charserial1,id=serial1 vs a s390 guest which has to use the virtio-console port -chardev socket,id=charconsole1,host=127.0.0.1,port=9000,server,nowait,logfile=console2.log,logappend=on -device virtconsole,chardev=charconsole1,id=console1 The isa-serial one gets data written to the log regardless of whether a client is connected, while the virtioconsole one only gets data written to the log when a client is connected. There is no need for virtio-serial-bus.c to aggressively drop the data for console devices, as the chardev code is prefectly capable of discarding the data itself. So this patch changes virtconsole devices so that they are always marked as having the host side open. This ensures that the guest OS will always send any data it has (Linux virtio-console hvc driver actually ignores the host open state and sends data regardless, but we should not rely on that), and also prevents the virtio-serial-bus code prematurely discarding data. The behaviour of virtserialport devices is *not* changed, only virtconsole, because for the former, it is important that the guest OSknow exactly when the host side is opened / closed so it can do any protocol re-negotiation that may be required. Fixes bug: https://bugs.launchpad.net/qemu/+bug/1599214 Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Daniel P. Berrange <berrange@redhat.com> Message-Id: <1470241360-3574-2-git-send-email-berrange@redhat.com> Signed-off-by: Amit Shah <amit.shah@redhat.com>
236 lines
6.7 KiB
C
236 lines
6.7 KiB
C
/*
|
|
* Virtio Console and Generic Serial Port Devices
|
|
*
|
|
* Copyright Red Hat, Inc. 2009, 2010
|
|
*
|
|
* Authors:
|
|
* Amit Shah <amit.shah@redhat.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2. See
|
|
* the COPYING file in the top-level directory.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "sysemu/char.h"
|
|
#include "qemu/error-report.h"
|
|
#include "trace.h"
|
|
#include "hw/virtio/virtio-serial.h"
|
|
#include "qapi-event.h"
|
|
|
|
#define TYPE_VIRTIO_CONSOLE_SERIAL_PORT "virtserialport"
|
|
#define VIRTIO_CONSOLE(obj) \
|
|
OBJECT_CHECK(VirtConsole, (obj), TYPE_VIRTIO_CONSOLE_SERIAL_PORT)
|
|
|
|
typedef struct VirtConsole {
|
|
VirtIOSerialPort parent_obj;
|
|
|
|
CharDriverState *chr;
|
|
guint watch;
|
|
} VirtConsole;
|
|
|
|
/*
|
|
* Callback function that's called from chardevs when backend becomes
|
|
* writable.
|
|
*/
|
|
static gboolean chr_write_unblocked(GIOChannel *chan, GIOCondition cond,
|
|
void *opaque)
|
|
{
|
|
VirtConsole *vcon = opaque;
|
|
|
|
vcon->watch = 0;
|
|
virtio_serial_throttle_port(VIRTIO_SERIAL_PORT(vcon), false);
|
|
return FALSE;
|
|
}
|
|
|
|
/* Callback function that's called when the guest sends us data */
|
|
static ssize_t flush_buf(VirtIOSerialPort *port,
|
|
const uint8_t *buf, ssize_t len)
|
|
{
|
|
VirtConsole *vcon = VIRTIO_CONSOLE(port);
|
|
ssize_t ret;
|
|
|
|
if (!vcon->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);
|
|
trace_virtio_console_flush_buf(port->id, len, ret);
|
|
|
|
if (ret < len) {
|
|
VirtIOSerialPortClass *k = VIRTIO_SERIAL_PORT_GET_CLASS(port);
|
|
|
|
/*
|
|
* Ideally we'd get a better error code than just -1, but
|
|
* that's what the chardev interface gives us right now. If
|
|
* we had a finer-grained message, like -EPIPE, we could close
|
|
* this connection.
|
|
*/
|
|
if (ret < 0)
|
|
ret = 0;
|
|
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,
|
|
chr_write_unblocked, vcon);
|
|
}
|
|
}
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
/* Callback function that's called when the guest opens/closes the port */
|
|
static void set_guest_connected(VirtIOSerialPort *port, int guest_connected)
|
|
{
|
|
VirtConsole *vcon = VIRTIO_CONSOLE(port);
|
|
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 (dev->id) {
|
|
qapi_event_send_vserport_change(dev->id, guest_connected,
|
|
&error_abort);
|
|
}
|
|
}
|
|
|
|
static void guest_writable(VirtIOSerialPort *port)
|
|
{
|
|
VirtConsole *vcon = VIRTIO_CONSOLE(port);
|
|
|
|
if (vcon->chr) {
|
|
qemu_chr_accept_input(vcon->chr);
|
|
}
|
|
}
|
|
|
|
/* Readiness of the guest to accept data on a port */
|
|
static int chr_can_read(void *opaque)
|
|
{
|
|
VirtConsole *vcon = opaque;
|
|
|
|
return virtio_serial_guest_ready(VIRTIO_SERIAL_PORT(vcon));
|
|
}
|
|
|
|
/* Send data from a char device over to the guest */
|
|
static void chr_read(void *opaque, const uint8_t *buf, int size)
|
|
{
|
|
VirtConsole *vcon = opaque;
|
|
VirtIOSerialPort *port = VIRTIO_SERIAL_PORT(vcon);
|
|
|
|
trace_virtio_console_chr_read(port->id, size);
|
|
virtio_serial_write(port, buf, size);
|
|
}
|
|
|
|
static void chr_event(void *opaque, int event)
|
|
{
|
|
VirtConsole *vcon = opaque;
|
|
VirtIOSerialPort *port = VIRTIO_SERIAL_PORT(vcon);
|
|
|
|
trace_virtio_console_chr_event(port->id, event);
|
|
switch (event) {
|
|
case CHR_EVENT_OPENED:
|
|
virtio_serial_open(port);
|
|
break;
|
|
case CHR_EVENT_CLOSED:
|
|
if (vcon->watch) {
|
|
g_source_remove(vcon->watch);
|
|
vcon->watch = 0;
|
|
}
|
|
virtio_serial_close(port);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void virtconsole_realize(DeviceState *dev, Error **errp)
|
|
{
|
|
VirtIOSerialPort *port = VIRTIO_SERIAL_PORT(dev);
|
|
VirtConsole *vcon = VIRTIO_CONSOLE(dev);
|
|
VirtIOSerialPortClass *k = VIRTIO_SERIAL_PORT_GET_CLASS(dev);
|
|
|
|
if (port->id == 0 && !k->is_console) {
|
|
error_setg(errp, "Port number 0 on virtio-serial devices reserved "
|
|
"for virtconsole devices for backward compatibility.");
|
|
return;
|
|
}
|
|
|
|
if (vcon->chr) {
|
|
/*
|
|
* For consoles we don't block guest data transfer just
|
|
* because nothing is connected - we'll just let it go
|
|
* whetherever the chardev wants - /dev/null probably.
|
|
*
|
|
* For serial ports we need 100% reliable data transfer
|
|
* so we use the opened/closed signals from chardev to
|
|
* 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,
|
|
NULL, vcon);
|
|
virtio_serial_open(port);
|
|
} else {
|
|
vcon->chr->explicit_fe_open = 1;
|
|
qemu_chr_add_handlers(vcon->chr, chr_can_read, chr_read,
|
|
chr_event, vcon);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void virtconsole_unrealize(DeviceState *dev, Error **errp)
|
|
{
|
|
VirtConsole *vcon = VIRTIO_CONSOLE(dev);
|
|
|
|
if (vcon->watch) {
|
|
g_source_remove(vcon->watch);
|
|
}
|
|
}
|
|
|
|
static void virtconsole_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
VirtIOSerialPortClass *k = VIRTIO_SERIAL_PORT_CLASS(klass);
|
|
|
|
k->is_console = true;
|
|
}
|
|
|
|
static const TypeInfo virtconsole_info = {
|
|
.name = "virtconsole",
|
|
.parent = TYPE_VIRTIO_CONSOLE_SERIAL_PORT,
|
|
.class_init = virtconsole_class_init,
|
|
};
|
|
|
|
static Property virtserialport_properties[] = {
|
|
DEFINE_PROP_CHR("chardev", VirtConsole, chr),
|
|
DEFINE_PROP_END_OF_LIST(),
|
|
};
|
|
|
|
static void virtserialport_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
VirtIOSerialPortClass *k = VIRTIO_SERIAL_PORT_CLASS(klass);
|
|
|
|
k->realize = virtconsole_realize;
|
|
k->unrealize = virtconsole_unrealize;
|
|
k->have_data = flush_buf;
|
|
k->set_guest_connected = set_guest_connected;
|
|
k->guest_writable = guest_writable;
|
|
dc->props = virtserialport_properties;
|
|
}
|
|
|
|
static const TypeInfo virtserialport_info = {
|
|
.name = TYPE_VIRTIO_CONSOLE_SERIAL_PORT,
|
|
.parent = TYPE_VIRTIO_SERIAL_PORT,
|
|
.instance_size = sizeof(VirtConsole),
|
|
.class_init = virtserialport_class_init,
|
|
};
|
|
|
|
static void virtconsole_register_types(void)
|
|
{
|
|
type_register_static(&virtserialport_info);
|
|
type_register_static(&virtconsole_info);
|
|
}
|
|
|
|
type_init(virtconsole_register_types)
|