target-s390x: correctly initialize ext interrupt queue

[qemu.git] / spice-qemu-char.c

diff --git a/spice-qemu-char.c b/spice-qemu-char.c
index a4d7de8c4f0328054f373a01a930bf4b335dc2f1..d41bb745a82d437eb1d12d50d7edaa62841bd30a 100644 (file)
--- a/spice-qemu-char.c
+++ b/spice-qemu-char.c
@@ -1,33 +1,27 @@
 #include "config-host.h"
 #include "trace.h"
 #include "ui/qemu-spice.h"
 #include "config-host.h"
 #include "trace.h"
 #include "ui/qemu-spice.h"

-#include "char/char.h"
+#include "sysemu/char.h"

 #include <spice.h>
 #include <spice.h>

-#include <spice-experimental.h>

 #include <spice/protocol.h>
 
 #include "qemu/osdep.h"
 
 #include <spice/protocol.h>
 
 #include "qemu/osdep.h"
 

-#define dprintf(_scd, _level, _fmt, ...)                                \
-    do {                                                                \
-        static unsigned __dprintf_counter = 0;                          \
-        if (_scd->debug >= _level) {                                    \
-            fprintf(stderr, "scd: %3d: " _fmt, ++__dprintf_counter, ## __VA_ARGS__);\
-        }                                                               \
-    } while (0)
-

 typedef struct SpiceCharDriver {
     CharDriverState*      chr;
     SpiceCharDeviceInstance     sin;
 typedef struct SpiceCharDriver {
     CharDriverState*      chr;
     SpiceCharDeviceInstance     sin;

-    char                  *subtype;

     bool                  active;
     bool                  active;

-    uint8_t               *buffer;
-    uint8_t               *datapos;
-    ssize_t               bufsize, datalen;
-    uint32_t              debug;
+    bool                  blocked;
+    const uint8_t         *datapos;
+    int                   datalen;

     QLIST_ENTRY(SpiceCharDriver) next;
 } SpiceCharDriver;
 
     QLIST_ENTRY(SpiceCharDriver) next;
 } SpiceCharDriver;
 

+typedef struct SpiceCharSource {
+    GSource               source;
+    SpiceCharDriver       *scd;
+} SpiceCharSource;
+

 static QLIST_HEAD(, SpiceCharDriver) spice_chars =
     QLIST_HEAD_INITIALIZER(spice_chars);
 
 static QLIST_HEAD(, SpiceCharDriver) spice_chars =
     QLIST_HEAD_INITIALIZER(spice_chars);
 


@@ -39,7 +33,8 @@ static int vmc_write(SpiceCharDeviceInstance *sin, const uint8_t *buf, int len)
     uint8_t* p = (uint8_t*)buf;
 
     while (len > 0) {
     uint8_t* p = (uint8_t*)buf;
 
     while (len > 0) {

-        last_out = MIN(len, qemu_chr_be_can_write(scd->chr));
+        int can_write = qemu_chr_be_can_write(scd->chr);
+        last_out = MIN(len, can_write);

         if (last_out <= 0) {
             break;
         }
         if (last_out <= 0) {
             break;
         }


@@ -49,7 +44,6 @@ static int vmc_write(SpiceCharDeviceInstance *sin, const uint8_t *buf, int len)
         p += last_out;
     }
 
         p += last_out;
     }
 

-    dprintf(scd, 3, "%s: %zu/%zd\n", __func__, out, len + out);

     trace_spice_vmc_write(out, len + out);
     return out;
 }
     trace_spice_vmc_write(out, len + out);
     return out;
 }


@@ -59,15 +53,15 @@ static int vmc_read(SpiceCharDeviceInstance *sin, uint8_t *buf, int len)
     SpiceCharDriver *scd = container_of(sin, SpiceCharDriver, sin);
     int bytes = MIN(len, scd->datalen);
 
     SpiceCharDriver *scd = container_of(sin, SpiceCharDriver, sin);
     int bytes = MIN(len, scd->datalen);
 

-    dprintf(scd, 2, "%s: %p %d/%d/%zd\n", __func__, scd->datapos, len, bytes, scd->datalen);

     if (bytes > 0) {
         memcpy(buf, scd->datapos, bytes);
         scd->datapos += bytes;
         scd->datalen -= bytes;
         assert(scd->datalen >= 0);
     if (bytes > 0) {
         memcpy(buf, scd->datapos, bytes);
         scd->datapos += bytes;
         scd->datalen -= bytes;
         assert(scd->datalen >= 0);

-        if (scd->datalen == 0) {
-            scd->datapos = 0;
-        }
+    }
+    if (scd->datalen == 0) {
+        scd->datapos = 0;
+        scd->blocked = false;

     }
     trace_spice_vmc_read(bytes, len);
     return bytes;
     }
     trace_spice_vmc_read(bytes, len);
     return bytes;


@@ -84,11 +78,9 @@ static void vmc_event(SpiceCharDeviceInstance *sin, uint8_t event)
         chr_event = CHR_EVENT_BREAK;
         break;
     default:
         chr_event = CHR_EVENT_BREAK;
         break;
     default:

-        dprintf(scd, 2, "%s: unknown %d\n", __func__, event);

         return;
     }
 
         return;
     }
 

-    dprintf(scd, 2, "%s: %d\n", __func__, event);

     trace_spice_vmc_event(chr_event);
     qemu_chr_be_event(scd->chr, chr_event);
 }
     trace_spice_vmc_event(chr_event);
     qemu_chr_be_event(scd->chr, chr_event);
 }


@@ -98,23 +90,8 @@ static void vmc_state(SpiceCharDeviceInstance *sin, int connected)
 {
     SpiceCharDriver *scd = container_of(sin, SpiceCharDriver, sin);
 
 {
     SpiceCharDriver *scd = container_of(sin, SpiceCharDriver, sin);
 

-#if SPICE_SERVER_VERSION < 0x000901
-    /*
-     * spice-server calls the state callback for the agent channel when the
-     * spice client connects / disconnects. Given that not the client but
-     * the server is doing the parsing of the messages this is wrong as the
-     * server is still listening. Worse, this causes the parser in the server
-     * to go out of sync, so we ignore state calls for subtype vdagent
-     * spicevmc chardevs. For the full story see:
-     * http://lists.freedesktop.org/archives/spice-devel/2011-July/004837.html
-     */
-    if (strcmp(sin->subtype, "vdagent") == 0) {
-        return;
-    }
-#endif
-
-    if ((scd->chr->opened && connected) ||
-        (!scd->chr->opened && !connected)) {
+    if ((scd->chr->be_open && connected) ||
+        (!scd->chr->be_open && !connected)) {

         return;
     }
 
         return;
     }
 


@@ -133,6 +110,9 @@ static SpiceCharDeviceInterface vmc_interface = {
 #if SPICE_SERVER_VERSION >= 0x000c02
     .event              = vmc_event,
 #endif
 #if SPICE_SERVER_VERSION >= 0x000c02
     .event              = vmc_event,
 #endif

+#if SPICE_SERVER_VERSION >= 0x000c06
+    .flags              = SPICE_CHAR_DEVICE_NOTIFY_WRITABLE,
+#endif

 };
 
 
 };
 
 


@@ -141,7 +121,6 @@ static void vmc_register_interface(SpiceCharDriver *scd)
     if (scd->active) {
         return;
     }
     if (scd->active) {
         return;
     }

-    dprintf(scd, 1, "%s\n", __func__);

     scd->sin.base.sif = &vmc_interface.base;
     qemu_spice_add_interface(&scd->sin.base);
     scd->active = true;
     scd->sin.base.sif = &vmc_interface.base;
     qemu_spice_add_interface(&scd->sin.base);
     scd->active = true;


@@ -153,51 +132,118 @@ static void vmc_unregister_interface(SpiceCharDriver *scd)
     if (!scd->active) {
         return;
     }
     if (!scd->active) {
         return;
     }

-    dprintf(scd, 1, "%s\n", __func__);

     spice_server_remove_interface(&scd->sin.base);
     scd->active = false;
     trace_spice_vmc_unregister_interface(scd);
 }
 
     spice_server_remove_interface(&scd->sin.base);
     scd->active = false;
     trace_spice_vmc_unregister_interface(scd);
 }
 

+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);
+}
+
+static GSourceFuncs SpiceCharSourceFuncs = {
+    .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;
+
+    assert(cond & G_IO_OUT);
+
+    src = (SpiceCharSource *)g_source_new(&SpiceCharSourceFuncs,
+                                          sizeof(SpiceCharSource));
+    src->scd = scd;
+
+    return (GSource *)src;
+}

 
 static int spice_chr_write(CharDriverState *chr, const uint8_t *buf, int len)
 {
     SpiceCharDriver *s = chr->opaque;
 
 static int spice_chr_write(CharDriverState *chr, const uint8_t *buf, int len)
 {
     SpiceCharDriver *s = chr->opaque;

+    int read_bytes;

 
 

-    dprintf(s, 2, "%s: %d\n", __func__, len);
-    vmc_register_interface(s);

     assert(s->datalen == 0);
     assert(s->datalen == 0);

-    if (s->bufsize < len) {
-        s->bufsize = len;
-        s->buffer = g_realloc(s->buffer, s->bufsize);
-    }
-    memcpy(s->buffer, buf, len);
-    s->datapos = s->buffer;
+    s->datapos = buf;

     s->datalen = len;
     spice_server_char_device_wakeup(&s->sin);
     s->datalen = len;
     spice_server_char_device_wakeup(&s->sin);

-    return len;
+    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;

 }
 
 static void spice_chr_close(struct CharDriverState *chr)
 {
     SpiceCharDriver *s = chr->opaque;
 
 }
 
 static void spice_chr_close(struct CharDriverState *chr)
 {
     SpiceCharDriver *s = chr->opaque;
 

-    printf("%s\n", __func__);

     vmc_unregister_interface(s);
     QLIST_REMOVE(s, next);
     vmc_unregister_interface(s);
     QLIST_REMOVE(s, next);

+
+    g_free((char *)s->sin.subtype);
+#if SPICE_SERVER_VERSION >= 0x000c02
+    g_free((char *)s->sin.portname);
+#endif

     g_free(s);
 }
 
     g_free(s);
 }
 

-static void spice_chr_guest_open(struct CharDriverState *chr)
+static void spice_vmc_set_fe_open(struct CharDriverState *chr, int fe_open)

 {
     SpiceCharDriver *s = chr->opaque;
 {
     SpiceCharDriver *s = chr->opaque;

-    vmc_register_interface(s);
+    if (fe_open) {
+        vmc_register_interface(s);
+    } else {
+        vmc_unregister_interface(s);
+    }

 }
 
 }
 

-static void spice_chr_guest_close(struct CharDriverState *chr)
+static void spice_port_set_fe_open(struct CharDriverState *chr, int fe_open)

 {
 {

+#if SPICE_SERVER_VERSION >= 0x000c02

     SpiceCharDriver *s = chr->opaque;
     SpiceCharDriver *s = chr->opaque;

-    vmc_unregister_interface(s);
+
+    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
+}
+
+static void spice_chr_fe_event(struct CharDriverState *chr, int event)
+{
+#if SPICE_SERVER_VERSION >= 0x000c02
+    SpiceCharDriver *s = chr->opaque;
+
+    spice_server_port_event(&s->sin, event);
+#endif

 }
 
 static void print_allowed_subtypes(void)
 }
 
 static void print_allowed_subtypes(void)


@@ -217,80 +263,76 @@ static void print_allowed_subtypes(void)
     fprintf(stderr, "\n");
 }
 
     fprintf(stderr, "\n");
 }
 

-static CharDriverState *chr_open(QemuOpts *opts, const char *subtype)
+static void spice_chr_accept_input(struct CharDriverState *chr)
+{
+    SpiceCharDriver *s = chr->opaque;
+
+    spice_server_char_device_wakeup(&s->sin);
+}
+
+static CharDriverState *chr_open(const char *subtype,
+    void (*set_fe_open)(struct CharDriverState *, int))
+

 {
     CharDriverState *chr;
     SpiceCharDriver *s;
 {
     CharDriverState *chr;
     SpiceCharDriver *s;

-    uint32_t debug = qemu_opt_get_number(opts, "debug", 0);

 
 

-    chr = g_malloc0(sizeof(CharDriverState));
+    chr = qemu_chr_alloc();

     s = g_malloc0(sizeof(SpiceCharDriver));
     s->chr = chr;
     s = g_malloc0(sizeof(SpiceCharDriver));
     s->chr = chr;

-    s->debug = debug;

     s->active = false;
     s->active = false;

-    s->sin.subtype = subtype;
+    s->sin.subtype = g_strdup(subtype);

     chr->opaque = s;
     chr->chr_write = spice_chr_write;
     chr->opaque = s;
     chr->chr_write = spice_chr_write;

+    chr->chr_add_watch = spice_chr_add_watch;

     chr->chr_close = spice_chr_close;
     chr->chr_close = spice_chr_close;

-    chr->chr_guest_open = spice_chr_guest_open;
-    chr->chr_guest_close = spice_chr_guest_close;
+    chr->chr_set_fe_open = set_fe_open;
+    chr->explicit_be_open = true;
+    chr->chr_fe_event = spice_chr_fe_event;
+    chr->chr_accept_input = spice_chr_accept_input;

 
     QLIST_INSERT_HEAD(&spice_chars, s, next);
 
     return chr;
 }
 
 
     QLIST_INSERT_HEAD(&spice_chars, s, next);
 
     return chr;
 }
 

-CharDriverState *qemu_chr_open_spice(QemuOpts *opts)
+CharDriverState *qemu_chr_open_spice_vmc(const char *type)

 {
 {

-    CharDriverState *chr;
-    const char *name = qemu_opt_get(opts, "name");

     const char **psubtype = spice_server_char_device_recognized_subtypes();
     const char **psubtype = spice_server_char_device_recognized_subtypes();

-    const char *subtype = NULL;

 
 

-    if (name == NULL) {
+    if (type == NULL) {

         fprintf(stderr, "spice-qemu-char: missing name parameter\n");
         print_allowed_subtypes();
         return NULL;
     }
         fprintf(stderr, "spice-qemu-char: missing name parameter\n");
         print_allowed_subtypes();
         return NULL;
     }

-    for(;*psubtype != NULL; ++psubtype) {
-        if (strcmp(name, *psubtype) == 0) {
-            subtype = *psubtype;
+    for (; *psubtype != NULL; ++psubtype) {
+        if (strcmp(type, *psubtype) == 0) {

             break;
         }
     }
             break;
         }
     }

-    if (subtype == NULL) {
-        fprintf(stderr, "spice-qemu-char: unsupported name: %s\n", name);
+    if (*psubtype == NULL) {
+        fprintf(stderr, "spice-qemu-char: unsupported type: %s\n", type);

         print_allowed_subtypes();
         return NULL;
     }
 
         print_allowed_subtypes();
         return NULL;
     }
 

-    chr = chr_open(opts, subtype);
-
-#if SPICE_SERVER_VERSION < 0x000901
-    /* See comment in vmc_state() */
-    if (strcmp(subtype, "vdagent") == 0) {
-        qemu_chr_generic_open(chr);
-    }
-#endif
-
-    return chr;
+    return chr_open(type, spice_vmc_set_fe_open);

 }
 
 #if SPICE_SERVER_VERSION >= 0x000c02
 }
 
 #if SPICE_SERVER_VERSION >= 0x000c02

-CharDriverState *qemu_chr_open_spice_port(QemuOpts *opts)
+CharDriverState *qemu_chr_open_spice_port(const char *name)

 {
     CharDriverState *chr;
     SpiceCharDriver *s;
 {
     CharDriverState *chr;
     SpiceCharDriver *s;

-    const char *name = qemu_opt_get(opts, "name");

 
     if (name == NULL) {
         fprintf(stderr, "spice-qemu-char: missing name parameter\n");
         return NULL;
     }
 
 
     if (name == NULL) {
         fprintf(stderr, "spice-qemu-char: missing name parameter\n");
         return NULL;
     }
 

-    chr = chr_open(opts, "port");
+    chr = chr_open("port", spice_port_set_fe_open);

     s = chr->opaque;
     s = chr->opaque;

-    s->sin.portname = name;
+    s->sin.portname = g_strdup(name);

 
     return chr;
 }
 
     return chr;
 }


@@ -307,3 +349,39 @@ void qemu_spice_register_ports(void)
     }
 }
 #endif
     }
 }
 #endif

+
+static void qemu_chr_parse_spice_vmc(QemuOpts *opts, ChardevBackend *backend,
+                                     Error **errp)
+{
+    const char *name = qemu_opt_get(opts, "name");
+
+    if (name == NULL) {
+        error_setg(errp, "chardev: spice channel: no name given");
+        return;
+    }
+    backend->spicevmc = g_new0(ChardevSpiceChannel, 1);
+    backend->spicevmc->type = g_strdup(name);
+}
+
+static void qemu_chr_parse_spice_port(QemuOpts *opts, ChardevBackend *backend,
+                                      Error **errp)
+{
+    const char *name = qemu_opt_get(opts, "name");
+
+    if (name == NULL) {
+        error_setg(errp, "chardev: spice port: no name given");
+        return;
+    }
+    backend->spiceport = g_new0(ChardevSpicePort, 1);
+    backend->spiceport->fqdn = g_strdup(name);
+}
+
+static void register_types(void)
+{
+    register_char_driver("spicevmc", CHARDEV_BACKEND_KIND_SPICEVMC,
+                         qemu_chr_parse_spice_vmc);
+    register_char_driver("spiceport", CHARDEV_BACKEND_KIND_SPICEPORT,
+                         qemu_chr_parse_spice_port);
+}
+
+type_init(register_types);