2016-01-30 01:50:05 +08:00
|
|
|
#include "qemu/osdep.h"
|
2011-01-19 16:49:50 +08:00
|
|
|
#include "trace.h"
|
|
|
|
#include "ui/qemu-spice.h"
|
2013-04-08 22:55:25 +08:00
|
|
|
#include "sysemu/char.h"
|
2011-01-19 16:49:50 +08:00
|
|
|
#include <spice.h>
|
2012-12-05 23:15:34 +08:00
|
|
|
#include <spice/protocol.h>
|
2011-01-19 16:49:50 +08:00
|
|
|
|
|
|
|
|
|
|
|
typedef struct SpiceCharDriver {
|
|
|
|
CharDriverState* chr;
|
|
|
|
SpiceCharDeviceInstance sin;
|
|
|
|
bool active;
|
2013-04-05 17:30:22 +08:00
|
|
|
bool blocked;
|
2013-04-05 17:30:23 +08:00
|
|
|
const uint8_t *datapos;
|
|
|
|
int datalen;
|
2012-12-05 23:15:35 +08:00
|
|
|
QLIST_ENTRY(SpiceCharDriver) next;
|
2011-01-19 16:49:50 +08:00
|
|
|
} SpiceCharDriver;
|
|
|
|
|
2013-04-05 17:30:22 +08:00
|
|
|
typedef struct SpiceCharSource {
|
|
|
|
GSource source;
|
|
|
|
SpiceCharDriver *scd;
|
|
|
|
} SpiceCharSource;
|
|
|
|
|
2012-12-05 23:15:35 +08:00
|
|
|
static QLIST_HEAD(, SpiceCharDriver) spice_chars =
|
|
|
|
QLIST_HEAD_INITIALIZER(spice_chars);
|
|
|
|
|
2011-01-19 16:49:50 +08:00
|
|
|
static int vmc_write(SpiceCharDeviceInstance *sin, const uint8_t *buf, int len)
|
|
|
|
{
|
|
|
|
SpiceCharDriver *scd = container_of(sin, SpiceCharDriver, sin);
|
|
|
|
ssize_t out = 0;
|
|
|
|
ssize_t last_out;
|
|
|
|
uint8_t* p = (uint8_t*)buf;
|
|
|
|
|
|
|
|
while (len > 0) {
|
2013-04-05 17:30:24 +08:00
|
|
|
int can_write = qemu_chr_be_can_write(scd->chr);
|
|
|
|
last_out = MIN(len, can_write);
|
2012-12-05 23:15:32 +08:00
|
|
|
if (last_out <= 0) {
|
2011-01-19 16:49:50 +08:00
|
|
|
break;
|
|
|
|
}
|
2011-08-16 00:17:30 +08:00
|
|
|
qemu_chr_be_write(scd->chr, p, last_out);
|
2011-03-22 23:28:41 +08:00
|
|
|
out += last_out;
|
|
|
|
len -= last_out;
|
|
|
|
p += last_out;
|
2011-01-19 16:49:50 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
trace_spice_vmc_write(out, len + out);
|
|
|
|
return out;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int vmc_read(SpiceCharDeviceInstance *sin, uint8_t *buf, int len)
|
|
|
|
{
|
|
|
|
SpiceCharDriver *scd = container_of(sin, SpiceCharDriver, sin);
|
|
|
|
int bytes = MIN(len, scd->datalen);
|
|
|
|
|
|
|
|
if (bytes > 0) {
|
|
|
|
memcpy(buf, scd->datapos, bytes);
|
|
|
|
scd->datapos += bytes;
|
|
|
|
scd->datalen -= bytes;
|
|
|
|
assert(scd->datalen >= 0);
|
2013-04-05 17:30:22 +08:00
|
|
|
}
|
|
|
|
if (scd->datalen == 0) {
|
|
|
|
scd->datapos = 0;
|
|
|
|
scd->blocked = false;
|
2011-01-19 16:49:50 +08:00
|
|
|
}
|
|
|
|
trace_spice_vmc_read(bytes, len);
|
|
|
|
return bytes;
|
|
|
|
}
|
|
|
|
|
2012-12-05 23:15:34 +08:00
|
|
|
#if SPICE_SERVER_VERSION >= 0x000c02
|
|
|
|
static void vmc_event(SpiceCharDeviceInstance *sin, uint8_t event)
|
|
|
|
{
|
|
|
|
SpiceCharDriver *scd = container_of(sin, SpiceCharDriver, sin);
|
|
|
|
int chr_event;
|
|
|
|
|
|
|
|
switch (event) {
|
|
|
|
case SPICE_PORT_EVENT_BREAK:
|
|
|
|
chr_event = CHR_EVENT_BREAK;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
trace_spice_vmc_event(chr_event);
|
|
|
|
qemu_chr_be_event(scd->chr, chr_event);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2011-11-19 17:22:44 +08:00
|
|
|
static void vmc_state(SpiceCharDeviceInstance *sin, int connected)
|
|
|
|
{
|
|
|
|
SpiceCharDriver *scd = container_of(sin, SpiceCharDriver, sin);
|
|
|
|
|
2013-03-26 18:07:53 +08:00
|
|
|
if ((scd->chr->be_open && connected) ||
|
|
|
|
(!scd->chr->be_open && !connected)) {
|
2011-11-19 17:22:44 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
qemu_chr_be_event(scd->chr,
|
|
|
|
connected ? CHR_EVENT_OPENED : CHR_EVENT_CLOSED);
|
|
|
|
}
|
|
|
|
|
2011-01-19 16:49:50 +08:00
|
|
|
static SpiceCharDeviceInterface vmc_interface = {
|
|
|
|
.base.type = SPICE_INTERFACE_CHAR_DEVICE,
|
|
|
|
.base.description = "spice virtual channel char device",
|
|
|
|
.base.major_version = SPICE_INTERFACE_CHAR_DEVICE_MAJOR,
|
|
|
|
.base.minor_version = SPICE_INTERFACE_CHAR_DEVICE_MINOR,
|
2011-11-19 17:22:44 +08:00
|
|
|
.state = vmc_state,
|
2011-01-19 16:49:50 +08:00
|
|
|
.write = vmc_write,
|
|
|
|
.read = vmc_read,
|
2012-12-05 23:15:34 +08:00
|
|
|
#if SPICE_SERVER_VERSION >= 0x000c02
|
|
|
|
.event = vmc_event,
|
|
|
|
#endif
|
2015-05-05 22:58:56 +08:00
|
|
|
#if SPICE_SERVER_VERSION >= 0x000c06
|
|
|
|
.flags = SPICE_CHAR_DEVICE_NOTIFY_WRITABLE,
|
|
|
|
#endif
|
2011-01-19 16:49:50 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
static void vmc_register_interface(SpiceCharDriver *scd)
|
|
|
|
{
|
|
|
|
if (scd->active) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
scd->sin.base.sif = &vmc_interface.base;
|
|
|
|
qemu_spice_add_interface(&scd->sin.base);
|
|
|
|
scd->active = true;
|
|
|
|
trace_spice_vmc_register_interface(scd);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void vmc_unregister_interface(SpiceCharDriver *scd)
|
|
|
|
{
|
|
|
|
if (!scd->active) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
spice_server_remove_interface(&scd->sin.base);
|
|
|
|
scd->active = false;
|
|
|
|
trace_spice_vmc_unregister_interface(scd);
|
|
|
|
}
|
|
|
|
|
2013-04-05 17:30:22 +08:00
|
|
|
static gboolean spice_char_source_prepare(GSource *source, gint *timeout)
|
|
|
|
{
|
|
|
|
SpiceCharSource *src = (SpiceCharSource *)source;
|
|
|
|
|
|
|
|
*timeout = -1;
|
|
|
|
|
|
|
|
return !src->scd->blocked;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean spice_char_source_check(GSource *source)
|
|
|
|
{
|
|
|
|
SpiceCharSource *src = (SpiceCharSource *)source;
|
|
|
|
|
|
|
|
return !src->scd->blocked;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean spice_char_source_dispatch(GSource *source,
|
|
|
|
GSourceFunc callback, gpointer user_data)
|
|
|
|
{
|
|
|
|
GIOFunc func = (GIOFunc)callback;
|
|
|
|
|
|
|
|
return func(NULL, G_IO_OUT, user_data);
|
|
|
|
}
|
|
|
|
|
2015-02-07 05:43:14 +08:00
|
|
|
static GSourceFuncs SpiceCharSourceFuncs = {
|
2013-04-05 17:30:22 +08:00
|
|
|
.prepare = spice_char_source_prepare,
|
|
|
|
.check = spice_char_source_check,
|
|
|
|
.dispatch = spice_char_source_dispatch,
|
|
|
|
};
|
|
|
|
|
|
|
|
static GSource *spice_chr_add_watch(CharDriverState *chr, GIOCondition cond)
|
|
|
|
{
|
|
|
|
SpiceCharDriver *scd = chr->opaque;
|
|
|
|
SpiceCharSource *src;
|
|
|
|
|
2015-05-28 21:04:58 +08:00
|
|
|
assert(cond & G_IO_OUT);
|
2013-04-05 17:30:22 +08:00
|
|
|
|
|
|
|
src = (SpiceCharSource *)g_source_new(&SpiceCharSourceFuncs,
|
|
|
|
sizeof(SpiceCharSource));
|
|
|
|
src->scd = scd;
|
|
|
|
|
|
|
|
return (GSource *)src;
|
|
|
|
}
|
2011-01-19 16:49:50 +08:00
|
|
|
|
|
|
|
static int spice_chr_write(CharDriverState *chr, const uint8_t *buf, int len)
|
|
|
|
{
|
|
|
|
SpiceCharDriver *s = chr->opaque;
|
2013-04-05 17:30:22 +08:00
|
|
|
int read_bytes;
|
2011-01-19 16:49:50 +08:00
|
|
|
|
|
|
|
assert(s->datalen == 0);
|
2013-04-05 17:30:23 +08:00
|
|
|
s->datapos = buf;
|
2011-01-19 16:49:50 +08:00
|
|
|
s->datalen = len;
|
|
|
|
spice_server_char_device_wakeup(&s->sin);
|
2013-04-05 17:30:22 +08:00
|
|
|
read_bytes = len - s->datalen;
|
|
|
|
if (read_bytes != len) {
|
|
|
|
/* We'll get passed in the unconsumed data with the next call */
|
|
|
|
s->datalen = 0;
|
|
|
|
s->datapos = NULL;
|
|
|
|
s->blocked = true;
|
|
|
|
}
|
|
|
|
return read_bytes;
|
2011-01-19 16:49:50 +08:00
|
|
|
}
|
|
|
|
|
2016-10-22 17:53:02 +08:00
|
|
|
static void spice_chr_free(struct CharDriverState *chr)
|
2011-01-19 16:49:50 +08:00
|
|
|
{
|
|
|
|
SpiceCharDriver *s = chr->opaque;
|
|
|
|
|
|
|
|
vmc_unregister_interface(s);
|
2012-12-05 23:15:35 +08:00
|
|
|
QLIST_REMOVE(s, next);
|
2013-03-13 17:41:31 +08:00
|
|
|
|
|
|
|
g_free((char *)s->sin.subtype);
|
|
|
|
#if SPICE_SERVER_VERSION >= 0x000c02
|
|
|
|
g_free((char *)s->sin.portname);
|
|
|
|
#endif
|
2011-08-21 11:09:37 +08:00
|
|
|
g_free(s);
|
2011-01-19 16:49:50 +08:00
|
|
|
}
|
|
|
|
|
2014-01-11 07:20:24 +08:00
|
|
|
static void spice_vmc_set_fe_open(struct CharDriverState *chr, int fe_open)
|
2011-03-24 18:12:04 +08:00
|
|
|
{
|
|
|
|
SpiceCharDriver *s = chr->opaque;
|
2013-03-26 18:07:58 +08:00
|
|
|
if (fe_open) {
|
|
|
|
vmc_register_interface(s);
|
|
|
|
} else {
|
|
|
|
vmc_unregister_interface(s);
|
|
|
|
}
|
2011-03-24 18:12:04 +08:00
|
|
|
}
|
|
|
|
|
2014-01-11 07:20:24 +08:00
|
|
|
static void spice_port_set_fe_open(struct CharDriverState *chr, int fe_open)
|
|
|
|
{
|
|
|
|
#if SPICE_SERVER_VERSION >= 0x000c02
|
|
|
|
SpiceCharDriver *s = chr->opaque;
|
|
|
|
|
|
|
|
if (fe_open) {
|
|
|
|
spice_server_port_event(&s->sin, SPICE_PORT_EVENT_OPENED);
|
|
|
|
} else {
|
|
|
|
spice_server_port_event(&s->sin, SPICE_PORT_EVENT_CLOSED);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2011-01-19 16:49:50 +08:00
|
|
|
static void print_allowed_subtypes(void)
|
|
|
|
{
|
|
|
|
const char** psubtype;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
fprintf(stderr, "allowed names: ");
|
|
|
|
for(i=0, psubtype = spice_server_char_device_recognized_subtypes();
|
|
|
|
*psubtype != NULL; ++psubtype, ++i) {
|
|
|
|
if (i == 0) {
|
|
|
|
fprintf(stderr, "%s", *psubtype);
|
|
|
|
} else {
|
|
|
|
fprintf(stderr, ", %s", *psubtype);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
fprintf(stderr, "\n");
|
|
|
|
}
|
|
|
|
|
2015-05-05 22:58:56 +08:00
|
|
|
static void spice_chr_accept_input(struct CharDriverState *chr)
|
|
|
|
{
|
|
|
|
SpiceCharDriver *s = chr->opaque;
|
|
|
|
|
|
|
|
spice_server_char_device_wakeup(&s->sin);
|
|
|
|
}
|
|
|
|
|
2016-10-22 01:49:37 +08:00
|
|
|
static CharDriverState *chr_open(const CharDriver *driver,
|
|
|
|
const char *subtype,
|
qemu-char: add logfile facility to all chardev backends
Typically a UNIX guest OS will log boot messages to a serial
port in addition to any graphical console. An admin user
may also wish to use the serial port for an interactive
console. A virtualization management system may wish to
collect system boot messages by logging the serial port,
but also wish to allow admins interactive access.
Currently providing such a feature forces the mgmt app
to either provide 2 separate serial ports, one for
logging boot messages and one for interactive console
login, or to proxy all output via a separate service
that can multiplex the two needs onto one serial port.
While both are valid approaches, they each have their
own downsides. The former causes confusion and extra
setup work for VM admins creating disk images. The latter
places an extra burden to re-implement much of the QEMU
chardev backends logic in libvirt or even higher level
mgmt apps and adds extra hops in the data transfer path.
A simpler approach that is satisfactory for many use
cases is to allow the QEMU chardev backends to have a
"logfile" property associated with them.
$QEMU -chardev socket,host=localhost,port=9000,\
server=on,nowait,id-charserial0,\
logfile=/var/log/libvirt/qemu/test-serial0.log
-device isa-serial,chardev=charserial0,id=serial0
This patch introduces a 'ChardevCommon' struct which
is setup as a base for all the ChardevBackend types.
Ideally this would be registered directly as a base
against ChardevBackend, rather than each type, but
the QAPI generator doesn't allow that since the
ChardevBackend is a non-discriminated union. The
ChardevCommon struct provides the optional 'logfile'
parameter, as well as 'logappend' which controls
whether QEMU truncates or appends (default truncate).
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1452516281-27519-1-git-send-email-berrange@redhat.com>
[Call qemu_chr_parse_common if cd->parse is NULL. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-01-11 20:44:41 +08:00
|
|
|
ChardevCommon *backend,
|
|
|
|
Error **errp)
|
2011-01-19 16:49:50 +08:00
|
|
|
{
|
|
|
|
CharDriverState *chr;
|
|
|
|
SpiceCharDriver *s;
|
2012-12-05 23:15:33 +08:00
|
|
|
|
2016-10-22 01:49:37 +08:00
|
|
|
chr = qemu_chr_alloc(driver, backend, errp);
|
qemu-char: add logfile facility to all chardev backends
Typically a UNIX guest OS will log boot messages to a serial
port in addition to any graphical console. An admin user
may also wish to use the serial port for an interactive
console. A virtualization management system may wish to
collect system boot messages by logging the serial port,
but also wish to allow admins interactive access.
Currently providing such a feature forces the mgmt app
to either provide 2 separate serial ports, one for
logging boot messages and one for interactive console
login, or to proxy all output via a separate service
that can multiplex the two needs onto one serial port.
While both are valid approaches, they each have their
own downsides. The former causes confusion and extra
setup work for VM admins creating disk images. The latter
places an extra burden to re-implement much of the QEMU
chardev backends logic in libvirt or even higher level
mgmt apps and adds extra hops in the data transfer path.
A simpler approach that is satisfactory for many use
cases is to allow the QEMU chardev backends to have a
"logfile" property associated with them.
$QEMU -chardev socket,host=localhost,port=9000,\
server=on,nowait,id-charserial0,\
logfile=/var/log/libvirt/qemu/test-serial0.log
-device isa-serial,chardev=charserial0,id=serial0
This patch introduces a 'ChardevCommon' struct which
is setup as a base for all the ChardevBackend types.
Ideally this would be registered directly as a base
against ChardevBackend, rather than each type, but
the QAPI generator doesn't allow that since the
ChardevBackend is a non-discriminated union. The
ChardevCommon struct provides the optional 'logfile'
parameter, as well as 'logappend' which controls
whether QEMU truncates or appends (default truncate).
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1452516281-27519-1-git-send-email-berrange@redhat.com>
[Call qemu_chr_parse_common if cd->parse is NULL. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-01-11 20:44:41 +08:00
|
|
|
if (!chr) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2012-12-05 23:15:33 +08:00
|
|
|
s = g_malloc0(sizeof(SpiceCharDriver));
|
|
|
|
s->chr = chr;
|
|
|
|
s->active = false;
|
2013-03-13 17:41:31 +08:00
|
|
|
s->sin.subtype = g_strdup(subtype);
|
2012-12-05 23:15:33 +08:00
|
|
|
chr->opaque = s;
|
|
|
|
|
2012-12-05 23:15:35 +08:00
|
|
|
QLIST_INSERT_HEAD(&spice_chars, s, next);
|
|
|
|
|
2012-12-05 23:15:33 +08:00
|
|
|
return chr;
|
|
|
|
}
|
|
|
|
|
2016-10-22 01:49:37 +08:00
|
|
|
static CharDriverState *qemu_chr_open_spice_vmc(const CharDriver *driver,
|
|
|
|
const char *id,
|
2015-09-29 21:45:47 +08:00
|
|
|
ChardevBackend *backend,
|
|
|
|
ChardevReturn *ret,
|
2016-10-22 18:09:43 +08:00
|
|
|
bool *be_opened,
|
2015-09-29 21:45:47 +08:00
|
|
|
Error **errp)
|
2012-12-05 23:15:33 +08:00
|
|
|
{
|
qapi: Don't special-case simple union wrappers
Simple unions were carrying a special case that hid their 'data'
QMP member from the resulting C struct, via the hack method
QAPISchemaObjectTypeVariant.simple_union_type(). But by using
the work we started by unboxing flat union and alternate
branches, coupled with the ability to visit the members of an
implicit type, we can now expose the simple union's implicit
type in qapi-types.h:
| struct q_obj_ImageInfoSpecificQCow2_wrapper {
| ImageInfoSpecificQCow2 *data;
| };
|
| struct q_obj_ImageInfoSpecificVmdk_wrapper {
| ImageInfoSpecificVmdk *data;
| };
...
| struct ImageInfoSpecific {
| ImageInfoSpecificKind type;
| union { /* union tag is @type */
| void *data;
|- ImageInfoSpecificQCow2 *qcow2;
|- ImageInfoSpecificVmdk *vmdk;
|+ q_obj_ImageInfoSpecificQCow2_wrapper qcow2;
|+ q_obj_ImageInfoSpecificVmdk_wrapper vmdk;
| } u;
| };
Doing this removes asymmetry between QAPI's QMP side and its
C side (both sides now expose 'data'), and means that the
treatment of a simple union as sugar for a flat union is now
equivalent in both languages (previously the two approaches used
a different layer of dereferencing, where the simple union could
be converted to a flat union with equivalent C layout but
different {} on the wire, or to an equivalent QMP wire form
but with different C representation). Using the implicit type
also lets us get rid of the simple_union_type() hack.
Of course, now all clients of simple unions have to adjust from
using su->u.member to using su->u.member.data; while this touches
a number of files in the tree, some earlier cleanup patches
helped minimize the change to the initialization of a temporary
variable rather than every single member access. The generated
qapi-visit.c code is also affected by the layout change:
|@@ -7393,10 +7393,10 @@ void visit_type_ImageInfoSpecific_member
| }
| switch (obj->type) {
| case IMAGE_INFO_SPECIFIC_KIND_QCOW2:
|- visit_type_ImageInfoSpecificQCow2(v, "data", &obj->u.qcow2, &err);
|+ visit_type_q_obj_ImageInfoSpecificQCow2_wrapper_members(v, &obj->u.qcow2, &err);
| break;
| case IMAGE_INFO_SPECIFIC_KIND_VMDK:
|- visit_type_ImageInfoSpecificVmdk(v, "data", &obj->u.vmdk, &err);
|+ visit_type_q_obj_ImageInfoSpecificVmdk_wrapper_members(v, &obj->u.vmdk, &err);
| break;
| default:
| abort();
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1458254921-17042-13-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-03-18 06:48:37 +08:00
|
|
|
ChardevSpiceChannel *spicevmc = backend->u.spicevmc.data;
|
|
|
|
const char *type = spicevmc->type;
|
2012-12-05 23:15:33 +08:00
|
|
|
const char **psubtype = spice_server_char_device_recognized_subtypes();
|
qapi: Don't special-case simple union wrappers
Simple unions were carrying a special case that hid their 'data'
QMP member from the resulting C struct, via the hack method
QAPISchemaObjectTypeVariant.simple_union_type(). But by using
the work we started by unboxing flat union and alternate
branches, coupled with the ability to visit the members of an
implicit type, we can now expose the simple union's implicit
type in qapi-types.h:
| struct q_obj_ImageInfoSpecificQCow2_wrapper {
| ImageInfoSpecificQCow2 *data;
| };
|
| struct q_obj_ImageInfoSpecificVmdk_wrapper {
| ImageInfoSpecificVmdk *data;
| };
...
| struct ImageInfoSpecific {
| ImageInfoSpecificKind type;
| union { /* union tag is @type */
| void *data;
|- ImageInfoSpecificQCow2 *qcow2;
|- ImageInfoSpecificVmdk *vmdk;
|+ q_obj_ImageInfoSpecificQCow2_wrapper qcow2;
|+ q_obj_ImageInfoSpecificVmdk_wrapper vmdk;
| } u;
| };
Doing this removes asymmetry between QAPI's QMP side and its
C side (both sides now expose 'data'), and means that the
treatment of a simple union as sugar for a flat union is now
equivalent in both languages (previously the two approaches used
a different layer of dereferencing, where the simple union could
be converted to a flat union with equivalent C layout but
different {} on the wire, or to an equivalent QMP wire form
but with different C representation). Using the implicit type
also lets us get rid of the simple_union_type() hack.
Of course, now all clients of simple unions have to adjust from
using su->u.member to using su->u.member.data; while this touches
a number of files in the tree, some earlier cleanup patches
helped minimize the change to the initialization of a temporary
variable rather than every single member access. The generated
qapi-visit.c code is also affected by the layout change:
|@@ -7393,10 +7393,10 @@ void visit_type_ImageInfoSpecific_member
| }
| switch (obj->type) {
| case IMAGE_INFO_SPECIFIC_KIND_QCOW2:
|- visit_type_ImageInfoSpecificQCow2(v, "data", &obj->u.qcow2, &err);
|+ visit_type_q_obj_ImageInfoSpecificQCow2_wrapper_members(v, &obj->u.qcow2, &err);
| break;
| case IMAGE_INFO_SPECIFIC_KIND_VMDK:
|- visit_type_ImageInfoSpecificVmdk(v, "data", &obj->u.vmdk, &err);
|+ visit_type_q_obj_ImageInfoSpecificVmdk_wrapper_members(v, &obj->u.vmdk, &err);
| break;
| default:
| abort();
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1458254921-17042-13-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-03-18 06:48:37 +08:00
|
|
|
ChardevCommon *common = qapi_ChardevSpiceChannel_base(spicevmc);
|
2011-01-19 16:49:50 +08:00
|
|
|
|
2013-02-25 19:39:06 +08:00
|
|
|
for (; *psubtype != NULL; ++psubtype) {
|
|
|
|
if (strcmp(type, *psubtype) == 0) {
|
2011-01-19 16:49:50 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2013-02-25 19:39:06 +08:00
|
|
|
if (*psubtype == NULL) {
|
|
|
|
fprintf(stderr, "spice-qemu-char: unsupported type: %s\n", type);
|
2011-01-19 16:49:50 +08:00
|
|
|
print_allowed_subtypes();
|
Revert "qemu-char: Print strerror message on failure" and deps
The commit's purpose is laudable:
The only way for chardev drivers to communicate an error was to
return a NULL pointer, which resulted in an error message that
said _that_ something went wrong, but not _why_.
It attempts to achieve it by changing the interface to return 0/-errno
and update qemu_chr_open_opts() to use strerror() to display a more
helpful error message. Unfortunately, it has serious flaws:
1. Backends "socket" and "udp" return bogus error codes, because
qemu_chr_open_socket() and qemu_chr_open_udp() assume that
unix_listen_opts(), unix_connect_opts(), inet_listen_opts(),
inet_connect_opts() and inet_dgram_opts() fail with errno set
appropriately. That assumption is wrong, and the commit turns
unspecific error messages into misleading error messages. For
instance:
$ qemu-system-x86_64 -nodefaults -vnc :0 -chardev socket,id=bar,host=xxx
inet_connect: host and/or port not specified
chardev: opening backend "socket" failed: No such file or directory
ENOENT is what happens to be in my errno when the backend returns
-errno. Let's put ERANGE there just for giggles:
$ qemu-system-x86_64 -nodefaults -vnc :0 -chardev socket,id=bar,host=xxx -drive if=none,iops=99999999999999999999
inet_connect: host and/or port not specified
chardev: opening backend "socket" failed: Numerical result out of range
Worse: when errno happens to be zero, return -errno erroneously
signals success, and qemu_chr_new_from_opts() dies dereferencing
uninitialized chr. I observe this with "-serial unix:".
2. All qemu_chr_open_opts() knows about the error is an errno error
code. That's simply not enough for a decent message. For instance,
when inet_dgram() can't resolve the parameter host, which errno code
should it use? What if it can't resolve parameter localaddr?
Clue: many backends already report errors in their open methods.
Let's revert the flawed commit along with its dependencies, and fix up
the silent error paths instead.
This reverts commit 6e1db57b2ac9025c2443c665a0d9e78748637b26.
Conflicts:
console.c
hw/baum.c
qemu-char.c
This reverts commit aad04cd024f0c59f0b96f032cde2e24eb3abba6d.
The parts of commit db418a0a "Add stdio char device on windows" that
depend on the reverted change fixed up.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2012-02-07 22:09:08 +08:00
|
|
|
return NULL;
|
2011-01-19 16:49:50 +08:00
|
|
|
}
|
|
|
|
|
2016-10-22 18:09:43 +08:00
|
|
|
*be_opened = false;
|
2016-10-22 01:49:37 +08:00
|
|
|
return chr_open(driver, type, common, errp);
|
2011-01-19 16:49:50 +08:00
|
|
|
}
|
2012-12-05 23:15:34 +08:00
|
|
|
|
|
|
|
#if SPICE_SERVER_VERSION >= 0x000c02
|
2016-10-22 01:49:37 +08:00
|
|
|
static CharDriverState *qemu_chr_open_spice_port(const CharDriver *driver,
|
|
|
|
const char *id,
|
2015-09-29 21:45:47 +08:00
|
|
|
ChardevBackend *backend,
|
|
|
|
ChardevReturn *ret,
|
2016-10-22 18:09:43 +08:00
|
|
|
bool *be_opened,
|
2015-09-29 21:45:47 +08:00
|
|
|
Error **errp)
|
2012-12-05 23:15:34 +08:00
|
|
|
{
|
qapi: Don't special-case simple union wrappers
Simple unions were carrying a special case that hid their 'data'
QMP member from the resulting C struct, via the hack method
QAPISchemaObjectTypeVariant.simple_union_type(). But by using
the work we started by unboxing flat union and alternate
branches, coupled with the ability to visit the members of an
implicit type, we can now expose the simple union's implicit
type in qapi-types.h:
| struct q_obj_ImageInfoSpecificQCow2_wrapper {
| ImageInfoSpecificQCow2 *data;
| };
|
| struct q_obj_ImageInfoSpecificVmdk_wrapper {
| ImageInfoSpecificVmdk *data;
| };
...
| struct ImageInfoSpecific {
| ImageInfoSpecificKind type;
| union { /* union tag is @type */
| void *data;
|- ImageInfoSpecificQCow2 *qcow2;
|- ImageInfoSpecificVmdk *vmdk;
|+ q_obj_ImageInfoSpecificQCow2_wrapper qcow2;
|+ q_obj_ImageInfoSpecificVmdk_wrapper vmdk;
| } u;
| };
Doing this removes asymmetry between QAPI's QMP side and its
C side (both sides now expose 'data'), and means that the
treatment of a simple union as sugar for a flat union is now
equivalent in both languages (previously the two approaches used
a different layer of dereferencing, where the simple union could
be converted to a flat union with equivalent C layout but
different {} on the wire, or to an equivalent QMP wire form
but with different C representation). Using the implicit type
also lets us get rid of the simple_union_type() hack.
Of course, now all clients of simple unions have to adjust from
using su->u.member to using su->u.member.data; while this touches
a number of files in the tree, some earlier cleanup patches
helped minimize the change to the initialization of a temporary
variable rather than every single member access. The generated
qapi-visit.c code is also affected by the layout change:
|@@ -7393,10 +7393,10 @@ void visit_type_ImageInfoSpecific_member
| }
| switch (obj->type) {
| case IMAGE_INFO_SPECIFIC_KIND_QCOW2:
|- visit_type_ImageInfoSpecificQCow2(v, "data", &obj->u.qcow2, &err);
|+ visit_type_q_obj_ImageInfoSpecificQCow2_wrapper_members(v, &obj->u.qcow2, &err);
| break;
| case IMAGE_INFO_SPECIFIC_KIND_VMDK:
|- visit_type_ImageInfoSpecificVmdk(v, "data", &obj->u.vmdk, &err);
|+ visit_type_q_obj_ImageInfoSpecificVmdk_wrapper_members(v, &obj->u.vmdk, &err);
| break;
| default:
| abort();
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1458254921-17042-13-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-03-18 06:48:37 +08:00
|
|
|
ChardevSpicePort *spiceport = backend->u.spiceport.data;
|
|
|
|
const char *name = spiceport->fqdn;
|
|
|
|
ChardevCommon *common = qapi_ChardevSpicePort_base(spiceport);
|
2012-12-05 23:15:34 +08:00
|
|
|
CharDriverState *chr;
|
|
|
|
SpiceCharDriver *s;
|
|
|
|
|
|
|
|
if (name == NULL) {
|
|
|
|
fprintf(stderr, "spice-qemu-char: missing name parameter\n");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2016-10-22 01:49:37 +08:00
|
|
|
chr = chr_open(driver, "port", common, errp);
|
qemu-char: add logfile facility to all chardev backends
Typically a UNIX guest OS will log boot messages to a serial
port in addition to any graphical console. An admin user
may also wish to use the serial port for an interactive
console. A virtualization management system may wish to
collect system boot messages by logging the serial port,
but also wish to allow admins interactive access.
Currently providing such a feature forces the mgmt app
to either provide 2 separate serial ports, one for
logging boot messages and one for interactive console
login, or to proxy all output via a separate service
that can multiplex the two needs onto one serial port.
While both are valid approaches, they each have their
own downsides. The former causes confusion and extra
setup work for VM admins creating disk images. The latter
places an extra burden to re-implement much of the QEMU
chardev backends logic in libvirt or even higher level
mgmt apps and adds extra hops in the data transfer path.
A simpler approach that is satisfactory for many use
cases is to allow the QEMU chardev backends to have a
"logfile" property associated with them.
$QEMU -chardev socket,host=localhost,port=9000,\
server=on,nowait,id-charserial0,\
logfile=/var/log/libvirt/qemu/test-serial0.log
-device isa-serial,chardev=charserial0,id=serial0
This patch introduces a 'ChardevCommon' struct which
is setup as a base for all the ChardevBackend types.
Ideally this would be registered directly as a base
against ChardevBackend, rather than each type, but
the QAPI generator doesn't allow that since the
ChardevBackend is a non-discriminated union. The
ChardevCommon struct provides the optional 'logfile'
parameter, as well as 'logappend' which controls
whether QEMU truncates or appends (default truncate).
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1452516281-27519-1-git-send-email-berrange@redhat.com>
[Call qemu_chr_parse_common if cd->parse is NULL. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-01-11 20:44:41 +08:00
|
|
|
if (!chr) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2016-10-22 18:09:43 +08:00
|
|
|
*be_opened = false;
|
2012-12-05 23:15:34 +08:00
|
|
|
s = chr->opaque;
|
2013-03-13 17:41:31 +08:00
|
|
|
s->sin.portname = g_strdup(name);
|
2012-12-05 23:15:34 +08:00
|
|
|
|
|
|
|
return chr;
|
|
|
|
}
|
2012-12-05 23:15:36 +08:00
|
|
|
|
|
|
|
void qemu_spice_register_ports(void)
|
|
|
|
{
|
|
|
|
SpiceCharDriver *s;
|
|
|
|
|
|
|
|
QLIST_FOREACH(s, &spice_chars, next) {
|
|
|
|
if (s->sin.portname == NULL) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
vmc_register_interface(s);
|
|
|
|
}
|
|
|
|
}
|
2012-12-05 23:15:34 +08:00
|
|
|
#endif
|
2013-03-06 01:51:29 +08:00
|
|
|
|
2013-02-25 19:39:06 +08:00
|
|
|
static void qemu_chr_parse_spice_vmc(QemuOpts *opts, ChardevBackend *backend,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
const char *name = qemu_opt_get(opts, "name");
|
2016-02-20 08:19:31 +08:00
|
|
|
ChardevSpiceChannel *spicevmc;
|
2013-02-25 19:39:06 +08:00
|
|
|
|
|
|
|
if (name == NULL) {
|
|
|
|
error_setg(errp, "chardev: spice channel: no name given");
|
|
|
|
return;
|
|
|
|
}
|
qapi: Don't special-case simple union wrappers
Simple unions were carrying a special case that hid their 'data'
QMP member from the resulting C struct, via the hack method
QAPISchemaObjectTypeVariant.simple_union_type(). But by using
the work we started by unboxing flat union and alternate
branches, coupled with the ability to visit the members of an
implicit type, we can now expose the simple union's implicit
type in qapi-types.h:
| struct q_obj_ImageInfoSpecificQCow2_wrapper {
| ImageInfoSpecificQCow2 *data;
| };
|
| struct q_obj_ImageInfoSpecificVmdk_wrapper {
| ImageInfoSpecificVmdk *data;
| };
...
| struct ImageInfoSpecific {
| ImageInfoSpecificKind type;
| union { /* union tag is @type */
| void *data;
|- ImageInfoSpecificQCow2 *qcow2;
|- ImageInfoSpecificVmdk *vmdk;
|+ q_obj_ImageInfoSpecificQCow2_wrapper qcow2;
|+ q_obj_ImageInfoSpecificVmdk_wrapper vmdk;
| } u;
| };
Doing this removes asymmetry between QAPI's QMP side and its
C side (both sides now expose 'data'), and means that the
treatment of a simple union as sugar for a flat union is now
equivalent in both languages (previously the two approaches used
a different layer of dereferencing, where the simple union could
be converted to a flat union with equivalent C layout but
different {} on the wire, or to an equivalent QMP wire form
but with different C representation). Using the implicit type
also lets us get rid of the simple_union_type() hack.
Of course, now all clients of simple unions have to adjust from
using su->u.member to using su->u.member.data; while this touches
a number of files in the tree, some earlier cleanup patches
helped minimize the change to the initialization of a temporary
variable rather than every single member access. The generated
qapi-visit.c code is also affected by the layout change:
|@@ -7393,10 +7393,10 @@ void visit_type_ImageInfoSpecific_member
| }
| switch (obj->type) {
| case IMAGE_INFO_SPECIFIC_KIND_QCOW2:
|- visit_type_ImageInfoSpecificQCow2(v, "data", &obj->u.qcow2, &err);
|+ visit_type_q_obj_ImageInfoSpecificQCow2_wrapper_members(v, &obj->u.qcow2, &err);
| break;
| case IMAGE_INFO_SPECIFIC_KIND_VMDK:
|- visit_type_ImageInfoSpecificVmdk(v, "data", &obj->u.vmdk, &err);
|+ visit_type_q_obj_ImageInfoSpecificVmdk_wrapper_members(v, &obj->u.vmdk, &err);
| break;
| default:
| abort();
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1458254921-17042-13-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-03-18 06:48:37 +08:00
|
|
|
spicevmc = backend->u.spicevmc.data = g_new0(ChardevSpiceChannel, 1);
|
2016-02-20 08:19:31 +08:00
|
|
|
qemu_chr_parse_common(opts, qapi_ChardevSpiceChannel_base(spicevmc));
|
|
|
|
spicevmc->type = g_strdup(name);
|
2013-02-25 19:39:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void qemu_chr_parse_spice_port(QemuOpts *opts, ChardevBackend *backend,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
const char *name = qemu_opt_get(opts, "name");
|
2016-02-20 08:19:31 +08:00
|
|
|
ChardevSpicePort *spiceport;
|
2013-02-25 19:39:06 +08:00
|
|
|
|
|
|
|
if (name == NULL) {
|
|
|
|
error_setg(errp, "chardev: spice port: no name given");
|
|
|
|
return;
|
|
|
|
}
|
qapi: Don't special-case simple union wrappers
Simple unions were carrying a special case that hid their 'data'
QMP member from the resulting C struct, via the hack method
QAPISchemaObjectTypeVariant.simple_union_type(). But by using
the work we started by unboxing flat union and alternate
branches, coupled with the ability to visit the members of an
implicit type, we can now expose the simple union's implicit
type in qapi-types.h:
| struct q_obj_ImageInfoSpecificQCow2_wrapper {
| ImageInfoSpecificQCow2 *data;
| };
|
| struct q_obj_ImageInfoSpecificVmdk_wrapper {
| ImageInfoSpecificVmdk *data;
| };
...
| struct ImageInfoSpecific {
| ImageInfoSpecificKind type;
| union { /* union tag is @type */
| void *data;
|- ImageInfoSpecificQCow2 *qcow2;
|- ImageInfoSpecificVmdk *vmdk;
|+ q_obj_ImageInfoSpecificQCow2_wrapper qcow2;
|+ q_obj_ImageInfoSpecificVmdk_wrapper vmdk;
| } u;
| };
Doing this removes asymmetry between QAPI's QMP side and its
C side (both sides now expose 'data'), and means that the
treatment of a simple union as sugar for a flat union is now
equivalent in both languages (previously the two approaches used
a different layer of dereferencing, where the simple union could
be converted to a flat union with equivalent C layout but
different {} on the wire, or to an equivalent QMP wire form
but with different C representation). Using the implicit type
also lets us get rid of the simple_union_type() hack.
Of course, now all clients of simple unions have to adjust from
using su->u.member to using su->u.member.data; while this touches
a number of files in the tree, some earlier cleanup patches
helped minimize the change to the initialization of a temporary
variable rather than every single member access. The generated
qapi-visit.c code is also affected by the layout change:
|@@ -7393,10 +7393,10 @@ void visit_type_ImageInfoSpecific_member
| }
| switch (obj->type) {
| case IMAGE_INFO_SPECIFIC_KIND_QCOW2:
|- visit_type_ImageInfoSpecificQCow2(v, "data", &obj->u.qcow2, &err);
|+ visit_type_q_obj_ImageInfoSpecificQCow2_wrapper_members(v, &obj->u.qcow2, &err);
| break;
| case IMAGE_INFO_SPECIFIC_KIND_VMDK:
|- visit_type_ImageInfoSpecificVmdk(v, "data", &obj->u.vmdk, &err);
|+ visit_type_q_obj_ImageInfoSpecificVmdk_wrapper_members(v, &obj->u.vmdk, &err);
| break;
| default:
| abort();
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1458254921-17042-13-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-03-18 06:48:37 +08:00
|
|
|
spiceport = backend->u.spiceport.data = g_new0(ChardevSpicePort, 1);
|
2016-02-20 08:19:31 +08:00
|
|
|
qemu_chr_parse_common(opts, qapi_ChardevSpicePort_base(spiceport));
|
|
|
|
spiceport->fqdn = g_strdup(name);
|
2013-02-25 19:39:06 +08:00
|
|
|
}
|
|
|
|
|
2013-03-06 01:51:29 +08:00
|
|
|
static void register_types(void)
|
|
|
|
{
|
2016-10-21 21:07:45 +08:00
|
|
|
static const CharDriver vmc_driver = {
|
|
|
|
.kind = CHARDEV_BACKEND_KIND_SPICEVMC,
|
|
|
|
.parse = qemu_chr_parse_spice_vmc,
|
|
|
|
.create = qemu_chr_open_spice_vmc,
|
2016-10-22 01:49:37 +08:00
|
|
|
.chr_write = spice_chr_write,
|
|
|
|
.chr_add_watch = spice_chr_add_watch,
|
|
|
|
.chr_set_fe_open = spice_vmc_set_fe_open,
|
|
|
|
.chr_accept_input = spice_chr_accept_input,
|
|
|
|
.chr_free = spice_chr_free,
|
2016-10-21 21:07:45 +08:00
|
|
|
};
|
|
|
|
static const CharDriver port_driver = {
|
|
|
|
.kind = CHARDEV_BACKEND_KIND_SPICEPORT,
|
|
|
|
.parse = qemu_chr_parse_spice_port,
|
|
|
|
.create = qemu_chr_open_spice_port,
|
2016-10-22 01:49:37 +08:00
|
|
|
.chr_write = spice_chr_write,
|
|
|
|
.chr_add_watch = spice_chr_add_watch,
|
|
|
|
.chr_set_fe_open = spice_port_set_fe_open,
|
|
|
|
.chr_accept_input = spice_chr_accept_input,
|
|
|
|
.chr_free = spice_chr_free,
|
2016-10-21 21:07:45 +08:00
|
|
|
};
|
|
|
|
register_char_driver(&vmc_driver);
|
|
|
|
register_char_driver(&port_driver);
|
2013-03-06 01:51:29 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
type_init(register_types);
|