[Qemu-devel] [PULL] spice patch queue

[Qemu-devel] [PULL] spice patch queue

[Gerd Hoffmann]

  Hi,

Here comes a bunch of spice/qxl fixes and cleanups.  No major changes.

please pull,
  Gerd

The following changes since commit 952e849c150b4f1b89f8728cba00f925c1d6e75b:

  Merge remote-tracking branch 'bonzini/split-main-loop-for-anthony' into staging (2011-10-24 10:51:12 -0500)

are available in the git repository at:

  git://anongit.freedesktop.org/spice/qemu spice.v45

Alon Levy (2):
      ui/spice-core: fix segfault in monitor
      qxl: reset update_surface

Gerd Hoffmann (3):
      migration: add status query functions
      qxl: factor out properties
      spice: fix file handle cleanup

Jan Kiszka (3):
      spice: Convert core to QEMU thread API
      qxl: Convert to QEMU thread API
      qxl: Drop phread_yield on OOM

Yonit Halperin (3):
      spice: turn client_migrate_info to async
      spice: support the new migration interface (spice 0.8.3)
      qxl: fix guest cursor tracking

 hmp-commands.hx |    3 +-
 hw/qxl.c        |   66 +++++++++++++++++++++-------------------------
 hw/qxl.h        |    3 +-
 migration.c     |   11 ++++++++
 migration.h     |    2 +
 monitor.c       |    6 +++-
 qmp-commands.hx |    3 +-
 ui/qemu-spice.h |   14 ++++++++--
 ui/spice-core.c |   78 +++++++++++++++++++++++++++++++++++++++++++++++-------
 9 files changed, 132 insertions(+), 54 deletions(-)

[Qemu-devel] [PATCH 01/11] migration: add status query functions

[Gerd Hoffmann]

Add migration_is_active and migration_has_failed functions
to query migration state.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 migration.c |   11 +++++++++++
 migration.h |    2 ++
 2 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/migration.c b/migration.c
index bdca72e..d693567 100644
--- a/migration.c
+++ b/migration.c
@@ -372,11 +372,22 @@ void remove_migration_state_change_notifier(Notifier *notify)
     notifier_list_remove(&migration_state_notifiers, notify);
 }
 
+bool migration_is_active(MigrationState *s)
+{
+    return s->state == MIG_STATE_ACTIVE;
+}
+
 bool migration_has_finished(MigrationState *s)
 {
     return s->state == MIG_STATE_COMPLETED;
 }
 
+bool migration_has_failed(MigrationState *s)
+{
+    return (s->state == MIG_STATE_CANCELLED ||
+            s->state == MIG_STATE_ERROR);
+}
+
 void migrate_fd_connect(MigrationState *s)
 {
     int ret;
diff --git a/migration.h b/migration.h
index a1f80d0..1b8ee58 100644
--- a/migration.h
+++ b/migration.h
@@ -76,7 +76,9 @@ void migrate_fd_connect(MigrationState *s);
 
 void add_migration_state_change_notifier(Notifier *notify);
 void remove_migration_state_change_notifier(Notifier *notify);
+bool migration_is_active(MigrationState *);
 bool migration_has_finished(MigrationState *);
+bool migration_has_failed(MigrationState *);
 
 uint64_t ram_bytes_remaining(void);
 uint64_t ram_bytes_transferred(void);
-- 
1.7.1

[Qemu-devel] [PATCH 02/11] spice: turn client_migrate_info to async

[Gerd Hoffmann]

From: Yonit Halperin <yhalperi@redhat.com>

RHBZ 737921
Spice client is required to connect to the migration target before/as migration
starts. Since after migration starts, the target qemu is blocked and cannot accept new spice client
we trigger the connection to the target upon client_migrate_info command.
client_migrate_info completion cb will be called after spice client has been
connected to the target (or a timeout). See following patches and spice patches.

Signed-off-by: Yonit Halperin <yhalperi@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hmp-commands.hx |    3 ++-
 monitor.c       |    6 ++++--
 qmp-commands.hx |    3 ++-
 ui/qemu-spice.h |   14 +++++++++++---
 ui/spice-core.c |   10 +++++++---
 5 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/hmp-commands.hx b/hmp-commands.hx
index ab08d58..e181267 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -824,7 +824,8 @@ ETEXI
         .params     = "protocol hostname port tls-port cert-subject",
         .help       = "send migration info to spice/vnc client",
         .user_print = monitor_user_noop,
-        .mhandler.cmd_new = client_migrate_info,
+        .mhandler.cmd_async = client_migrate_info,
+        .flags      = MONITOR_CMD_ASYNC,
     },
 
 STEXI
diff --git a/monitor.c b/monitor.c
index ffda0fe..13b0fa5 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1153,7 +1153,8 @@ static int add_graphics_client(Monitor *mon, const QDict *qdict, QObject **ret_d
     return -1;
 }
 
-static int client_migrate_info(Monitor *mon, const QDict *qdict, QObject **ret_data)
+static int client_migrate_info(Monitor *mon, const QDict *qdict,
+                               MonitorCompletion cb, void *opaque)
 {
     const char *protocol = qdict_get_str(qdict, "protocol");
     const char *hostname = qdict_get_str(qdict, "hostname");
@@ -1168,7 +1169,8 @@ static int client_migrate_info(Monitor *mon, const QDict *qdict, QObject **ret_d
             return -1;
         }
 
-        ret = qemu_spice_migrate_info(hostname, port, tls_port, subject);
+        ret = qemu_spice_migrate_info(hostname, port, tls_port, subject,
+                                      cb, opaque);
         if (ret != 0) {
             qerror_report(QERR_UNDEFINED_ERROR);
             return -1;
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 4328e8b..cb60d0c 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -569,7 +569,8 @@ EQMP
         .params     = "protocol hostname port tls-port cert-subject",
         .help       = "send migration info to spice/vnc client",
         .user_print = monitor_user_noop,
-        .mhandler.cmd_new = client_migrate_info,
+        .mhandler.cmd_async = client_migrate_info,
+        .flags      = MONITOR_CMD_ASYNC,
     },
 
 SQMP
diff --git a/ui/qemu-spice.h b/ui/qemu-spice.h
index f34be69..c35b29c 100644
--- a/ui/qemu-spice.h
+++ b/ui/qemu-spice.h
@@ -25,6 +25,7 @@
 #include "qemu-option.h"
 #include "qemu-config.h"
 #include "qemu-char.h"
+#include "monitor.h"
 
 extern int using_spice;
 
@@ -37,7 +38,8 @@ int qemu_spice_set_passwd(const char *passwd,
                           bool fail_if_connected, bool disconnect_if_connected);
 int qemu_spice_set_pw_expire(time_t expires);
 int qemu_spice_migrate_info(const char *hostname, int port, int tls_port,
-                            const char *subject);
+                            const char *subject,
+                            MonitorCompletion cb, void *opaque);
 
 void do_info_spice_print(Monitor *mon, const QObject *data);
 void do_info_spice(Monitor *mon, QObject **ret_data);
@@ -45,6 +47,7 @@ void do_info_spice(Monitor *mon, QObject **ret_data);
 int qemu_chr_open_spice(QemuOpts *opts, CharDriverState **_chr);
 
 #else  /* CONFIG_SPICE */
+#include "monitor.h"
 
 #define using_spice 0
 static inline int qemu_spice_set_passwd(const char *passwd,
@@ -57,8 +60,13 @@ static inline int qemu_spice_set_pw_expire(time_t expires)
 {
     return -1;
 }
-static inline int qemu_spice_migrate_info(const char *h, int p, int t, const char *s)
-{ return -1; }
+static inline int qemu_spice_migrate_info(const char *h, int p, int t,
+                                          const char *s,
+                                          MonitorCompletion cb, void *opaque)
+{
+    cb(opaque, NULL);
+    return -1;
+}
 
 #endif /* CONFIG_SPICE */
 
diff --git a/ui/spice-core.c b/ui/spice-core.c
index b33366e..62ffb9b 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -457,10 +457,14 @@ static void migration_state_notifier(Notifier *notifier, void *data)
 }
 
 int qemu_spice_migrate_info(const char *hostname, int port, int tls_port,
-                            const char *subject)
+                            const char *subject,
+                            MonitorCompletion *cb, void *opaque)
 {
-    return spice_server_migrate_info(spice_server, hostname,
-                                     port, tls_port, subject);
+    int ret;
+    ret = spice_server_migrate_info(spice_server, hostname,
+                                    port, tls_port, subject);
+    cb(opaque, NULL);
+    return ret;
 }
 
 static int add_channel(const char *name, const char *value, void *opaque)
-- 
1.7.1

[Qemu-devel] [PATCH 03/11] spice: support the new migration interface (spice 0.8.3)

[Gerd Hoffmann]

From: Yonit Halperin <yhalperi@redhat.com>

- call spice_server_migrate_(start|end|connect).
- register spice_migrate_connect completion callback

Signed-off-by: Yonit Halperin <yhalperi@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 ui/spice-core.c |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 55 insertions(+), 1 deletions(-)

diff --git a/ui/spice-core.c b/ui/spice-core.c
index 62ffb9b..8a86e45 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -288,6 +288,38 @@ static SpiceCoreInterface core_interface = {
 #endif
 };
 
+#ifdef SPICE_INTERFACE_MIGRATION
+typedef struct SpiceMigration {
+    SpiceMigrateInstance sin;
+    struct {
+        MonitorCompletion *cb;
+        void *opaque;
+    } connect_complete;
+} SpiceMigration;
+
+static void migrate_connect_complete_cb(SpiceMigrateInstance *sin);
+
+static const SpiceMigrateInterface migrate_interface = {
+    .base.type = SPICE_INTERFACE_MIGRATION,
+    .base.description = "migration",
+    .base.major_version = SPICE_INTERFACE_MIGRATION_MAJOR,
+    .base.minor_version = SPICE_INTERFACE_MIGRATION_MINOR,
+    .migrate_connect_complete = migrate_connect_complete_cb,
+    .migrate_end_complete = NULL,
+};
+
+static SpiceMigration spice_migrate;
+
+static void migrate_connect_complete_cb(SpiceMigrateInstance *sin)
+{
+    SpiceMigration *sm = container_of(sin, SpiceMigration, sin);
+    if (sm->connect_complete.cb) {
+        sm->connect_complete.cb(sm->connect_complete.opaque, NULL);
+    }
+    sm->connect_complete.cb = NULL;
+}
+#endif
+
 /* config string parsing */
 
 static int name2enum(const char *string, const char *table[], int entries)
@@ -449,9 +481,19 @@ static void migration_state_notifier(Notifier *notifier, void *data)
 {
     MigrationState *s = data;
 
-    if (migration_has_finished(s)) {
+    if (migration_is_active(s)) {
+#ifdef SPICE_INTERFACE_MIGRATION
+        spice_server_migrate_start(spice_server);
+#endif
+    } else if (migration_has_finished(s)) {
 #if SPICE_SERVER_VERSION >= 0x000701 /* 0.7.1 */
+#ifndef SPICE_INTERFACE_MIGRATION
         spice_server_migrate_switch(spice_server);
+#else
+        spice_server_migrate_end(spice_server, true);
+    } else if (migration_has_failed(s)) {
+        spice_server_migrate_end(spice_server, false);
+#endif
 #endif
     }
 }
@@ -461,9 +503,16 @@ int qemu_spice_migrate_info(const char *hostname, int port, int tls_port,
                             MonitorCompletion *cb, void *opaque)
 {
     int ret;
+#ifdef SPICE_INTERFACE_MIGRATION
+    spice_migrate.connect_complete.cb = cb;
+    spice_migrate.connect_complete.opaque = opaque;
+    ret = spice_server_migrate_connect(spice_server, hostname,
+                                       port, tls_port, subject);
+#else
     ret = spice_server_migrate_info(spice_server, hostname,
                                     port, tls_port, subject);
     cb(opaque, NULL);
+#endif
     return ret;
 }
 
@@ -654,6 +703,11 @@ void qemu_spice_init(void)
 
     migration_state.notify = migration_state_notifier;
     add_migration_state_change_notifier(&migration_state);
+#ifdef SPICE_INTERFACE_MIGRATION
+    spice_migrate.sin.base.sif = &migrate_interface.base;
+    spice_migrate.connect_complete.cb = NULL;
+    qemu_spice_add_interface(&spice_migrate.sin.base);
+#endif
 
     qemu_spice_input_init();
     qemu_spice_audio_init();
-- 
1.7.1

[Qemu-devel] [PATCH 04/11] spice: Convert core to QEMU thread API

[Gerd Hoffmann]

From: Jan Kiszka <jan.kiszka@siemens.com>

No need to use pthread directly, we have proper abstractions for
identity checking.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 ui/spice-core.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/spice-core.c b/ui/spice-core.c
index 8a86e45..4c06c36 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -19,10 +19,10 @@
 #include <spice-experimental.h>
 
 #include <netdb.h>
-#include <pthread.h>
 
 #include "qemu-common.h"
 #include "qemu-spice.h"
+#include "qemu-thread.h"
 #include "qemu-timer.h"
 #include "qemu-queue.h"
 #include "qemu-x509.h"
@@ -45,7 +45,7 @@ static char *auth_passwd;
 static time_t auth_expires = TIME_MAX;
 int using_spice = 0;
 
-static pthread_t me;
+static QemuThread me;
 
 struct SpiceTimer {
     QEMUTimer *timer;
@@ -229,7 +229,7 @@ static void channel_event(int event, SpiceChannelEventInfo *info)
      * thread and grab the iothread lock if so before calling qemu
      * functions.
      */
-    bool need_lock = !pthread_equal(me, pthread_self());
+    bool need_lock = !qemu_thread_is_self(&me);
     if (need_lock) {
         qemu_mutex_lock_iothread();
     }
@@ -556,7 +556,7 @@ void qemu_spice_init(void)
     spice_image_compression_t compression;
     spice_wan_compression_t wan_compr;
 
-    me = pthread_self();
+    qemu_thread_get_self(&me);
 
    if (!opts) {
         return;
-- 
1.7.1

[Qemu-devel] [PATCH 05/11] qxl: Convert to QEMU thread API

[Gerd Hoffmann]

From: Jan Kiszka <jan.kiszka@siemens.com>

Use QEMU thread API instead of pthread directly. We still need to get
rid of pthread_yield, though, to drop pthread.h inclusion.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/qxl.c |    4 ++--
 hw/qxl.h |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/hw/qxl.c b/hw/qxl.c
index 03848ed..a0b0f36 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -1372,7 +1372,7 @@ static void qxl_send_events(PCIQXLDevice *d, uint32_t events)
     if ((old_pending & le_events) == le_events) {
         return;
     }
-    if (pthread_self() == d->main) {
+    if (qemu_thread_is_self(&d->main)) {
         qxl_update_irq(d);
     } else {
         if (write(d->pipe[1], d, 1) != 1) {
@@ -1391,7 +1391,7 @@ static void init_pipe_signaling(PCIQXLDevice *d)
    fcntl(d->pipe[1], F_SETFL, O_NONBLOCK);
    fcntl(d->pipe[0], F_SETOWN, getpid());
 
-   d->main = pthread_self();
+   qemu_thread_get_self(&d->main);
    qemu_set_fd_handler(d->pipe[0], pipe_read, NULL, d);
 }
 
diff --git a/hw/qxl.h b/hw/qxl.h
index 868db81..37b2619 100644
--- a/hw/qxl.h
+++ b/hw/qxl.h
@@ -4,6 +4,7 @@
 #include "hw.h"
 #include "pci.h"
 #include "vga_int.h"
+#include "qemu-thread.h"
 
 #include "ui/qemu-spice.h"
 #include "ui/spice-display.h"
@@ -63,7 +64,7 @@ typedef struct PCIQXLDevice {
     QemuMutex          track_lock;
 
     /* thread signaling */
-    pthread_t          main;
+    QemuThread         main;
     int                pipe[2];
 
     /* ram pci bar */
-- 
1.7.1

[Qemu-devel] [PATCH 06/11] qxl: Drop phread_yield on OOM

[Gerd Hoffmann]

From: Jan Kiszka <jan.kiszka@siemens.com>

This was only a best-effort attempt, by far not guaranteed to have an
effect. Drop it so that also no direct pthread usage remain in the
device model.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/qxl.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/hw/qxl.c b/hw/qxl.c
index a0b0f36..fb2b22d 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -18,8 +18,6 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <pthread.h>
-
 #include "qemu-common.h"
 #include "qemu-timer.h"
 #include "qemu-queue.h"
@@ -1215,10 +1213,6 @@ async_common:
         if (!SPICE_RING_IS_EMPTY(&d->ram->release_ring)) {
             break;
         }
-        pthread_yield();
-        if (!SPICE_RING_IS_EMPTY(&d->ram->release_ring)) {
-            break;
-        }
         d->oom_running = 1;
         qxl_spice_oom(d);
         d->oom_running = 0;
-- 
1.7.1

[Qemu-devel] [PATCH 07/11] ui/spice-core: fix segfault in monitor

[Gerd Hoffmann]

From: Alon Levy <alevy@redhat.com>

Fix segfault if a qxl device is present but no spice command line
argument is given.

RHBZ 743251.

Signed-off-by: Alon Levy <alevy@redhat.com>
---
 ui/spice-core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ui/spice-core.c b/ui/spice-core.c
index 4c06c36..be52356 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -445,7 +445,7 @@ void do_info_spice(Monitor *mon, QObject **ret_data)
     int port, tls_port;
     char version_string[20]; /* 12 = |255.255.255\0| is the max */
 
-    if (!spice_server) {
+    if (!spice_server || !opts) {
         *ret_data = qobject_from_jsonf("{ 'enabled': false }");
         return;
     }
-- 
1.7.1

[Qemu-devel] [PATCH 08/11] qxl: factor out properties

[Gerd Hoffmann]

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/qxl.c |   39 +++++++++++++++------------------------
 1 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/hw/qxl.c b/hw/qxl.c
index fb2b22d..2ca1b04 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -1781,6 +1781,19 @@ static VMStateDescription qxl_vmstate = {
     },
 };
 
+static Property qxl_properties[] = {
+        DEFINE_PROP_UINT32("ram_size", PCIQXLDevice, vga.vram_size,
+                           64 * 1024 * 1024),
+        DEFINE_PROP_UINT32("vram_size", PCIQXLDevice, vram_size,
+                           64 * 1024 * 1024),
+        DEFINE_PROP_UINT32("revision", PCIQXLDevice, revision,
+                           QXL_DEFAULT_REVISION),
+        DEFINE_PROP_UINT32("debug", PCIQXLDevice, debug, 0),
+        DEFINE_PROP_UINT32("guestdebug", PCIQXLDevice, guestdebug, 0),
+        DEFINE_PROP_UINT32("cmdlog", PCIQXLDevice, cmdlog, 0),
+        DEFINE_PROP_END_OF_LIST(),
+};
+
 static PCIDeviceInfo qxl_info_primary = {
     .qdev.name    = "qxl-vga",
     .qdev.desc    = "Spice QXL GPU (primary, vga compatible)",
@@ -1793,18 +1806,7 @@ static PCIDeviceInfo qxl_info_primary = {
     .vendor_id    = REDHAT_PCI_VENDOR_ID,
     .device_id    = QXL_DEVICE_ID_STABLE,
     .class_id     = PCI_CLASS_DISPLAY_VGA,
-    .qdev.props = (Property[]) {
-        DEFINE_PROP_UINT32("ram_size", PCIQXLDevice, vga.vram_size,
-                           64 * 1024 * 1024),
-        DEFINE_PROP_UINT32("vram_size", PCIQXLDevice, vram_size,
-                           64 * 1024 * 1024),
-        DEFINE_PROP_UINT32("revision", PCIQXLDevice, revision,
-                           QXL_DEFAULT_REVISION),
-        DEFINE_PROP_UINT32("debug", PCIQXLDevice, debug, 0),
-        DEFINE_PROP_UINT32("guestdebug", PCIQXLDevice, guestdebug, 0),
-        DEFINE_PROP_UINT32("cmdlog", PCIQXLDevice, cmdlog, 0),
-        DEFINE_PROP_END_OF_LIST(),
-    }
+    .qdev.props   = qxl_properties,
 };
 
 static PCIDeviceInfo qxl_info_secondary = {
@@ -1817,18 +1819,7 @@ static PCIDeviceInfo qxl_info_secondary = {
     .vendor_id    = REDHAT_PCI_VENDOR_ID,
     .device_id    = QXL_DEVICE_ID_STABLE,
     .class_id     = PCI_CLASS_DISPLAY_OTHER,
-    .qdev.props = (Property[]) {
-        DEFINE_PROP_UINT32("ram_size", PCIQXLDevice, vga.vram_size,
-                           64 * 1024 * 1024),
-        DEFINE_PROP_UINT32("vram_size", PCIQXLDevice, vram_size,
-                           64 * 1024 * 1024),
-        DEFINE_PROP_UINT32("revision", PCIQXLDevice, revision,
-                           QXL_DEFAULT_REVISION),
-        DEFINE_PROP_UINT32("debug", PCIQXLDevice, debug, 0),
-        DEFINE_PROP_UINT32("guestdebug", PCIQXLDevice, guestdebug, 0),
-        DEFINE_PROP_UINT32("cmdlog", PCIQXLDevice, cmdlog, 0),
-        DEFINE_PROP_END_OF_LIST(),
-    }
+    .qdev.props   = qxl_properties,
 };
 
 static void qxl_register(void)
-- 
1.7.1

[Qemu-devel] [PATCH 09/11] qxl: fix guest cursor tracking

[Gerd Hoffmann]

From: Yonit Halperin <yhalperi@redhat.com>

(1) If the guest cursor command is empty, don't reload it after migration.
(2) Cleaning the guest cursor when it is released by
    the spice server. In addition, explicitly reset the
    cursor in spice upon destroying the primary surface
    (was done by spice-server implicitly). This will prevent
    access to pci memory that was released.

RHBZ: 744518

Signed-off-by: Yonit Halperin <yhalperi@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/qxl.c |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/hw/qxl.c b/hw/qxl.c
index 2ca1b04..3a3b3a4 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -236,6 +236,9 @@ void qxl_spice_reset_image_cache(PCIQXLDevice *qxl)
 void qxl_spice_reset_cursor(PCIQXLDevice *qxl)
 {
     qxl->ssd.worker->reset_cursor(qxl->ssd.worker);
+    qemu_mutex_lock(&qxl->track_lock);
+    qxl->guest_cursor = 0;
+    qemu_mutex_unlock(&qxl->track_lock);
 }
 
 
@@ -400,7 +403,9 @@ static void qxl_track_command(PCIQXLDevice *qxl, struct QXLCommandExt *ext)
     {
         QXLCursorCmd *cmd = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id);
         if (cmd->type == QXL_CURSOR_SET) {
+            qemu_mutex_lock(&qxl->track_lock);
             qxl->guest_cursor = ext->cmd.data;
+            qemu_mutex_unlock(&qxl->track_lock);
         }
         break;
     }
@@ -1065,6 +1070,7 @@ static int qxl_destroy_primary(PCIQXLDevice *d, qxl_async_io async)
 
     d->mode = QXL_MODE_UNDEFINED;
     qemu_spice_destroy_primary_surface(&d->ssd, 0, async);
+    qxl_spice_reset_cursor(d);
     return 1;
 }
 
@@ -1704,10 +1710,12 @@ static int qxl_post_load(void *opaque, int version)
             cmds[out].group_id = MEMSLOT_GROUP_GUEST;
             out++;
         }
-        cmds[out].cmd.data = d->guest_cursor;
-        cmds[out].cmd.type = QXL_CMD_CURSOR;
-        cmds[out].group_id = MEMSLOT_GROUP_GUEST;
-        out++;
+        if (d->guest_cursor) {
+            cmds[out].cmd.data = d->guest_cursor;
+            cmds[out].cmd.type = QXL_CMD_CURSOR;
+            cmds[out].group_id = MEMSLOT_GROUP_GUEST;
+            out++;
+        }
         qxl_spice_loadvm_commands(d, cmds, out);
         g_free(cmds);
 
-- 
1.7.1

[Qemu-devel] [PATCH 10/11] qxl: reset update_surface

[Gerd Hoffmann]

From: Alon Levy <alevy@redhat.com>

update init_qxl_ram to reset update_surface to 0. This fixes one case
of breakage when installing an old driver in a vm that had a new driver
installed. The newer driver would know about surface creation and would
change update_surface to !=0, then a reset would happen, all surfaces
are destroyed, then the old driver is initialized and issues an
UPDATE_AREA, and spice server aborts on invalid surface.

RHBZ: 690427

Signed-off-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/qxl.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/hw/qxl.c b/hw/qxl.c
index 3a3b3a4..12f71aa 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -331,6 +331,7 @@ static void init_qxl_ram(PCIQXLDevice *d)
     d->ram->magic       = cpu_to_le32(QXL_RAM_MAGIC);
     d->ram->int_pending = cpu_to_le32(0);
     d->ram->int_mask    = cpu_to_le32(0);
+    d->ram->update_surface = 0;
     SPICE_RING_INIT(&d->ram->cmd_ring);
     SPICE_RING_INIT(&d->ram->cursor_ring);
     SPICE_RING_INIT(&d->ram->release_ring);
-- 
1.7.1

[Qemu-devel] [PATCH 11/11] spice: fix file handle cleanup

[Gerd Hoffmann]

Setting both read and write handlers to NULL in qemu_set_fd_handler
is not enougth to make qemu purge the file handle from the list.
We must set opaque to NULL too.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 ui/spice-core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ui/spice-core.c b/ui/spice-core.c
index be52356..6d3dab6 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -133,7 +133,7 @@ static SpiceWatch *watch_add(int fd, int event_mask, SpiceWatchFunc func, void *
 
 static void watch_remove(SpiceWatch *watch)
 {
-    watch_update_mask(watch, 0);
+    qemu_set_fd_handler(watch->fd, NULL, NULL, NULL);
     QTAILQ_REMOVE(&watches, watch, next);
     g_free(watch);
 }
-- 
1.7.1

Re: [Qemu-devel] [PULL] spice patch queue

[Anthony Liguori]

On 10/25/2011 07:25 AM, Gerd Hoffmann wrote:
>    Hi,
>
> Here comes a bunch of spice/qxl fixes and cleanups.  No major changes.

Pulled.  Thanks.

Regards,

Anthony Liguori

>
> please pull,
>    Gerd
>
> The following changes since commit 952e849c150b4f1b89f8728cba00f925c1d6e75b:
>
>    Merge remote-tracking branch 'bonzini/split-main-loop-for-anthony' into staging (2011-10-24 10:51:12 -0500)
>
> are available in the git repository at:
>
>    git://anongit.freedesktop.org/spice/qemu spice.v45
>
> Alon Levy (2):
>        ui/spice-core: fix segfault in monitor
>        qxl: reset update_surface
>
> Gerd Hoffmann (3):
>        migration: add status query functions
>        qxl: factor out properties
>        spice: fix file handle cleanup
>
> Jan Kiszka (3):
>        spice: Convert core to QEMU thread API
>        qxl: Convert to QEMU thread API
>        qxl: Drop phread_yield on OOM
>
> Yonit Halperin (3):
>        spice: turn client_migrate_info to async
>        spice: support the new migration interface (spice 0.8.3)
>        qxl: fix guest cursor tracking
>
>   hmp-commands.hx |    3 +-
>   hw/qxl.c        |   66 +++++++++++++++++++++-------------------------
>   hw/qxl.h        |    3 +-
>   migration.c     |   11 ++++++++
>   migration.h     |    2 +
>   monitor.c       |    6 +++-
>   qmp-commands.hx |    3 +-
>   ui/qemu-spice.h |   14 ++++++++--
>   ui/spice-core.c |   78 +++++++++++++++++++++++++++++++++++++++++++++++-------
>   9 files changed, 132 insertions(+), 54 deletions(-)
>
>

[Qemu-devel] [PULL] spice patch queue

[Gerd Hoffmann]

  Hi,

Here comes the spice patch queue.  For the most part this brings the
async local rendering (for vnc, sdl and screenshots) work done by Alon.
Also a few bug fixes.

please pull,
  Gerd

The following changes since commit b4bd0b168e9f4898b98308f4a8a089f647a86d16:

  audio: Add some fall through comments (2012-02-25 18:16:11 +0400)

are available in the git repository at:
  git://anongit.freedesktop.org/spice/qemu spice.v49

Alon Levy (7):
      qxl: fix spice+sdl no cursor regression
      sdl: remove NULL check, g_malloc0 can't fail
      qxl: drop qxl_spice_update_area_async definition
      qxl: require spice >= 0.8.2
      qxl: remove flipped
      qxl: introduce QXLCookie
      qxl: make qxl_render_update async

Christophe Fergeau (2):
      spice: use error_report to report errors
      Error out when tls-channel option is used without TLS

Gerd Hoffmann (2):
      qxl: add optinal 64bit vram bar
      qxl: properly handle upright and non-shared surfaces

 configure          |    2 +-
 hw/qxl-render.c    |  170 ++++++++++++++++++++++++++----------------
 hw/qxl.c           |  215 +++++++++++++++++++++++++++++++++++++---------------
 hw/qxl.h           |   31 +++++---
 ui/sdl.c           |    4 -
 ui/spice-core.c    |   47 +++++-------
 ui/spice-display.c |   57 ++++++++------
 ui/spice-display.h |   21 +++++
 8 files changed, 353 insertions(+), 194 deletions(-)

Re: [Qemu-devel] [PULL] spice patch queue

[Anthony Liguori]

On 02/28/2012 10:29 AM, Gerd Hoffmann wrote:
>    Hi,
>
> Here comes the spice patch queue.  For the most part this brings the
> async local rendering (for vnc, sdl and screenshots) work done by Alon.
> Also a few bug fixes.
>
> please pull,
>    Gerd

Pulled.  Thanks.

Regards,

Anthony Liguori

> The following changes since commit b4bd0b168e9f4898b98308f4a8a089f647a86d16:
>
>    audio: Add some fall through comments (2012-02-25 18:16:11 +0400)
>
> are available in the git repository at:
>    git://anongit.freedesktop.org/spice/qemu spice.v49
>
> Alon Levy (7):
>        qxl: fix spice+sdl no cursor regression
>        sdl: remove NULL check, g_malloc0 can't fail
>        qxl: drop qxl_spice_update_area_async definition
>        qxl: require spice>= 0.8.2
>        qxl: remove flipped
>        qxl: introduce QXLCookie
>        qxl: make qxl_render_update async
>
> Christophe Fergeau (2):
>        spice: use error_report to report errors
>        Error out when tls-channel option is used without TLS
>
> Gerd Hoffmann (2):
>        qxl: add optinal 64bit vram bar
>        qxl: properly handle upright and non-shared surfaces
>
>   configure          |    2 +-
>   hw/qxl-render.c    |  170 ++++++++++++++++++++++++++----------------
>   hw/qxl.c           |  215 +++++++++++++++++++++++++++++++++++++---------------
>   hw/qxl.h           |   31 +++++---
>   ui/sdl.c           |    4 -
>   ui/spice-core.c    |   47 +++++-------
>   ui/spice-display.c |   57 ++++++++------
>   ui/spice-display.h |   21 +++++
>   8 files changed, 353 insertions(+), 194 deletions(-)
>
>

[Qemu-devel] [PULL] spice patch queue

[Gerd Hoffmann]

  Hi,

Here is the spice patch queue with a collection of little improvements
and bugfixes.  No major stuff.  See individual patches for details.

please pull,
  Gerd

The following changes since commit 99c7f87826337fa81f2f0f9baa9ca0a44faf90e9:

  input: send kbd+mouse events only to running guests. (2012-02-17 11:02:55 -0600)

are available in the git repository at:
  git://anongit.freedesktop.org/spice/qemu spice.v48

Daniel P. Berrange (1):
      Add SPICE support to add_client monitor command

Gerd Hoffmann (5):
      qxl: fix warnings on 32bit
      qxl: don't render stuff when the vm is stopped.
      qxl: drop vram bar minimum size
      qxl: move ram size init to new function
      qxl: add user-friendly bar size properties

Yonit Halperin (3):
      qxl: set only off-screen surfaces dirty instead of the whole vram
      qxl: make sure primary surface is saved on migration also in compat mode
      spice: support ipv6 channel address in monitor events and in spice info

 hw/qxl-render.c |   12 +++----
 hw/qxl.c        |  109 +++++++++++++++++++++++++++++++++++++++----------------
 hw/qxl.h        |    4 ++
 monitor.c       |    9 ++++-
 qmp-commands.hx |    6 ++-
 ui/qemu-spice.h |    7 ++++
 ui/spice-core.c |   50 +++++++++++++++++++++++---
 7 files changed, 150 insertions(+), 47 deletions(-)

Re: [Qemu-devel] [PULL] spice patch queue

[Anthony Liguori]

On 02/21/2012 04:59 AM, Gerd Hoffmann wrote:
>    Hi,
>
> Here is the spice patch queue with a collection of little improvements
> and bugfixes.  No major stuff.  See individual patches for details.

Pulled.  Thanks.

Regards,

Anthony Liguori

> please pull,
>    Gerd
>
> The following changes since commit 99c7f87826337fa81f2f0f9baa9ca0a44faf90e9:
>
>    input: send kbd+mouse events only to running guests. (2012-02-17 11:02:55 -0600)
>
> are available in the git repository at:
>    git://anongit.freedesktop.org/spice/qemu spice.v48
>
> Daniel P. Berrange (1):
>        Add SPICE support to add_client monitor command
>
> Gerd Hoffmann (5):
>        qxl: fix warnings on 32bit
>        qxl: don't render stuff when the vm is stopped.
>        qxl: drop vram bar minimum size
>        qxl: move ram size init to new function
>        qxl: add user-friendly bar size properties
>
> Yonit Halperin (3):
>        qxl: set only off-screen surfaces dirty instead of the whole vram
>        qxl: make sure primary surface is saved on migration also in compat mode
>        spice: support ipv6 channel address in monitor events and in spice info
>
>   hw/qxl-render.c |   12 +++----
>   hw/qxl.c        |  109 +++++++++++++++++++++++++++++++++++++++----------------
>   hw/qxl.h        |    4 ++
>   monitor.c       |    9 ++++-
>   qmp-commands.hx |    6 ++-
>   ui/qemu-spice.h |    7 ++++
>   ui/spice-core.c |   50 +++++++++++++++++++++++---
>   7 files changed, 150 insertions(+), 47 deletions(-)
>
>

[Qemu-devel] [PULL] spice patch queue

[Gerd Hoffmann]

  Hi,

Carrying three little qxl fixes.
Final spice batch for 1.0.

please pull,
  Gerd

The following changes since commit ff74c5a9a91c6dbf1017195462aa4176f7381240:

  Merge remote-tracking branch 'riku/linux-user-for-upstream' into staging (2011-10-31 15:05:40 -0500)

are available in the git repository at:

  git://anongit.freedesktop.org/spice/qemu spice.v46

Alon Levy (1):
      qxl: create slots on post_load in vga state

Gerd Hoffmann (2):
      qxl: stride fixup
      qxl: make sure we continue to run with a shared buffer

 hw/qxl-render.c |   36 ++++++++++++++++++++++++------------
 hw/qxl.c        |   26 +++++++++++++++++++-------
 hw/qxl.h        |    3 ++-
 3 files changed, 45 insertions(+), 20 deletions(-)

Re: [Qemu-devel] [PULL] spice patch queue

[Anthony Liguori]

On 11/01/2011 07:39 AM, Gerd Hoffmann wrote:
>    Hi,
>
> Carrying three little qxl fixes.
> Final spice batch for 1.0.
>
> please pull,
>    Gerd
>
> The following changes since commit ff74c5a9a91c6dbf1017195462aa4176f7381240:
>
>    Merge remote-tracking branch 'riku/linux-user-for-upstream' into staging (2011-10-31 15:05:40 -0500)
>
> are available in the git repository at:
>
>    git://anongit.freedesktop.org/spice/qemu spice.v46

Pulled.  Thanks.

Regards,

Anthony Liguori

>
> Alon Levy (1):
>        qxl: create slots on post_load in vga state
>
> Gerd Hoffmann (2):
>        qxl: stride fixup
>        qxl: make sure we continue to run with a shared buffer
>
>   hw/qxl-render.c |   36 ++++++++++++++++++++++++------------
>   hw/qxl.c        |   26 +++++++++++++++++++-------
>   hw/qxl.h        |    3 ++-
>   3 files changed, 45 insertions(+), 20 deletions(-)
>
>

[Qemu-devel] [PULL] spice patch queue

[Gerd Hoffmann]

  Hi,

Here is the spice patch queue with a collection of bugfixes.

A workaround for the much discussed spice-calls-us-from-wrong-thread
issue is included because it turned out to be not *that* easily fixable
in spice so it will probably take some time.  Also a spice server fix
wouldn't cover already released spice versions.

cheers,
  Gerd

The following changes since commit 344eecf6995f4a0ad1d887cec922f6806f91a3f8:

  mips: Support the MT TCStatus IXMT irq disable flag (2011-09-06 11:09:39 +0200)

are available in the git repository at:
  git://anongit.freedesktop.org/spice/qemu spice.v42

Gerd Hoffmann (1):
      spice: workaround a spice server bug.

Peter Maydell (2):
      spice-qemu-char.c: Use correct printf format char for ssize_t
      hw/qxl: Fix format string errors

Yonit Halperin (3):
      qxl: send interrupt after migration in case ram->int_pending != 0, RHBZ #732949
      qxl: s/qxl_set_irq/qxl_update_irq/
      spice: set qxl->ssd.running=true before telling spice to start, RHBZ #733993

 hw/qxl-logger.c    |    2 +-
 hw/qxl.c           |   26 ++++++++++++++++----------
 spice-qemu-char.c  |    2 +-
 ui/spice-core.c    |   25 ++++++++++++++++++++++++-
 ui/spice-display.c |    3 ++-
 5 files changed, 44 insertions(+), 14 deletions(-)

Re: [Qemu-devel] [PULL] spice patch queue

[Anthony Liguori]

On 09/07/2011 02:38 AM, Gerd Hoffmann wrote:
>    Hi,
>
> Here is the spice patch queue with a collection of bugfixes.
>
> A workaround for the much discussed spice-calls-us-from-wrong-thread
> issue is included because it turned out to be not *that* easily fixable
> in spice so it will probably take some time.  Also a spice server fix
> wouldn't cover already released spice versions.
>
> cheers,
>    Gerd


Pulled.  Thanks.

Regards,

Anthony Liguori

>
> The following changes since commit 344eecf6995f4a0ad1d887cec922f6806f91a3f8:
>
>    mips: Support the MT TCStatus IXMT irq disable flag (2011-09-06 11:09:39 +0200)
>
> are available in the git repository at:
>    git://anongit.freedesktop.org/spice/qemu spice.v42
>
> Gerd Hoffmann (1):
>        spice: workaround a spice server bug.
>
> Peter Maydell (2):
>        spice-qemu-char.c: Use correct printf format char for ssize_t
>        hw/qxl: Fix format string errors
>
> Yonit Halperin (3):
>        qxl: send interrupt after migration in case ram->int_pending != 0, RHBZ #732949
>        qxl: s/qxl_set_irq/qxl_update_irq/
>        spice: set qxl->ssd.running=true before telling spice to start, RHBZ #733993
>
>   hw/qxl-logger.c    |    2 +-
>   hw/qxl.c           |   26 ++++++++++++++++----------
>   spice-qemu-char.c  |    2 +-
>   ui/spice-core.c    |   25 ++++++++++++++++++++++++-
>   ui/spice-display.c |    3 ++-
>   5 files changed, 44 insertions(+), 14 deletions(-)
>
>

[Qemu-devel] [PULL] spice patch queue

[Gerd Hoffmann]

  Hi,

Here comes the spice patch queue with two little fixes queued up and and
extension of the "info spice" monitor command which reports the spice
version too now.

please pull,
  Gerd

The following changes since commit b9c6cbff76061537b722d55f0e321dde2a612a23:

  Merge remote-tracking branch 'pm-arm/for-upstream' into pm (2011-08-09 19:16:43 +0200)

are available in the git repository at:

  git://anongit.freedesktop.org/spice/qemu spice.v41

Alon Levy (2):
      qxl: unbreak after memory API conversion
      ui/spice-core: report compiled-version in info spice/query-spice

Yonit Halperin (1):
      qxl: allowing the command rings to be not empty when spice worker is stopped RHBZ #728984

 hw/qxl.c        |   13 ++++++-------
 ui/spice-core.c |    8 ++++++++
 2 files changed, 14 insertions(+), 7 deletions(-)

Re: [Qemu-devel] [PULL] spice patch queue

[Michael Tokarev]

11.08.2011 11:13, Gerd Hoffmann wrote:
>   Hi,
> 
> Here comes the spice patch queue with two little fixes queued up and and
> extension of the "info spice" monitor command which reports the spice
> version too now.

Should the two fixes go to stable?

/mjt

Re: [Qemu-devel] [PULL] spice patch queue

[Gerd Hoffmann]

On 08/12/11 09:00, Michael Tokarev wrote:
> 11.08.2011 11:13, Gerd Hoffmann wrote:
>>    Hi,
>>
>> Here comes the spice patch queue with two little fixes queued up and and
>> extension of the "info spice" monitor command which reports the spice
>> version too now.
>
> Should the two fixes go to stable?

No, it fixes stuff which is in master only.

cheers,
   Gerd

Re: [Qemu-devel] [PULL] spice patch queue

[Anthony Liguori]

On 08/11/2011 02:13 AM, Gerd Hoffmann wrote:
>    Hi,
>
> Here comes the spice patch queue with two little fixes queued up and and
> extension of the "info spice" monitor command which reports the spice
> version too now.

Pulled.  Thanks.

Regards,

Anthony Liguori

>
> please pull,
>    Gerd
>
> The following changes since commit b9c6cbff76061537b722d55f0e321dde2a612a23:
>
>    Merge remote-tracking branch 'pm-arm/for-upstream' into pm (2011-08-09 19:16:43 +0200)
>
> are available in the git repository at:
>
>    git://anongit.freedesktop.org/spice/qemu spice.v41
>
> Alon Levy (2):
>        qxl: unbreak after memory API conversion
>        ui/spice-core: report compiled-version in info spice/query-spice
>
> Yonit Halperin (1):
>        qxl: allowing the command rings to be not empty when spice worker is stopped RHBZ #728984
>
>   hw/qxl.c        |   13 ++++++-------
>   ui/spice-core.c |    8 ++++++++
>   2 files changed, 14 insertions(+), 7 deletions(-)
>
>

[Qemu-devel] [PULL] spice patch queue

[Gerd Hoffmann]

  Hi,

Two small spice fixes for 0.15.

please pull,
  Gerd

The following changes since commit 03ff09580ef6cbc4a893b6e3e6bbff33180ec70a:

  Merge remote-tracking branch 'agraf/xen-next' into staging (2011-07-19 08:04:35 -0500)

are available in the git repository at:

  git://anongit.freedesktop.org/spice/qemu spice.v39

Gerd Hoffmann (1):
      spice: add sanity check for spice ports

Yonit Halperin (1):
      qxl: upon reset, if spice worker is stopped, the command rings can be not empty

 hw/qxl.c        |    4 ++--
 ui/spice-core.c |   11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

[Qemu-devel] [PULL] spice patch queue

[Gerd Hoffmann]

  Hi,

Here is the spice patch queue with a bunch of small fixes and
improvements collected over time.  No major changes.

please pull,
  Gerd

Alon Levy (5):
  qxl: set mm_time in vga update
  qxl: interface_get_command: fix reported mode
  qxl-logger: add timestamp to command log
  qxl: add dev id to guest prints
  qxl: allow QXL_IO_LOG also in vga

Gerd Hoffmann (3):
  qxl: device id fixup
  spice: catch spice server initialization failures.
  qxl: put QXL_IO_UPDATE_IRQ into vgamode whitelist

Yonit Halperin (1):
  qxl: make sure primary surface is saved on migration

 hw/qxl-logger.c    |    4 +++-
 hw/qxl.c           |   50 ++++++++++++++++++++++++++++++++++----------------
 ui/spice-core.c    |    5 ++++-
 ui/spice-display.c |    5 +++++
 4 files changed, 46 insertions(+), 18 deletions(-)

The following changes since commit 75ef849696830fc2ddeff8bb90eea5887ff50df6:

  esp: correctly fill bus id with requested lun (2011-07-02 18:50:19 +0000)

are available in the git repository at:
  git://anongit.freedesktop.org/spice/qemu spice.v38

Alon Levy (5):
      qxl: set mm_time in vga update
      qxl: interface_get_command: fix reported mode
      qxl-logger: add timestamp to command log
      qxl: add dev id to guest prints
      qxl: allow QXL_IO_LOG also in vga

Gerd Hoffmann (3):
      qxl: device id fixup
      spice: catch spice server initialization failures.
      qxl: put QXL_IO_UPDATE_IRQ into vgamode whitelist

Yonit Halperin (1):
      qxl: make sure primary surface is saved on migration

 hw/qxl-logger.c    |    4 +++-
 hw/qxl.c           |   50 ++++++++++++++++++++++++++++++++++----------------
 ui/spice-core.c    |    5 ++++-
 ui/spice-display.c |    5 +++++
 4 files changed, 46 insertions(+), 18 deletions(-)

Re: [Qemu-devel] [PULL] spice patch queue

[Gerd Hoffmann]

On 07/04/11 17:14, Gerd Hoffmann wrote:
>    Hi,
>
> Here is the spice patch queue with a bunch of small fixes and
> improvements collected over time.  No major changes.
>
> please pull,
>    Gerd
>
> The following changes since commit 75ef849696830fc2ddeff8bb90eea5887ff50df6:
>
>    esp: correctly fill bus id with requested lun (2011-07-02 18:50:19 +0000)
>
> are available in the git repository at:
>    git://anongit.freedesktop.org/spice/qemu spice.v38

Ping?

cheers,
   Gerd

Re: [Qemu-devel] [PULL] spice patch queue

[Anthony Liguori]

On 07/04/2011 10:14 AM, Gerd Hoffmann wrote:
>    Hi,
>
> Here is the spice patch queue with a bunch of small fixes and
> improvements collected over time.  No major changes.
>
> please pull,
>    Gerd

Pulled.  Thanks.

Regards,

Anthony Liguori

>
> Alon Levy (5):
>    qxl: set mm_time in vga update
>    qxl: interface_get_command: fix reported mode
>    qxl-logger: add timestamp to command log
>    qxl: add dev id to guest prints
>    qxl: allow QXL_IO_LOG also in vga
>
> Gerd Hoffmann (3):
>    qxl: device id fixup
>    spice: catch spice server initialization failures.
>    qxl: put QXL_IO_UPDATE_IRQ into vgamode whitelist
>
> Yonit Halperin (1):
>    qxl: make sure primary surface is saved on migration
>
>   hw/qxl-logger.c    |    4 +++-
>   hw/qxl.c           |   50 ++++++++++++++++++++++++++++++++++----------------
>   ui/spice-core.c    |    5 ++++-
>   ui/spice-display.c |    5 +++++
>   4 files changed, 46 insertions(+), 18 deletions(-)
>
> The following changes since commit 75ef849696830fc2ddeff8bb90eea5887ff50df6:
>
>    esp: correctly fill bus id with requested lun (2011-07-02 18:50:19 +0000)
>
> are available in the git repository at:
>    git://anongit.freedesktop.org/spice/qemu spice.v38
>
> Alon Levy (5):
>        qxl: set mm_time in vga update
>        qxl: interface_get_command: fix reported mode
>        qxl-logger: add timestamp to command log
>        qxl: add dev id to guest prints
>        qxl: allow QXL_IO_LOG also in vga
>
> Gerd Hoffmann (3):
>        qxl: device id fixup
>        spice: catch spice server initialization failures.
>        qxl: put QXL_IO_UPDATE_IRQ into vgamode whitelist
>
> Yonit Halperin (1):
>        qxl: make sure primary surface is saved on migration
>
>   hw/qxl-logger.c    |    4 +++-
>   hw/qxl.c           |   50 ++++++++++++++++++++++++++++++++++----------------
>   ui/spice-core.c    |    5 ++++-
>   ui/spice-display.c |    5 +++++
>   4 files changed, 46 insertions(+), 18 deletions(-)
>
>

[Qemu-devel] [PULL] spice patch queue

[Gerd Hoffmann]

  Hi,

Resending pull request for the spice patch queue.  Almost nothing
changed, the queue gained one additional fix from Alon and was rebased
to latest master.

please pull,
  Gerd

The following changes since commit d800040fb47fe4500d1f8bf604b9fd129bda9419:

  scsi: fix tracing of scsi requests with simple backend (2011-06-05 15:05:35 +0000)

are available in the git repository at:
  git://anongit.freedesktop.org/spice/qemu spice.v37

Alon Levy (1):
      qxl: fix cmdlog for vga

Gerd Hoffmann (3):
      qxl: add to the list of devices which disable the default vga
      qemu-config: comment spell fix
      spice: require spice 0.6.0 or newer.

Hans de Goede (2):
      spice-qemu-char: Fix flow control in client -> guest direction
      spice: add option for disabling copy paste support

Marc-André Lureau (1):
      spice: add SASL support

 configure         |    2 +-
 hw/qxl.c          |    4 +++-
 qemu-config.c     |   12 +++++++++---
 qemu-options.hx   |   16 ++++++++++++++++
 spice-qemu-char.c |   11 +++++------
 ui/spice-core.c   |   26 ++++++++++++++++++--------
 vl.c              |    1 +
 7 files changed, 53 insertions(+), 19 deletions(-)

Re: [Qemu-devel] [PULL] spice patch queue

[Anthony Liguori]

On 06/06/2011 07:49 AM, Gerd Hoffmann wrote:
>    Hi,
>
> Resending pull request for the spice patch queue.  Almost nothing
> changed, the queue gained one additional fix from Alon and was rebased
> to latest master.

Pulled.  Thanks.

Regards,

Anthony Liguori

>
> please pull,
>    Gerd
>
> The following changes since commit d800040fb47fe4500d1f8bf604b9fd129bda9419:
>
>    scsi: fix tracing of scsi requests with simple backend (2011-06-05 15:05:35 +0000)
>
> are available in the git repository at:
>    git://anongit.freedesktop.org/spice/qemu spice.v37
>
> Alon Levy (1):
>        qxl: fix cmdlog for vga
>
> Gerd Hoffmann (3):
>        qxl: add to the list of devices which disable the default vga
>        qemu-config: comment spell fix
>        spice: require spice 0.6.0 or newer.
>
> Hans de Goede (2):
>        spice-qemu-char: Fix flow control in client ->  guest direction
>        spice: add option for disabling copy paste support
>
> Marc-André Lureau (1):
>        spice: add SASL support
>
>   configure         |    2 +-
>   hw/qxl.c          |    4 +++-
>   qemu-config.c     |   12 +++++++++---
>   qemu-options.hx   |   16 ++++++++++++++++
>   spice-qemu-char.c |   11 +++++------
>   ui/spice-core.c   |   26 ++++++++++++++++++--------
>   vl.c              |    1 +
>   7 files changed, 53 insertions(+), 19 deletions(-)
>
>

Re: [Qemu-devel] [PULL] spice patch queue

[Anthony Liguori]

On 06/06/2011 07:49 AM, Gerd Hoffmann wrote:
>    Hi,
>
> Resending pull request for the spice patch queue.  Almost nothing
> changed, the queue gained one additional fix from Alon and was rebased
> to latest master.

Pulled.  Thanks.

Regards,

Anthony Liguori

>
> please pull,
>    Gerd
>
> The following changes since commit d800040fb47fe4500d1f8bf604b9fd129bda9419:
>
>    scsi: fix tracing of scsi requests with simple backend (2011-06-05 15:05:35 +0000)
>
> are available in the git repository at:
>    git://anongit.freedesktop.org/spice/qemu spice.v37
>
> Alon Levy (1):
>        qxl: fix cmdlog for vga
>
> Gerd Hoffmann (3):
>        qxl: add to the list of devices which disable the default vga
>        qemu-config: comment spell fix
>        spice: require spice 0.6.0 or newer.
>
> Hans de Goede (2):
>        spice-qemu-char: Fix flow control in client ->  guest direction
>        spice: add option for disabling copy paste support
>
> Marc-André Lureau (1):
>        spice: add SASL support
>
>   configure         |    2 +-
>   hw/qxl.c          |    4 +++-
>   qemu-config.c     |   12 +++++++++---
>   qemu-options.hx   |   16 ++++++++++++++++
>   spice-qemu-char.c |   11 +++++------
>   ui/spice-core.c   |   26 ++++++++++++++++++--------
>   vl.c              |    1 +
>   7 files changed, 53 insertions(+), 19 deletions(-)
>
>

[Qemu-devel] [PULL] spice patch queue

[Gerd Hoffmann]

  Hi,

Here is the spice patch queue, bringing SASL support for spice (by
Marc-André Lureau) and a few bug fixes.

please pull,
  Gerd

The following changes since commit 96d19bcbf5f679bbaaeab001b572c367fbfb2b03:

  ahci: Unbreak bar registration (2011-05-16 10:15:47 -0500)

are available in the git repository at:
  git://anongit.freedesktop.org/spice/qemu spice.v36

Gerd Hoffmann (3):
      qxl: add to the list of devices which disable the default vga
      qemu-config: comment spell fix
      spice: require spice 0.6.0 or newer.

Hans de Goede (2):
      spice-qemu-char: Fix flow control in client -> guest direction
      spice: add option for disabling copy paste support

Marc-André Lureau (1):
      spice: add SASL support

 configure         |    2 +-
 qemu-config.c     |   12 +++++++++---
 qemu-options.hx   |   16 ++++++++++++++++
 spice-qemu-char.c |   11 +++++------
 ui/spice-core.c   |   26 ++++++++++++++++++--------
 vl.c              |    1 +
 6 files changed, 50 insertions(+), 18 deletions(-)