98b19252cf
This commit converts the virtio-console device to create a new
virtio-serial bus that can host console and generic serial ports. The
file hosting this code is now called virtio-serial-bus.c.
The virtio console is now a very simple qdev device that sits on the
virtio-serial-bus and communicates between the bus and qemu's chardevs.
This commit also includes a few changes to the virtio backing code for
pci and s390 to spawn the virtio-serial bus.
As a result of the qdev conversion, we get rid of a lot of legacy code.
The old-style way of instantiating a virtio console using
-virtioconsole ...
is maintained, but the new, preferred way is to use
-device virtio-serial -device virtconsole,chardev=...
With this commit, multiple devices as well as multiple ports with a
single device can be supported.
For multiple ports support, each port gets an IO vq pair. Since the
guest needs to know in advance how many vqs a particular device will
need, we have to set this number as a property of the virtio-serial
device and also as a config option.
In addition, we also spawn a pair of control IO vqs. This is an internal
channel meant for guest-host communication for things like port
open/close, sending port properties over to the guest, etc.
This commit is a part of a series of other commits to get the full
implementation of multiport support. Future commits will add other
support as well as ride on the savevm version that we bump up here.
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
112 lines
2.7 KiB
C
112 lines
2.7 KiB
C
/*
|
|
* Virtio Console and Generic Serial Port Devices
|
|
*
|
|
* Copyright Red Hat, Inc. 2009
|
|
*
|
|
* 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-char.h"
|
|
#include "virtio-serial.h"
|
|
|
|
typedef struct VirtConsole {
|
|
VirtIOSerialPort port;
|
|
CharDriverState *chr;
|
|
} VirtConsole;
|
|
|
|
|
|
/* Callback function that's called when the guest sends us data */
|
|
static size_t flush_buf(VirtIOSerialPort *port, const uint8_t *buf, size_t len)
|
|
{
|
|
VirtConsole *vcon = DO_UPCAST(VirtConsole, port, port);
|
|
ssize_t ret;
|
|
|
|
ret = qemu_chr_write(vcon->chr, buf, len);
|
|
|
|
return ret < 0 ? 0 : ret;
|
|
}
|
|
|
|
/* 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(&vcon->port);
|
|
}
|
|
|
|
/* 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;
|
|
|
|
virtio_serial_write(&vcon->port, buf, size);
|
|
}
|
|
|
|
static void chr_event(void *opaque, int event)
|
|
{
|
|
VirtConsole *vcon = opaque;
|
|
|
|
switch (event) {
|
|
case CHR_EVENT_OPENED: {
|
|
virtio_serial_open(&vcon->port);
|
|
break;
|
|
}
|
|
case CHR_EVENT_CLOSED:
|
|
virtio_serial_close(&vcon->port);
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* Virtio Console Ports */
|
|
static int virtconsole_initfn(VirtIOSerialDevice *dev)
|
|
{
|
|
VirtIOSerialPort *port = DO_UPCAST(VirtIOSerialPort, dev, &dev->qdev);
|
|
VirtConsole *vcon = DO_UPCAST(VirtConsole, port, port);
|
|
|
|
port->info = dev->info;
|
|
|
|
port->is_console = true;
|
|
|
|
if (vcon->chr) {
|
|
qemu_chr_add_handlers(vcon->chr, chr_can_read, chr_read, chr_event,
|
|
vcon);
|
|
port->info->have_data = flush_buf;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int virtconsole_exitfn(VirtIOSerialDevice *dev)
|
|
{
|
|
VirtIOSerialPort *port = DO_UPCAST(VirtIOSerialPort, dev, &dev->qdev);
|
|
VirtConsole *vcon = DO_UPCAST(VirtConsole, port, port);
|
|
|
|
if (vcon->chr) {
|
|
port->info->have_data = NULL;
|
|
qemu_chr_close(vcon->chr);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static VirtIOSerialPortInfo virtconsole_info = {
|
|
.qdev.name = "virtconsole",
|
|
.qdev.size = sizeof(VirtConsole),
|
|
.init = virtconsole_initfn,
|
|
.exit = virtconsole_exitfn,
|
|
.qdev.props = (Property[]) {
|
|
DEFINE_PROP_UINT8("is_console", VirtConsole, port.is_console, 1),
|
|
DEFINE_PROP_CHR("chardev", VirtConsole, chr),
|
|
DEFINE_PROP_END_OF_LIST(),
|
|
},
|
|
};
|
|
|
|
static void virtconsole_register(void)
|
|
{
|
|
virtio_serial_port_qdev_register(&virtconsole_info);
|
|
}
|
|
device_init(virtconsole_register)
|