2016-01-26 19:16:58 +01:00
|
|
|
#include "qemu/osdep.h"
|
include/qemu/osdep.h: Don't include qapi/error.h
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-03-14 09:01:28 +01:00
|
|
|
#include "qapi/error.h"
|
2016-01-19 21:51:44 +01:00
|
|
|
#include "qemu-common.h"
|
|
|
|
#include "cpu.h"
|
2013-02-04 15:40:22 +01:00
|
|
|
#include "hw/qdev.h"
|
2013-04-08 16:55:25 +02:00
|
|
|
#include "sysemu/char.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/ppc/spapr.h"
|
|
|
|
#include "hw/ppc/spapr_vio.h"
|
2011-04-01 06:15:21 +02:00
|
|
|
|
|
|
|
#define VTERM_BUFSIZE 16
|
|
|
|
|
|
|
|
typedef struct VIOsPAPRVTYDevice {
|
|
|
|
VIOsPAPRDevice sdev;
|
2016-10-22 11:52:51 +02:00
|
|
|
CharBackend chardev;
|
2011-04-01 06:15:21 +02:00
|
|
|
uint32_t in, out;
|
|
|
|
uint8_t buf[VTERM_BUFSIZE];
|
|
|
|
} VIOsPAPRVTYDevice;
|
|
|
|
|
2013-04-07 21:08:16 +02:00
|
|
|
#define TYPE_VIO_SPAPR_VTY_DEVICE "spapr-vty"
|
|
|
|
#define VIO_SPAPR_VTY_DEVICE(obj) \
|
|
|
|
OBJECT_CHECK(VIOsPAPRVTYDevice, (obj), TYPE_VIO_SPAPR_VTY_DEVICE)
|
|
|
|
|
2011-04-01 06:15:21 +02:00
|
|
|
static int vty_can_receive(void *opaque)
|
|
|
|
{
|
2013-04-07 21:08:16 +02:00
|
|
|
VIOsPAPRVTYDevice *dev = VIO_SPAPR_VTY_DEVICE(opaque);
|
2011-04-01 06:15:21 +02:00
|
|
|
|
|
|
|
return (dev->in - dev->out) < VTERM_BUFSIZE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void vty_receive(void *opaque, const uint8_t *buf, int size)
|
|
|
|
{
|
2013-04-07 21:08:16 +02:00
|
|
|
VIOsPAPRVTYDevice *dev = VIO_SPAPR_VTY_DEVICE(opaque);
|
2011-04-01 06:15:21 +02:00
|
|
|
int i;
|
|
|
|
|
2011-04-01 06:15:27 +02:00
|
|
|
if ((dev->in == dev->out) && size) {
|
|
|
|
/* toggle line to simulate edge interrupt */
|
2012-08-07 18:10:32 +02:00
|
|
|
qemu_irq_pulse(spapr_vio_qirq(&dev->sdev));
|
2011-04-01 06:15:27 +02:00
|
|
|
}
|
2011-04-01 06:15:21 +02:00
|
|
|
for (i = 0; i < size; i++) {
|
|
|
|
assert((dev->in - dev->out) < VTERM_BUFSIZE);
|
|
|
|
dev->buf[dev->in++ % VTERM_BUFSIZE] = buf[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int vty_getchars(VIOsPAPRDevice *sdev, uint8_t *buf, int max)
|
|
|
|
{
|
2013-04-07 21:08:16 +02:00
|
|
|
VIOsPAPRVTYDevice *dev = VIO_SPAPR_VTY_DEVICE(sdev);
|
2011-04-01 06:15:21 +02:00
|
|
|
int n = 0;
|
|
|
|
|
|
|
|
while ((n < max) && (dev->out != dev->in)) {
|
|
|
|
buf[n++] = dev->buf[dev->out++ % VTERM_BUFSIZE];
|
|
|
|
}
|
|
|
|
|
2016-10-22 11:52:51 +02:00
|
|
|
qemu_chr_accept_input(dev->chardev.chr);
|
2013-08-13 06:10:04 +02:00
|
|
|
|
2011-04-01 06:15:21 +02:00
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
|
|
|
void vty_putchars(VIOsPAPRDevice *sdev, uint8_t *buf, int len)
|
|
|
|
{
|
2013-04-07 21:08:16 +02:00
|
|
|
VIOsPAPRVTYDevice *dev = VIO_SPAPR_VTY_DEVICE(sdev);
|
2011-04-01 06:15:21 +02:00
|
|
|
|
2016-09-06 15:56:04 +02:00
|
|
|
/* XXX this blocks entire thread. Rewrite to use
|
|
|
|
* qemu_chr_fe_write and background I/O callbacks */
|
2016-10-22 11:52:51 +02:00
|
|
|
qemu_chr_fe_write_all(dev->chardev.chr, buf, len);
|
2011-04-01 06:15:21 +02:00
|
|
|
}
|
|
|
|
|
2015-02-27 11:52:17 +01:00
|
|
|
static void spapr_vty_realize(VIOsPAPRDevice *sdev, Error **errp)
|
2011-04-01 06:15:21 +02:00
|
|
|
{
|
2013-04-07 21:08:16 +02:00
|
|
|
VIOsPAPRVTYDevice *dev = VIO_SPAPR_VTY_DEVICE(sdev);
|
2011-04-01 06:15:21 +02:00
|
|
|
|
2016-10-22 11:52:51 +02:00
|
|
|
if (!dev->chardev.chr) {
|
2015-02-27 11:52:17 +01:00
|
|
|
error_setg(errp, "chardev property not set");
|
|
|
|
return;
|
2011-11-13 18:18:59 +01:00
|
|
|
}
|
|
|
|
|
2016-10-22 11:52:51 +02:00
|
|
|
qemu_chr_add_handlers(dev->chardev.chr, vty_can_receive,
|
2011-04-01 06:15:21 +02:00
|
|
|
vty_receive, NULL, dev);
|
|
|
|
}
|
|
|
|
|
2011-11-13 18:19:01 +01:00
|
|
|
/* Forward declaration */
|
2015-07-02 08:23:04 +02:00
|
|
|
static target_ulong h_put_term_char(PowerPCCPU *cpu, sPAPRMachineState *spapr,
|
2011-04-01 06:15:21 +02:00
|
|
|
target_ulong opcode, target_ulong *args)
|
|
|
|
{
|
|
|
|
target_ulong reg = args[0];
|
|
|
|
target_ulong len = args[1];
|
|
|
|
target_ulong char0_7 = args[2];
|
|
|
|
target_ulong char8_15 = args[3];
|
2011-11-13 18:19:01 +01:00
|
|
|
VIOsPAPRDevice *sdev;
|
2011-04-01 06:15:21 +02:00
|
|
|
uint8_t buf[16];
|
|
|
|
|
2011-11-13 18:19:01 +01:00
|
|
|
sdev = vty_lookup(spapr, reg);
|
2011-04-01 06:15:21 +02:00
|
|
|
if (!sdev) {
|
|
|
|
return H_PARAMETER;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (len > 16) {
|
|
|
|
return H_PARAMETER;
|
|
|
|
}
|
|
|
|
|
|
|
|
*((uint64_t *)buf) = cpu_to_be64(char0_7);
|
|
|
|
*((uint64_t *)buf + 1) = cpu_to_be64(char8_15);
|
|
|
|
|
|
|
|
vty_putchars(sdev, buf, len);
|
|
|
|
|
|
|
|
return H_SUCCESS;
|
|
|
|
}
|
|
|
|
|
2015-07-02 08:23:04 +02:00
|
|
|
static target_ulong h_get_term_char(PowerPCCPU *cpu, sPAPRMachineState *spapr,
|
2011-04-01 06:15:21 +02:00
|
|
|
target_ulong opcode, target_ulong *args)
|
|
|
|
{
|
|
|
|
target_ulong reg = args[0];
|
|
|
|
target_ulong *len = args + 0;
|
|
|
|
target_ulong *char0_7 = args + 1;
|
|
|
|
target_ulong *char8_15 = args + 2;
|
2011-11-13 18:19:01 +01:00
|
|
|
VIOsPAPRDevice *sdev;
|
2011-04-01 06:15:21 +02:00
|
|
|
uint8_t buf[16];
|
|
|
|
|
2011-11-13 18:19:01 +01:00
|
|
|
sdev = vty_lookup(spapr, reg);
|
2011-04-01 06:15:21 +02:00
|
|
|
if (!sdev) {
|
|
|
|
return H_PARAMETER;
|
|
|
|
}
|
|
|
|
|
|
|
|
*len = vty_getchars(sdev, buf, sizeof(buf));
|
|
|
|
if (*len < 16) {
|
|
|
|
memset(buf + *len, 0, 16 - *len);
|
|
|
|
}
|
|
|
|
|
|
|
|
*char0_7 = be64_to_cpu(*((uint64_t *)buf));
|
|
|
|
*char8_15 = be64_to_cpu(*((uint64_t *)buf + 1));
|
|
|
|
|
|
|
|
return H_SUCCESS;
|
|
|
|
}
|
|
|
|
|
2012-04-25 19:55:41 +02:00
|
|
|
void spapr_vty_create(VIOsPAPRBus *bus, CharDriverState *chardev)
|
2011-04-01 06:15:21 +02:00
|
|
|
{
|
|
|
|
DeviceState *dev;
|
|
|
|
|
|
|
|
dev = qdev_create(&bus->bus, "spapr-vty");
|
|
|
|
qdev_prop_set_chr(dev, "chardev", chardev);
|
|
|
|
qdev_init_nofail(dev);
|
|
|
|
}
|
|
|
|
|
2011-12-15 23:31:06 +01:00
|
|
|
static Property spapr_vty_properties[] = {
|
2012-06-27 06:50:44 +02:00
|
|
|
DEFINE_SPAPR_PROPERTIES(VIOsPAPRVTYDevice, sdev),
|
2011-12-15 23:31:06 +01:00
|
|
|
DEFINE_PROP_CHR("chardev", VIOsPAPRVTYDevice, chardev),
|
|
|
|
DEFINE_PROP_END_OF_LIST(),
|
|
|
|
};
|
|
|
|
|
2013-07-18 21:32:57 +02:00
|
|
|
static const VMStateDescription vmstate_spapr_vty = {
|
|
|
|
.name = "spapr_vty",
|
|
|
|
.version_id = 1,
|
|
|
|
.minimum_version_id = 1,
|
2014-04-16 15:24:04 +02:00
|
|
|
.fields = (VMStateField[]) {
|
2013-07-18 21:32:57 +02:00
|
|
|
VMSTATE_SPAPR_VIO(sdev, VIOsPAPRVTYDevice),
|
|
|
|
|
|
|
|
VMSTATE_UINT32(in, VIOsPAPRVTYDevice),
|
|
|
|
VMSTATE_UINT32(out, VIOsPAPRVTYDevice),
|
|
|
|
VMSTATE_BUFFER(buf, VIOsPAPRVTYDevice),
|
|
|
|
VMSTATE_END_OF_LIST()
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
2011-12-15 23:31:06 +01:00
|
|
|
static void spapr_vty_class_init(ObjectClass *klass, void *data)
|
|
|
|
{
|
2011-12-08 04:34:16 +01:00
|
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
2011-12-15 23:31:06 +01:00
|
|
|
VIOsPAPRDeviceClass *k = VIO_SPAPR_DEVICE_CLASS(klass);
|
|
|
|
|
2015-02-27 11:52:17 +01:00
|
|
|
k->realize = spapr_vty_realize;
|
2011-12-15 23:31:06 +01:00
|
|
|
k->dt_name = "vty";
|
|
|
|
k->dt_type = "serial";
|
|
|
|
k->dt_compatible = "hvterm1";
|
2013-10-11 05:08:20 +02:00
|
|
|
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
|
2011-12-08 04:34:16 +01:00
|
|
|
dc->props = spapr_vty_properties;
|
2013-07-18 21:32:57 +02:00
|
|
|
dc->vmsd = &vmstate_spapr_vty;
|
2011-12-15 23:31:06 +01:00
|
|
|
}
|
|
|
|
|
2013-01-10 16:19:07 +01:00
|
|
|
static const TypeInfo spapr_vty_info = {
|
2013-04-07 21:08:16 +02:00
|
|
|
.name = TYPE_VIO_SPAPR_VTY_DEVICE,
|
2011-12-08 04:34:16 +01:00
|
|
|
.parent = TYPE_VIO_SPAPR_DEVICE,
|
|
|
|
.instance_size = sizeof(VIOsPAPRVTYDevice),
|
|
|
|
.class_init = spapr_vty_class_init,
|
2011-04-01 06:15:21 +02:00
|
|
|
};
|
|
|
|
|
2011-12-13 05:24:34 +01:00
|
|
|
VIOsPAPRDevice *spapr_vty_get_default(VIOsPAPRBus *bus)
|
2011-12-12 19:24:33 +01:00
|
|
|
{
|
|
|
|
VIOsPAPRDevice *sdev, *selected;
|
2011-12-23 22:34:39 +01:00
|
|
|
BusChild *kid;
|
2011-12-12 19:24:33 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* To avoid the console bouncing around we want one VTY to be
|
|
|
|
* the "default". We haven't really got anything to go on, so
|
|
|
|
* arbitrarily choose the one with the lowest reg value.
|
|
|
|
*/
|
|
|
|
|
|
|
|
selected = NULL;
|
2011-12-23 22:34:39 +01:00
|
|
|
QTAILQ_FOREACH(kid, &bus->bus.children, sibling) {
|
|
|
|
DeviceState *iter = kid->child;
|
|
|
|
|
2011-12-12 19:24:33 +01:00
|
|
|
/* Only look at VTY devices */
|
2015-07-02 08:23:25 +02:00
|
|
|
if (!object_dynamic_cast(OBJECT(iter), TYPE_VIO_SPAPR_VTY_DEVICE)) {
|
2011-12-12 19:24:33 +01:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2013-04-07 21:08:16 +02:00
|
|
|
sdev = VIO_SPAPR_DEVICE(iter);
|
2011-12-12 19:24:33 +01:00
|
|
|
|
|
|
|
/* First VTY we've found, so it is selected for now */
|
|
|
|
if (!selected) {
|
|
|
|
selected = sdev;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Choose VTY with lowest reg value */
|
|
|
|
if (sdev->reg < selected->reg) {
|
|
|
|
selected = sdev;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return selected;
|
|
|
|
}
|
|
|
|
|
2015-07-02 08:23:04 +02:00
|
|
|
VIOsPAPRDevice *vty_lookup(sPAPRMachineState *spapr, target_ulong reg)
|
2011-11-13 18:19:01 +01:00
|
|
|
{
|
|
|
|
VIOsPAPRDevice *sdev;
|
|
|
|
|
|
|
|
sdev = spapr_vio_find_by_reg(spapr->vio_bus, reg);
|
|
|
|
if (!sdev && reg == 0) {
|
|
|
|
/* Hack for kernel early debug, which always specifies reg==0.
|
2011-12-12 19:24:33 +01:00
|
|
|
* We search all VIO devices, and grab the vty with the lowest
|
|
|
|
* reg. This attempts to mimic existing PowerVM behaviour
|
2011-11-13 18:19:01 +01:00
|
|
|
* (early debug does work there, despite having no vty with
|
|
|
|
* reg==0. */
|
2011-12-12 19:24:33 +01:00
|
|
|
return spapr_vty_get_default(spapr->vio_bus);
|
2011-11-13 18:19:01 +01:00
|
|
|
}
|
|
|
|
|
2015-07-02 08:23:24 +02:00
|
|
|
if (!object_dynamic_cast(OBJECT(sdev), TYPE_VIO_SPAPR_VTY_DEVICE)) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2011-11-13 18:19:01 +01:00
|
|
|
return sdev;
|
|
|
|
}
|
|
|
|
|
2012-02-09 15:20:55 +01:00
|
|
|
static void spapr_vty_register_types(void)
|
2011-04-01 06:15:21 +02:00
|
|
|
{
|
2011-12-12 19:24:28 +01:00
|
|
|
spapr_register_hypercall(H_PUT_TERM_CHAR, h_put_term_char);
|
|
|
|
spapr_register_hypercall(H_GET_TERM_CHAR, h_get_term_char);
|
2011-12-08 04:34:16 +01:00
|
|
|
type_register_static(&spapr_vty_info);
|
2011-04-01 06:15:21 +02:00
|
|
|
}
|
2012-02-09 15:20:55 +01:00
|
|
|
|
|
|
|
type_init(spapr_vty_register_types)
|