2016-01-29 17:50:05 +00:00
|
|
|
#include "qemu/osdep.h"
|
2017-01-25 16:14:15 +00:00
|
|
|
#include "trace-root.h"
|
2011-01-19 08:49:50 +00:00
|
|
|
#include "ui/qemu-spice.h"
|
2017-01-26 13:19:46 +00:00
|
|
|
#include "chardev/char.h"
|
2016-11-30 13:55:20 +00:00
|
|
|
#include "qemu/error-report.h"
|
2011-01-19 08:49:50 +00:00
|
|
|
#include <spice.h>
|
2012-12-05 15:15:34 +00:00
|
|
|
#include <spice/protocol.h>
|
2011-01-19 08:49:50 +00:00
|
|
|
|
|
|
|
|
2016-12-07 13:20:22 +00:00
|
|
|
typedef struct SpiceChardev {
|
|
|
|
Chardev parent;
|
2016-10-21 20:44:44 +00:00
|
|
|
|
2016-12-07 13:20:22 +00:00
|
|
|
SpiceCharDeviceInstance sin;
|
2011-01-19 08:49:50 +00:00
|
|
|
bool active;
|
2013-04-05 09:30:22 +00:00
|
|
|
bool blocked;
|
2013-04-05 09:30:23 +00:00
|
|
|
const uint8_t *datapos;
|
|
|
|
int datalen;
|
2016-12-07 13:20:22 +00:00
|
|
|
QLIST_ENTRY(SpiceChardev) next;
|
|
|
|
} SpiceChardev;
|
2011-01-19 08:49:50 +00:00
|
|
|
|
2016-12-07 15:39:10 +00:00
|
|
|
#define TYPE_CHARDEV_SPICE "chardev-spice"
|
|
|
|
#define TYPE_CHARDEV_SPICEVMC "chardev-spicevmc"
|
|
|
|
#define TYPE_CHARDEV_SPICEPORT "chardev-spiceport"
|
|
|
|
|
|
|
|
#define SPICE_CHARDEV(obj) OBJECT_CHECK(SpiceChardev, (obj), TYPE_CHARDEV_SPICE)
|
|
|
|
|
2013-04-05 09:30:22 +00:00
|
|
|
typedef struct SpiceCharSource {
|
|
|
|
GSource source;
|
2016-12-07 13:20:22 +00:00
|
|
|
SpiceChardev *scd;
|
2013-04-05 09:30:22 +00:00
|
|
|
} SpiceCharSource;
|
|
|
|
|
2016-12-07 13:20:22 +00:00
|
|
|
static QLIST_HEAD(, SpiceChardev) spice_chars =
|
2012-12-05 15:15:35 +00:00
|
|
|
QLIST_HEAD_INITIALIZER(spice_chars);
|
|
|
|
|
2011-01-19 08:49:50 +00:00
|
|
|
static int vmc_write(SpiceCharDeviceInstance *sin, const uint8_t *buf, int len)
|
|
|
|
{
|
2016-12-07 13:20:22 +00:00
|
|
|
SpiceChardev *scd = container_of(sin, SpiceChardev, sin);
|
2016-12-07 15:39:10 +00:00
|
|
|
Chardev *chr = CHARDEV(scd);
|
2011-01-19 08:49:50 +00:00
|
|
|
ssize_t out = 0;
|
|
|
|
ssize_t last_out;
|
|
|
|
uint8_t* p = (uint8_t*)buf;
|
|
|
|
|
|
|
|
while (len > 0) {
|
2016-10-21 20:44:44 +00:00
|
|
|
int can_write = qemu_chr_be_can_write(chr);
|
2013-04-05 09:30:24 +00:00
|
|
|
last_out = MIN(len, can_write);
|
2012-12-05 15:15:32 +00:00
|
|
|
if (last_out <= 0) {
|
2011-01-19 08:49:50 +00:00
|
|
|
break;
|
|
|
|
}
|
2016-10-21 20:44:44 +00:00
|
|
|
qemu_chr_be_write(chr, p, last_out);
|
2011-03-22 15:28:41 +00:00
|
|
|
out += last_out;
|
|
|
|
len -= last_out;
|
|
|
|
p += last_out;
|
2011-01-19 08:49:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
trace_spice_vmc_write(out, len + out);
|
|
|
|
return out;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int vmc_read(SpiceCharDeviceInstance *sin, uint8_t *buf, int len)
|
|
|
|
{
|
2016-12-07 13:20:22 +00:00
|
|
|
SpiceChardev *scd = container_of(sin, SpiceChardev, sin);
|
2011-01-19 08:49:50 +00:00
|
|
|
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 09:30:22 +00:00
|
|
|
}
|
|
|
|
if (scd->datalen == 0) {
|
|
|
|
scd->datapos = 0;
|
|
|
|
scd->blocked = false;
|
2011-01-19 08:49:50 +00:00
|
|
|
}
|
|
|
|
trace_spice_vmc_read(bytes, len);
|
|
|
|
return bytes;
|
|
|
|
}
|
|
|
|
|
2012-12-05 15:15:34 +00:00
|
|
|
#if SPICE_SERVER_VERSION >= 0x000c02
|
|
|
|
static void vmc_event(SpiceCharDeviceInstance *sin, uint8_t event)
|
|
|
|
{
|
2016-12-07 13:20:22 +00:00
|
|
|
SpiceChardev *scd = container_of(sin, SpiceChardev, sin);
|
2016-12-07 15:39:10 +00:00
|
|
|
Chardev *chr = CHARDEV(scd);
|
2012-12-05 15:15:34 +00:00
|
|
|
int chr_event;
|
|
|
|
|
|
|
|
switch (event) {
|
|
|
|
case SPICE_PORT_EVENT_BREAK:
|
|
|
|
chr_event = CHR_EVENT_BREAK;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
trace_spice_vmc_event(chr_event);
|
2016-10-21 20:44:44 +00:00
|
|
|
qemu_chr_be_event(chr, chr_event);
|
2012-12-05 15:15:34 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2011-11-19 09:22:44 +00:00
|
|
|
static void vmc_state(SpiceCharDeviceInstance *sin, int connected)
|
|
|
|
{
|
2016-12-07 13:20:22 +00:00
|
|
|
SpiceChardev *scd = container_of(sin, SpiceChardev, sin);
|
2016-12-07 15:39:10 +00:00
|
|
|
Chardev *chr = CHARDEV(scd);
|
2011-11-19 09:22:44 +00:00
|
|
|
|
2016-10-21 20:44:44 +00:00
|
|
|
if ((chr->be_open && connected) ||
|
|
|
|
(!chr->be_open && !connected)) {
|
2011-11-19 09:22:44 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2016-10-21 20:44:44 +00:00
|
|
|
qemu_chr_be_event(chr,
|
2011-11-19 09:22:44 +00:00
|
|
|
connected ? CHR_EVENT_OPENED : CHR_EVENT_CLOSED);
|
|
|
|
}
|
|
|
|
|
2011-01-19 08:49:50 +00: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 09:22:44 +00:00
|
|
|
.state = vmc_state,
|
2011-01-19 08:49:50 +00:00
|
|
|
.write = vmc_write,
|
|
|
|
.read = vmc_read,
|
2012-12-05 15:15:34 +00:00
|
|
|
#if SPICE_SERVER_VERSION >= 0x000c02
|
|
|
|
.event = vmc_event,
|
|
|
|
#endif
|
2015-05-05 14:58:56 +00:00
|
|
|
#if SPICE_SERVER_VERSION >= 0x000c06
|
|
|
|
.flags = SPICE_CHAR_DEVICE_NOTIFY_WRITABLE,
|
|
|
|
#endif
|
2011-01-19 08:49:50 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2016-12-07 13:20:22 +00:00
|
|
|
static void vmc_register_interface(SpiceChardev *scd)
|
2011-01-19 08:49:50 +00:00
|
|
|
{
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2016-12-07 13:20:22 +00:00
|
|
|
static void vmc_unregister_interface(SpiceChardev *scd)
|
2011-01-19 08:49:50 +00:00
|
|
|
{
|
|
|
|
if (!scd->active) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
spice_server_remove_interface(&scd->sin.base);
|
|
|
|
scd->active = false;
|
|
|
|
trace_spice_vmc_unregister_interface(scd);
|
|
|
|
}
|
|
|
|
|
2013-04-05 09:30:22 +00: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-06 21:43:14 +00:00
|
|
|
static GSourceFuncs SpiceCharSourceFuncs = {
|
2013-04-05 09:30:22 +00:00
|
|
|
.prepare = spice_char_source_prepare,
|
|
|
|
.check = spice_char_source_check,
|
|
|
|
.dispatch = spice_char_source_dispatch,
|
|
|
|
};
|
|
|
|
|
2016-12-07 13:20:22 +00:00
|
|
|
static GSource *spice_chr_add_watch(Chardev *chr, GIOCondition cond)
|
2013-04-05 09:30:22 +00:00
|
|
|
{
|
2016-12-07 15:39:10 +00:00
|
|
|
SpiceChardev *scd = SPICE_CHARDEV(chr);
|
2013-04-05 09:30:22 +00:00
|
|
|
SpiceCharSource *src;
|
|
|
|
|
2015-05-28 13:04:58 +00:00
|
|
|
assert(cond & G_IO_OUT);
|
2013-04-05 09:30:22 +00:00
|
|
|
|
|
|
|
src = (SpiceCharSource *)g_source_new(&SpiceCharSourceFuncs,
|
|
|
|
sizeof(SpiceCharSource));
|
|
|
|
src->scd = scd;
|
|
|
|
|
|
|
|
return (GSource *)src;
|
|
|
|
}
|
2011-01-19 08:49:50 +00:00
|
|
|
|
2016-12-07 13:20:22 +00:00
|
|
|
static int spice_chr_write(Chardev *chr, const uint8_t *buf, int len)
|
2011-01-19 08:49:50 +00:00
|
|
|
{
|
2016-12-07 15:39:10 +00:00
|
|
|
SpiceChardev *s = SPICE_CHARDEV(chr);
|
2013-04-05 09:30:22 +00:00
|
|
|
int read_bytes;
|
2011-01-19 08:49:50 +00:00
|
|
|
|
|
|
|
assert(s->datalen == 0);
|
2013-04-05 09:30:23 +00:00
|
|
|
s->datapos = buf;
|
2011-01-19 08:49:50 +00:00
|
|
|
s->datalen = len;
|
|
|
|
spice_server_char_device_wakeup(&s->sin);
|
2013-04-05 09:30:22 +00: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 08:49:50 +00:00
|
|
|
}
|
|
|
|
|
2016-12-08 13:34:16 +00:00
|
|
|
static void char_spice_finalize(Object *obj)
|
2011-01-19 08:49:50 +00:00
|
|
|
{
|
2016-12-08 13:34:16 +00:00
|
|
|
SpiceChardev *s = SPICE_CHARDEV(obj);
|
2011-01-19 08:49:50 +00:00
|
|
|
|
|
|
|
vmc_unregister_interface(s);
|
2017-02-21 08:18:27 +00:00
|
|
|
|
|
|
|
if (s->next.le_prev) {
|
|
|
|
QLIST_REMOVE(s, next);
|
|
|
|
}
|
2013-03-13 09:41:31 +00:00
|
|
|
|
|
|
|
g_free((char *)s->sin.subtype);
|
|
|
|
#if SPICE_SERVER_VERSION >= 0x000c02
|
|
|
|
g_free((char *)s->sin.portname);
|
|
|
|
#endif
|
2011-01-19 08:49:50 +00:00
|
|
|
}
|
|
|
|
|
2016-12-07 13:20:22 +00:00
|
|
|
static void spice_vmc_set_fe_open(struct Chardev *chr, int fe_open)
|
2011-03-24 10:12:04 +00:00
|
|
|
{
|
2016-12-07 15:39:10 +00:00
|
|
|
SpiceChardev *s = SPICE_CHARDEV(chr);
|
2013-03-26 10:07:58 +00:00
|
|
|
if (fe_open) {
|
|
|
|
vmc_register_interface(s);
|
|
|
|
} else {
|
|
|
|
vmc_unregister_interface(s);
|
|
|
|
}
|
2011-03-24 10:12:04 +00:00
|
|
|
}
|
|
|
|
|
2016-12-07 13:20:22 +00:00
|
|
|
static void spice_port_set_fe_open(struct Chardev *chr, int fe_open)
|
2014-01-10 23:20:24 +00:00
|
|
|
{
|
|
|
|
#if SPICE_SERVER_VERSION >= 0x000c02
|
2016-12-07 15:39:10 +00:00
|
|
|
SpiceChardev *s = SPICE_CHARDEV(chr);
|
2014-01-10 23:20:24 +00:00
|
|
|
|
|
|
|
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
|
|
|
|
}
|
|
|
|
|
2016-12-07 13:20:22 +00:00
|
|
|
static void spice_chr_accept_input(struct Chardev *chr)
|
2015-05-05 14:58:56 +00:00
|
|
|
{
|
2016-12-07 15:39:10 +00:00
|
|
|
SpiceChardev *s = SPICE_CHARDEV(chr);
|
2015-05-05 14:58:56 +00:00
|
|
|
|
|
|
|
spice_server_char_device_wakeup(&s->sin);
|
|
|
|
}
|
|
|
|
|
2016-12-07 15:39:10 +00:00
|
|
|
static void chr_open(Chardev *chr, const char *subtype)
|
2011-01-19 08:49:50 +00:00
|
|
|
{
|
2016-12-07 15:39:10 +00:00
|
|
|
SpiceChardev *s = SPICE_CHARDEV(chr);
|
2012-12-05 15:15:33 +00:00
|
|
|
|
|
|
|
s->active = false;
|
2013-03-13 09:41:31 +00:00
|
|
|
s->sin.subtype = g_strdup(subtype);
|
2012-12-05 15:15:33 +00:00
|
|
|
|
2012-12-05 15:15:35 +00:00
|
|
|
QLIST_INSERT_HEAD(&spice_chars, s, next);
|
2012-12-05 15:15:33 +00:00
|
|
|
}
|
|
|
|
|
2016-12-07 15:39:10 +00:00
|
|
|
static void qemu_chr_open_spice_vmc(Chardev *chr,
|
|
|
|
ChardevBackend *backend,
|
|
|
|
bool *be_opened,
|
|
|
|
Error **errp)
|
2012-12-05 15:15:33 +00: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-17 22:48:37 +00:00
|
|
|
ChardevSpiceChannel *spicevmc = backend->u.spicevmc.data;
|
|
|
|
const char *type = spicevmc->type;
|
2012-12-05 15:15:33 +00:00
|
|
|
const char **psubtype = spice_server_char_device_recognized_subtypes();
|
2011-01-19 08:49:50 +00:00
|
|
|
|
2013-02-25 11:39:06 +00:00
|
|
|
for (; *psubtype != NULL; ++psubtype) {
|
|
|
|
if (strcmp(type, *psubtype) == 0) {
|
2011-01-19 08:49:50 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2013-02-25 11:39:06 +00:00
|
|
|
if (*psubtype == NULL) {
|
2016-11-30 13:55:20 +00:00
|
|
|
char *subtypes = g_strjoinv(", ",
|
|
|
|
(gchar **)spice_server_char_device_recognized_subtypes());
|
|
|
|
|
|
|
|
error_setg(errp, "unsupported type name: %s", type);
|
|
|
|
error_append_hint(errp, "allowed spice char type names: %s\n",
|
|
|
|
subtypes);
|
|
|
|
|
|
|
|
g_free(subtypes);
|
2016-12-07 15:39:10 +00:00
|
|
|
return;
|
2011-01-19 08:49:50 +00:00
|
|
|
}
|
|
|
|
|
2016-10-22 10:09:43 +00:00
|
|
|
*be_opened = false;
|
2016-12-07 15:39:10 +00:00
|
|
|
chr_open(chr, type);
|
2011-01-19 08:49:50 +00:00
|
|
|
}
|
2012-12-05 15:15:34 +00:00
|
|
|
|
|
|
|
#if SPICE_SERVER_VERSION >= 0x000c02
|
2016-12-07 15:39:10 +00:00
|
|
|
static void qemu_chr_open_spice_port(Chardev *chr,
|
|
|
|
ChardevBackend *backend,
|
|
|
|
bool *be_opened,
|
|
|
|
Error **errp)
|
2012-12-05 15:15:34 +00: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-17 22:48:37 +00:00
|
|
|
ChardevSpicePort *spiceport = backend->u.spiceport.data;
|
|
|
|
const char *name = spiceport->fqdn;
|
2016-12-07 13:20:22 +00:00
|
|
|
SpiceChardev *s;
|
2012-12-05 15:15:34 +00:00
|
|
|
|
|
|
|
if (name == NULL) {
|
2016-11-30 13:55:20 +00:00
|
|
|
error_setg(errp, "missing name parameter");
|
2016-12-07 15:39:10 +00:00
|
|
|
return;
|
2012-12-05 15:15:34 +00:00
|
|
|
}
|
|
|
|
|
2016-12-07 15:39:10 +00:00
|
|
|
chr_open(chr, "port");
|
|
|
|
|
2016-10-22 10:09:43 +00:00
|
|
|
*be_opened = false;
|
2016-12-07 15:39:10 +00:00
|
|
|
s = SPICE_CHARDEV(chr);
|
2013-03-13 09:41:31 +00:00
|
|
|
s->sin.portname = g_strdup(name);
|
2012-12-05 15:15:34 +00:00
|
|
|
}
|
2012-12-05 15:15:36 +00:00
|
|
|
|
|
|
|
void qemu_spice_register_ports(void)
|
|
|
|
{
|
2016-12-07 13:20:22 +00:00
|
|
|
SpiceChardev *s;
|
2012-12-05 15:15:36 +00:00
|
|
|
|
|
|
|
QLIST_FOREACH(s, &spice_chars, next) {
|
|
|
|
if (s->sin.portname == NULL) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
vmc_register_interface(s);
|
|
|
|
}
|
|
|
|
}
|
2012-12-05 15:15:34 +00:00
|
|
|
#endif
|
2013-03-05 17:51:29 +00:00
|
|
|
|
2013-02-25 11:39:06 +00: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 00:19:31 +00:00
|
|
|
ChardevSpiceChannel *spicevmc;
|
2013-02-25 11:39:06 +00:00
|
|
|
|
|
|
|
if (name == NULL) {
|
|
|
|
error_setg(errp, "chardev: spice channel: no name given");
|
|
|
|
return;
|
|
|
|
}
|
2016-12-09 08:04:51 +00:00
|
|
|
backend->type = CHARDEV_BACKEND_KIND_SPICEVMC;
|
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-17 22:48:37 +00:00
|
|
|
spicevmc = backend->u.spicevmc.data = g_new0(ChardevSpiceChannel, 1);
|
2016-02-20 00:19:31 +00:00
|
|
|
qemu_chr_parse_common(opts, qapi_ChardevSpiceChannel_base(spicevmc));
|
|
|
|
spicevmc->type = g_strdup(name);
|
2013-02-25 11:39:06 +00: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 00:19:31 +00:00
|
|
|
ChardevSpicePort *spiceport;
|
2013-02-25 11:39:06 +00:00
|
|
|
|
|
|
|
if (name == NULL) {
|
|
|
|
error_setg(errp, "chardev: spice port: no name given");
|
|
|
|
return;
|
|
|
|
}
|
2016-12-09 08:04:51 +00:00
|
|
|
backend->type = CHARDEV_BACKEND_KIND_SPICEPORT;
|
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-17 22:48:37 +00:00
|
|
|
spiceport = backend->u.spiceport.data = g_new0(ChardevSpicePort, 1);
|
2016-02-20 00:19:31 +00:00
|
|
|
qemu_chr_parse_common(opts, qapi_ChardevSpicePort_base(spiceport));
|
|
|
|
spiceport->fqdn = g_strdup(name);
|
2013-02-25 11:39:06 +00:00
|
|
|
}
|
|
|
|
|
2016-12-07 15:39:10 +00:00
|
|
|
static void char_spice_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
ChardevClass *cc = CHARDEV_CLASS(oc);
|
|
|
|
|
|
|
|
cc->chr_write = spice_chr_write;
|
|
|
|
cc->chr_add_watch = spice_chr_add_watch;
|
|
|
|
cc->chr_accept_input = spice_chr_accept_input;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const TypeInfo char_spice_type_info = {
|
|
|
|
.name = TYPE_CHARDEV_SPICE,
|
|
|
|
.parent = TYPE_CHARDEV,
|
|
|
|
.instance_size = sizeof(SpiceChardev),
|
2016-12-08 13:34:16 +00:00
|
|
|
.instance_finalize = char_spice_finalize,
|
2016-12-07 15:39:10 +00:00
|
|
|
.class_init = char_spice_class_init,
|
|
|
|
.abstract = true,
|
|
|
|
};
|
|
|
|
|
|
|
|
static void char_spicevmc_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
ChardevClass *cc = CHARDEV_CLASS(oc);
|
|
|
|
|
2016-12-08 21:50:12 +00:00
|
|
|
cc->parse = qemu_chr_parse_spice_vmc;
|
2016-12-07 15:39:10 +00:00
|
|
|
cc->open = qemu_chr_open_spice_vmc;
|
|
|
|
cc->chr_set_fe_open = spice_vmc_set_fe_open;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const TypeInfo char_spicevmc_type_info = {
|
|
|
|
.name = TYPE_CHARDEV_SPICEVMC,
|
|
|
|
.parent = TYPE_CHARDEV_SPICE,
|
|
|
|
.class_init = char_spicevmc_class_init,
|
|
|
|
};
|
|
|
|
|
|
|
|
static void char_spiceport_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
ChardevClass *cc = CHARDEV_CLASS(oc);
|
|
|
|
|
2016-12-08 21:50:12 +00:00
|
|
|
cc->parse = qemu_chr_parse_spice_port;
|
2016-12-07 15:39:10 +00:00
|
|
|
cc->open = qemu_chr_open_spice_port;
|
|
|
|
cc->chr_set_fe_open = spice_port_set_fe_open;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const TypeInfo char_spiceport_type_info = {
|
|
|
|
.name = TYPE_CHARDEV_SPICEPORT,
|
|
|
|
.parent = TYPE_CHARDEV_SPICE,
|
|
|
|
.class_init = char_spiceport_class_init,
|
|
|
|
};
|
|
|
|
|
2013-03-05 17:51:29 +00:00
|
|
|
static void register_types(void)
|
|
|
|
{
|
2016-12-07 15:39:10 +00:00
|
|
|
type_register_static(&char_spice_type_info);
|
|
|
|
type_register_static(&char_spicevmc_type_info);
|
|
|
|
type_register_static(&char_spiceport_type_info);
|
2013-03-05 17:51:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
type_init(register_types);
|