Skip to contentSkip to conversation

spice patch queue

GIT PULL New Gerd Hoffmann 1 participant 17 messages Dec 16, 2013 Block layer

lore
Share & tools
lore
#0 lore raw

Hi,

Here comes the spice patch queue, with some nbd bits for upcoming spice-nbd and the usual share of small fixes & cleanups.

please pull,
Gerd

The following changes since commit e157b8fdd412d48eacfbb8c67d3d58780154faa3:

Merge remote-tracking branch 'bonzini/virtio' into staging (2013-12-13 11:10:33 -0800)

are available in the git repository at:

git://anongit.freedesktop.org/spice/qemu tags/pull-spice-1

for you to fetch changes up to 75c70e37bc4a6bdc394b4d1b163fe730abb82c72:

spice: stop server for qxl hard reset (2013-12-16 10:12:20 +0100)

----------------------------------------------------------------
Collection of little cleanups anf bugfixes.
nbd patches in preparation of spice-nbd.

----------------------------------------------------------------
Gerd Hoffmann (4):
spice: flip streaming video mode to off by default
spice: move qemu_spice_display_*() from spice-graphics to spice-core
spice: move spice_server_vm_{start,stop} calls into qemu_spice_display_*()
spice: stop server for qxl hard reset

Marc-André Lureau (12):
vscclient: do not add a socket watch if there is not data to send
spice-char: remove unused field
qmp_change_blockdev() remove unused has_format
include: add missing config-host.h include
char: add qemu_chr_fe_event()
spice-char: implement chardev port event
Split nbd block client code
nbd: don't change socket block during negotiate
nbd: pass export name as init argument
nbd: make nbd_client_session_close() idempotent
nbd: finish any pending coroutine
nbd: avoid uninitialized warnings

 block/Makefile.objs       |   2 +-
 block/nbd-client.c        | 385 ++++++++++++++++++++++++++++++++++++++++++++++
 block/nbd-client.h        |  50 ++++++
 block/nbd.c               | 380 ++++-----------------------------------------
 blockdev.c                |   2 +-
 hw/display/qxl.c          |  10 ++
 include/sysemu/blockdev.h |   2 +-
 include/sysemu/char.h     |  10 ++
 include/ui/qemu-spice.h   |   2 +
 libcacard/vscclient.c     |  10 +-
 nbd.c                     |   2 -
 qemu-char.c               |   7 +
 qmp.c                     |   2 +-
 spice-qemu-char.c         |  11 +-
 ui/spice-core.c           |  22 ++-
 ui/spice-display.c        |  17 --
 16 files changed, 537 insertions(+), 377 deletions(-)
 create mode 100644 block/nbd-client.c
 create mode 100644 block/nbd-client.h
#1 lore raw

PATCH 1/16 spice: flip streaming video mode to off by default

Video streaming detection heuristics in spice-server have problems keeping modern desktop animations (as done by gnome shell) and real video playback apart. This leads to jpeg compression artefacts on your desktop, due to spice using mjpeg to send what it thinks is a video stream.

Turn off video detection by default to avoid these artifacts.

---
 ui/spice-core.c | 2 ++
 1 file changed, 2 insertions(+)
ui/spice-core.c +2 -0
index e4d533d..9fb9544 100644
@@ -776,6 +776,8 @@ void qemu_spice_init(void)
     if (str) {
         int streaming_video = parse_stream_video(str);
         spice_server_set_streaming_video(spice_server, streaming_video);
+    } else {
+        spice_server_set_streaming_video(spice_server, SPICE_STREAM_VIDEO_OFF);
     }
 
     spice_server_set_agent_mouse
Signature · 1 line
1.8.3.1
#2 lore raw

PATCH 2/16 vscclient: do not add a socket watch if there is not data to send

In reply to Gerd Hoffmann

From: Marc-André Lureau <[email protected]>

Fixes the following error:
** (process:780): CRITICAL **: do_socket_send: assertion `socket_to_send->len != 0' failed

---
 libcacard/vscclient.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
libcacard/vscclient.c +6 -4
index f1d46d3..24f7088 100644
@@ -58,7 +58,7 @@ static QemuMutex socket_to_send_lock;
 static guint socket_tag;
 
 static void
-update_socket_watch(gboolean out);
+update_socket_watch(void);
 
 static gboolean
 do_socket_send(GIOChannel *source,
@@ -80,7 +80,7 @@ do_socket_send(GIOChannel *source,
     g_byte_array_remove_range(socket_to_send, 0, bw);
 
     if (socket_to_send->len == 0) {
-        update_socket_watch(FALSE);
+        update_socket_watch();
         return FALSE;
     }
     return TRUE;
@@ -89,7 +89,7 @@ do_socket_send(GIOChannel *source,
 static gboolean
 socket_prepare_sending(gpointer user_data)
 {
-    update_socket_watch(TRUE);
+    update_socket_watch();
 
     return FALSE;
 }
@@ -440,8 +440,10 @@ do_socket(GIOChannel *source,
 }
 
 static void
-update_socket_watch(gboolean out)
+update_socket_watch(void)
 {
+    gboolean out = socket_to_send->len > 0;
+
     if (socket_tag != 0) {
         g_source_remove(socket_tag);
     }
Signature · 1 line
1.8.3.1
#3 lore raw

PATCH 3/16 spice-char: remove unused field

In reply to Gerd Hoffmann

From: Marc-André Lureau <[email protected]>

---
 spice-qemu-char.c | 1 -
 1 file changed, 1 deletion(-)
spice-qemu-char.c +0 -1
index 6d147a7..e074d9e 100644
@@ -11,7 +11,6 @@
 typedef struct SpiceCharDriver {
     CharDriverState*      chr;
     SpiceCharDeviceInstance     sin;
-    char                  *subtype;
     bool                  active;
     bool                  blocked;
     const uint8_t         *datapos;
Signature · 1 line
1.8.3.1
#4 lore raw

PATCH 4/16 qmp_change_blockdev() remove unused has_format

In reply to Gerd Hoffmann

From: Marc-André Lureau <[email protected]>

---
 blockdev.c                | 2 +-
 include/sysemu/blockdev.h | 2 +-
 qmp.c                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
blockdev.c +1 -1
index 44755e1..6a85961 100644
@@ -1523,7 +1523,7 @@ static void qmp_bdrv_open_encrypted(BlockDriverState *bs, const char *filename,
 }
 
 void qmp_change_blockdev(const char *device, const char *filename,
-                         bool has_format, const char *format, Error **errp)
+                         const char *format, Error **errp)
 {
     BlockDriverState *bs;
     BlockDriver *drv = NULL;
include/sysemu/blockdev.h +1 -1
index 1082091..134712b 100644
@@ -64,7 +64,7 @@ DriveInfo *drive_init(QemuOpts *arg, BlockInterfaceType block_default_type);
 DriveInfo *add_init_drive(const char *opts);
 
 void qmp_change_blockdev(const char *device, const char *filename,
-                         bool has_format, const char *format, Error **errp);
+                         const char *format, Error **errp);
 void do_commit(Monitor *mon, const QDict *qdict);
 int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data);
 #endif
qmp.c +1 -1
index 4c149b3..1d7a04d 100644
@@ -400,7 +400,7 @@ void qmp_change(const char *device, const char *target,
     if (strcmp(device, "vnc") == 0) {
         qmp_change_vnc(target, has_arg, arg, err);
     } else {
-        qmp_change_blockdev(device, target, has_arg, arg, err);
+        qmp_change_blockdev(device, target, arg, err);
     }
 }
 
Signature · 1 line
1.8.3.1
#5 lore raw

PATCH 5/16 include: add missing config-host.h include

In reply to Gerd Hoffmann

From: Marc-André Lureau <[email protected]>

---
 include/ui/qemu-spice.h | 2 ++
 1 file changed, 2 insertions(+)
include/ui/qemu-spice.h +2 -0
index 86c75c7..a93b4b2 100644
@@ -18,6 +18,8 @@
 #ifndef QEMU_SPICE_H
 #define QEMU_SPICE_H
 
+#include "config-host.h"
+
 #ifdef CONFIG_SPICE
 
 #include <spice.h>
Signature · 1 line
1.8.3.1
#6 lore raw

PATCH 6/16 char: add qemu_chr_fe_event()

In reply to Gerd Hoffmann

From: Marc-André Lureau <[email protected]>

Teach the chardev frontend to send event. This is used by the Spice port chardev currently.

---
 include/sysemu/char.h | 10 ++++++++++
 qemu-char.c           |  7 +++++++
 2 files changed, 17 insertions(+)
include/sysemu/char.h +10 -0
index ad101d9..b81a6ff 100644
@@ -69,6 +69,7 @@ struct CharDriverState {
     void (*chr_accept_input)(struct CharDriverState *chr);
     void (*chr_set_echo)(struct CharDriverState *chr, bool echo);
     void (*chr_set_fe_open)(struct CharDriverState *chr, int fe_open);
+    void (*chr_fe_event)(struct CharDriverState *chr, int event);
     void *opaque;
     char *label;
     char *filename;
@@ -138,6 +139,15 @@ void qemu_chr_fe_set_echo(struct CharDriverState *chr, bool echo);
 void qemu_chr_fe_set_open(struct CharDriverState *chr, int fe_open);
 
 /**
+ * @qemu_chr_fe_event:
+ *
+ * Send an event from the front end to the back end.
+ *
+ * @event the event to send
+ */
+void qemu_chr_fe_event(CharDriverState *s, int event);
+
+/**
  * @qemu_chr_fe_printf:
  *
  * Write to a character backend using a printf style interface.
qemu-char.c +7 -0
index e00f84c..418dc69 100644
@@ -3353,6 +3353,13 @@ void qemu_chr_fe_set_open(struct CharDriverState *chr, int fe_open)
     }
 }
 
+void qemu_chr_fe_event(struct CharDriverState *chr, int event)
+{
+    if (chr->chr_fe_event) {
+        chr->chr_fe_event(chr, event);
+    }
+}
+
 int qemu_chr_fe_add_watch(CharDriverState *s, GIOCondition cond,
                           GIOFunc func, void *user_data)
 {
Signature · 1 line
1.8.3.1
#7 lore raw

PATCH 7/16 spice-char: implement chardev port event

In reply to Gerd Hoffmann

From: Marc-André Lureau <[email protected]>

Wire up chardev fe_event to Spice port.

---
 spice-qemu-char.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
spice-qemu-char.c +10 -0
index e074d9e..16439c5 100644
@@ -222,6 +222,15 @@ static void spice_chr_set_fe_open(struct CharDriverState *chr, int fe_open)
     }
 }
 
+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)
 {
     const char** psubtype;
@@ -255,6 +264,7 @@ static CharDriverState *chr_open(const char *subtype)
     chr->chr_close = spice_chr_close;
     chr->chr_set_fe_open = spice_chr_set_fe_open;
     chr->explicit_be_open = true;
+    chr->chr_fe_event = spice_chr_fe_event;
 
     QLIST_INSERT_HEAD(&spice_chars, s, next);
 
Signature · 1 line
1.8.3.1
#8 lore raw

PATCH 8/16 Split nbd block client code

In reply to Gerd Hoffmann

From: Marc-André Lureau <[email protected]>

---
 block/Makefile.objs |   2 +-
 block/nbd-client.c  | 372 +++++++++++++++++++++++++++++++++++++++++++++++++++
 block/nbd-client.h  |  51 +++++++
 block/nbd.c         | 373 ++++------------------------------------------------
 4 files changed, 452 insertions(+), 346 deletions(-)
 create mode 100644 block/nbd-client.c
 create mode 100644 block/nbd-client.h
block/Makefile.objs +1 -1
index f43ecbc..4e8c91e 100644
@@ -10,7 +10,7 @@ block-obj-$(CONFIG_POSIX) += raw-posix.o
 block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o
 
 ifeq ($(CONFIG_POSIX),y)
-block-obj-y += nbd.o sheepdog.o
+block-obj-y += nbd.o nbd-client.o sheepdog.o
 block-obj-$(CONFIG_LIBISCSI) += iscsi.o
 block-obj-$(CONFIG_CURL) += curl.o
 block-obj-$(CONFIG_RBD) += rbd.o
block/nbd-client.c new file +372 -0

372 lines not on this page · raw message

block/nbd-client.h new file +51 -0

51 lines not on this page · raw message

block/nbd.c +28 -345

466 lines not on this page · raw message

Signature · 1 line
1.8.3.1
#9 lore raw

PATCH 9/16 nbd: don't change socket block during negotiate

In reply to Gerd Hoffmann

From: Marc-André Lureau <[email protected]>

The caller might handle non-blocking using coroutine. Leave the choice to the caller to use a blocking or non-blocking negotiate.

---
 block/nbd-client.c | 1 +
 nbd.c              | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)
block/nbd-client.c +1 -0
index 1abfc6a..693110d 100644
@@ -348,6 +348,7 @@ int nbd_client_session_init(NbdClientSession *client,
     int ret;
 
     /* NBD handshake */
+    qemu_set_block(sock);
     ret = nbd_receive_negotiate(sock, client->export_name,
                                 &client->nbdflags, &client->size,
                                 &client->blocksize);
nbd.c +0 -2
index f847940..030f56b 100644
@@ -443,7 +443,6 @@ int nbd_receive_negotiate(int csock, const char *name, uint32_t *flags,
 
     TRACE("Receiving negotiation.");
 
-    qemu_set_block(csock);
     rc = -EINVAL;
 
     if (read_sync(csock, buf, 8) != 8) {
@@ -558,7 +557,6 @@ int nbd_receive_negotiate(int csock, const char *name, uint32_t *flags,
     rc = 0;
 
 fail:
-    qemu_set_nonblock(csock);
     return rc;
 }
 
Signature · 1 line
1.8.3.1
#10 lore raw

PATCH 10/16 nbd: pass export name as init argument

In reply to Gerd Hoffmann

From: Marc-André Lureau <[email protected]>

There is no need to keep the export name around, and it seems a better fit as an argument in the init() call.

---
 block/nbd-client.c |  9 ++++-----
 block/nbd-client.h |  5 ++---
 block/nbd.c        | 13 ++++++++-----
 3 files changed, 14 insertions(+), 13 deletions(-)
block/nbd-client.c +4 -5
index 693110d..3dfae1d 100644
@@ -338,18 +338,17 @@ static void nbd_teardown_connection(NbdClientSession *client)
 void nbd_client_session_close(NbdClientSession *client)
 {
     nbd_teardown_connection(client);
-    g_free(client->export_name);
-    client->export_name = NULL;
 }
 
-int nbd_client_session_init(NbdClientSession *client,
-    BlockDriverState *bs, int sock)
+int nbd_client_session_init(NbdClientSession *client, BlockDriverState *bs,
+    int sock, const char *export)
 {
     int ret;
 
     /* NBD handshake */
+    logout("session init %s\n", export);
     qemu_set_block(sock);
-    ret = nbd_receive_negotiate(sock, client->export_name,
+    ret = nbd_receive_negotiate(sock, export,
                                 &client->nbdflags, &client->size,
                                 &client->blocksize);
     if (ret < 0) {
block/nbd-client.h +2 -3
index c271236..f2a6337 100644
@@ -30,14 +30,13 @@ typedef struct NbdClientSession {
     Coroutine *recv_coroutine[MAX_NBD_REQUESTS];
     struct nbd_reply reply;
 
-    char *export_name; /* An NBD server may export several devices */
     bool is_unix;
 
     BlockDriverState *bs;
 } NbdClientSession;
 
-int nbd_client_session_init(NbdClientSession *client,
-                            BlockDriverState *bs, int sock);
+int nbd_client_session_init(NbdClientSession *client, BlockDriverState *bs,
+                            int sock, const char *export_name);
 void nbd_client_session_close(NbdClientSession *client);
 
 int nbd_client_session_co_discard(NbdClientSession *client, int64_t sector_num,
block/nbd.c +8 -5
index be75ba0..4455a13 100644
@@ -188,7 +188,7 @@ out:
     g_free(file);
 }
 
-static int nbd_config(BDRVNBDState *s, QDict *options)
+static int nbd_config(BDRVNBDState *s, QDict *options, char **export)
 {
     Error *local_err = NULL;
 
@@ -218,8 +218,8 @@ static int nbd_config(BDRVNBDState *s, QDict *options)
         qemu_opt_set_number(s->socket_opts, "port", NBD_DEFAULT_PORT);
     }
 
-    s->client.export_name = g_strdup(qdict_get_try_str(options, "export"));
-    if (s->client.export_name) {
+    *export = g_strdup(qdict_get_try_str(options, "export"));
+    if (*export) {
         qdict_del(options, "export");
     }
 
@@ -253,10 +253,11 @@ static int nbd_open(BlockDriverState *bs, QDict *options, int flags,
                     Error **errp)
 {
     BDRVNBDState *s = bs->opaque;
+    char *export = NULL;
     int result, sock;
 
     /* Pop the config into our state object. Exit if invalid. */
-    result = nbd_config(s, options);
+    result = nbd_config(s, options, &export);
     if (result != 0) {
         return result;
     }
@@ -270,7 +271,9 @@ static int nbd_open(BlockDriverState *bs, QDict *options, int flags,
     }
 
     /* NBD handshake */
-    return nbd_client_session_init(&s->client, bs, sock);
+    result = nbd_client_session_init(&s->client, bs, sock, export);
+    g_free(export);
+    return result;
 }
 
 static int nbd_co_readv(BlockDriverState *bs, int64_t sector_num,
Signature · 1 line
1.8.3.1
#11 lore raw

PATCH 11/16 nbd: make nbd_client_session_close() idempotent

In reply to Gerd Hoffmann

From: Marc-André Lureau <[email protected]>

---
 block/nbd-client.c | 5 +++++
 1 file changed, 5 insertions(+)
block/nbd-client.c +5 -0
index 3dfae1d..9156093 100644
@@ -337,7 +337,12 @@ static void nbd_teardown_connection(NbdClientSession *client)
 
 void nbd_client_session_close(NbdClientSession *client)
 {
+    if (!client->bs) {
+        return;
+    }
+
     nbd_teardown_connection(client);
+    client->bs = NULL;
 }
 
 int nbd_client_session_init(NbdClientSession *client, BlockDriverState *bs,
Signature · 1 line
1.8.3.1
#12 lore raw

PATCH 12/16 nbd: finish any pending coroutine

In reply to Gerd Hoffmann

From: Marc-André Lureau <[email protected]>

Make sure all pending coroutines are finished when closing the session.

---
 block/nbd-client.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)
block/nbd-client.c +16 -5
index 9156093..1973cf0 100644
@@ -32,6 +32,17 @@
 #define HANDLE_TO_INDEX(bs, handle) ((handle) ^ ((uint64_t)(intptr_t)bs))
 #define INDEX_TO_HANDLE(bs, index)  ((index)  ^ ((uint64_t)(intptr_t)bs))
 
+static void nbd_recv_coroutines_enter_all(NbdClientSession *s)
+{
+    int i;
+
+    for (i = 0; i < MAX_NBD_REQUESTS; i++) {
+        if (s->recv_coroutine[i]) {
+            qemu_coroutine_enter(s->recv_coroutine[i], NULL);
+        }
+    }
+}
+
 static void nbd_reply_ready(void *opaque)
 {
     NbdClientSession *s = opaque;
@@ -67,11 +78,7 @@ static void nbd_reply_ready(void *opaque)
     }
 
 fail:
-    for (i = 0; i < MAX_NBD_REQUESTS; i++) {
-        if (s->recv_coroutine[i]) {
-            qemu_coroutine_enter(s->recv_coroutine[i], NULL);
-        }
-    }
+    nbd_recv_coroutines_enter_all(s);
 }
 
 static void nbd_restart_write(void *opaque)
@@ -330,6 +337,10 @@ static void nbd_teardown_connection(NbdClientSession *client)
     request.len = 0;
     nbd_send_request(client->sock, &request);
 
+    /* finish any pending coroutines */
+    shutdown(client->sock, 2);
+    nbd_recv_coroutines_enter_all(client);
+
     qemu_aio_set_fd_handler(client->sock, NULL, NULL, NULL);
     closesocket(client->sock);
     client->sock = -1;
Signature · 1 line
1.8.3.1
#13 lore raw

PATCH 13/16 nbd: avoid uninitialized warnings

In reply to Gerd Hoffmann

From: Marc-André Lureau <[email protected]>

==15815== Thread 1:
==15815== Syscall param socketcall.sendto(msg) points to uninitialised byte(s)

==15815==    at 0x65AD5CB: send (send.c:31)
==15815==    by 0x37F84B: nbd_wr_sync (nbd.c:145)
==15815==    by 0x37F94B: write_sync (nbd.c:186)
==15815==    by 0x380FA9: nbd_send_request (nbd.c:681)
==15815==    by 0x1C4A2D: nbd_teardown_connection (nbd-client.c:337)
==15815==    by 0x1C4AD8: nbd_client_session_close (nbd-client.c:354)
==15815==    by 0x1ED2D8: close_socketpair (spicebd.c:132)
==15815==    by 0x1EE265: spice_close (spicebd.c:457)
==15815==    by 0x1ACBF6: bdrv_close (block.c:1519)
==15815==    by 0x1AD804: bdrv_delete (block.c:1772)
==15815==    by 0x1B4136: bdrv_unref (block.c:4476)
==15815==    by 0x1ACCE0: bdrv_close (block.c:1541)

==15815== Address 0x7feffef98 is on thread 1's stack

---
 block/nbd-client.c | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)
block/nbd-client.c +9 -12
index 1973cf0..0922b78 100644
@@ -185,11 +185,10 @@ static int nbd_co_readv_1(NbdClientSession *client, int64_t sector_num,
                           int nb_sectors, QEMUIOVector *qiov,
                           int offset)
 {
-    struct nbd_request request;
+    struct nbd_request request = { .type = NBD_CMD_READ };
     struct nbd_reply reply;
     ssize_t ret;
 
-    request.type = NBD_CMD_READ;
     request.from = sector_num * 512;
     request.len = nb_sectors * 512;
 
@@ -209,11 +208,10 @@ static int nbd_co_writev_1(NbdClientSession *client, int64_t sector_num,
                            int nb_sectors, QEMUIOVector *qiov,
                            int offset)
 {
-    struct nbd_request request;
+    struct nbd_request request = { .type = NBD_CMD_WRITE };
     struct nbd_reply reply;
     ssize_t ret;
 
-    request.type = NBD_CMD_WRITE;
     if (!bdrv_enable_write_cache(client->bs) &&
         (client->nbdflags & NBD_FLAG_SEND_FUA)) {
         request.type |= NBD_CMD_FLAG_FUA;
@@ -275,7 +273,7 @@ int nbd_client_session_co_writev(NbdClientSession *client, int64_t sector_num,
 
 int nbd_client_session_co_flush(NbdClientSession *client)
 {
-    struct nbd_request request;
+    struct nbd_request request = { .type = NBD_CMD_FLUSH };
     struct nbd_reply reply;
     ssize_t ret;
 
@@ -283,7 +281,6 @@ int nbd_client_session_co_flush(NbdClientSession *client)
         return 0;
     }
 
-    request.type = NBD_CMD_FLUSH;
     if (client->nbdflags & NBD_FLAG_SEND_FUA) {
         request.type |= NBD_CMD_FLAG_FUA;
     }
@@ -305,14 +302,13 @@ int nbd_client_session_co_flush(NbdClientSession *client)
 int nbd_client_session_co_discard(NbdClientSession *client, int64_t sector_num,
     int nb_sectors)
 {
-    struct nbd_request request;
+    struct nbd_request request = { .type = NBD_CMD_TRIM };
     struct nbd_reply reply;
     ssize_t ret;
 
     if (!(client->nbdflags & NBD_FLAG_SEND_TRIM)) {
         return 0;
     }
-    request.type = NBD_CMD_TRIM;
     request.from = sector_num * 512;
     request.len = nb_sectors * 512;
 
@@ -330,11 +326,12 @@ int nbd_client_session_co_discard(NbdClientSession *client, int64_t sector_num,
 
 static void nbd_teardown_connection(NbdClientSession *client)
 {
-    struct nbd_request request;
+    struct nbd_request request = {
+        .type = NBD_CMD_DISC,
+        .from = 0,
+        .len = 0
+    };
 
-    request.type = NBD_CMD_DISC;
-    request.from = 0;
-    request.len = 0;
     nbd_send_request(client->sock, &request);
 
     /* finish any pending coroutines */
Signature · 1 line
1.8.3.1
#14 lore raw

PATCH 14/16 spice: move qemu_spice_display_*() from spice-graphics to spice-core

In reply to Gerd Hoffmann
---
 ui/spice-core.c    | 16 ++++++++++++++++
 ui/spice-display.c | 17 -----------------
 2 files changed, 16 insertions(+), 17 deletions(-)
ui/spice-core.c +16 -0
index 9fb9544..0c48156 100644
@@ -47,6 +47,7 @@ static const char *auth = "spice";
 static char *auth_passwd;
 static time_t auth_expires = TIME_MAX;
 static int spice_migration_completed;
+static int spice_display_is_running;
 int using_spice = 0;
 
 static QemuThread me;
@@ -904,6 +905,21 @@ int qemu_spice_display_add_client(int csock, int skipauth, int tls)
     }
 }
 
+void qemu_spice_display_start(void)
+{
+    spice_display_is_running = true;
+}
+
+void qemu_spice_display_stop(void)
+{
+    spice_display_is_running = false;
+}
+
+int qemu_spice_display_is_running(SimpleSpiceDisplay *ssd)
+{
+    return spice_display_is_running;
+}
+
 static void spice_register_config(void)
 {
     qemu_add_opts(&qemu_spice_opts);
ui/spice-display.c +0 -17
index f23a318..9bb42f1 100644
@@ -126,23 +126,6 @@ void qemu_spice_wakeup(SimpleSpiceDisplay *ssd)
     spice_qxl_wakeup(&ssd->qxl);
 }
 
-static int spice_display_is_running;
-
-void qemu_spice_display_start(void)
-{
-    spice_display_is_running = true;
-}
-
-void qemu_spice_display_stop(void)
-{
-    spice_display_is_running = false;
-}
-
-int qemu_spice_display_is_running(SimpleSpiceDisplay *ssd)
-{
-    return spice_display_is_running;
-}
-
 static void qemu_spice_create_one_update(SimpleSpiceDisplay *ssd,
                                          QXLRect *rect)
 {
Signature · 1 line
1.8.3.1
#15 lore raw

PATCH 15/16 spice: move spice_server_vm_{start, stop} calls into qemu_spice_display_*()

In reply to Gerd Hoffmann

So calling spice server to start/stop the worker goes hand in hand with the status variable update.

---
 ui/spice-core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
ui/spice-core.c +2 -2
index 0c48156..4cce3b3 100644
@@ -623,9 +623,7 @@ static void vm_change_state_handler(void *opaque, int running,
 {
     if (running) {
         qemu_spice_display_start();
-        spice_server_vm_start(spice_server);
     } else {
-        spice_server_vm_stop(spice_server);
         qemu_spice_display_stop();
     }
 }
@@ -908,10 +906,12 @@ int qemu_spice_display_add_client(int csock, int skipauth, int tls)
 void qemu_spice_display_start(void)
 {
     spice_display_is_running = true;
+    spice_server_vm_start(spice_server);
 }
 
 void qemu_spice_display_stop(void)
 {
+    spice_server_vm_stop(spice_server);
     spice_display_is_running = false;
 }
 
Signature · 1 line
1.8.3.1
#16 lore raw

PATCH 16/16 spice: stop server for qxl hard reset

In reply to Gerd Hoffmann

Hard reset can happen at any time. We should be able to put qxl into a known-good state no matter what. Stop spice server thread for reset so it can't be confused by fetching stale commands lingering around in the rings while we reset is ongoing.

---
 hw/display/qxl.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
hw/display/qxl.c +10 -0
index efdefd6..e4f172e 100644
@@ -1144,8 +1144,14 @@ static void qxl_soft_reset(PCIQXLDevice *d)
 
 static void qxl_hard_reset(PCIQXLDevice *d, int loadvm)
 {
+    bool startstop = qemu_spice_display_is_running(&d->ssd);
+
     trace_qxl_hard_reset(d->id, loadvm);
 
+    if (startstop) {
+        qemu_spice_display_stop();
+    }
+
     qxl_spice_reset_cursor(d);
     qxl_spice_reset_image_cache(d);
     qxl_reset_surfaces(d);
@@ -1159,6 +1165,10 @@ static void qxl_hard_reset(PCIQXLDevice *d, int loadvm)
     }
     qemu_spice_create_host_memslot(&d->ssd);
     qxl_soft_reset(d);
+
+    if (startstop) {
+        qemu_spice_display_start();
+    }
 }
 
 static void qxl_reset_handler(DeviceState *dev)
Signature · 1 line
1.8.3.1