[Qemu-devel] [PULL 0/4] spice patch queue

[Qemu-devel] [PULL 0/4] spice patch queue

[Gerd Hoffmann]

  Hi,

Flushing the spice patch queue.  Nothing outstanding,
just a small collection of misc spice patches.

please pull,
  Gerd

The following changes since commit 2f61120c10da9128357510debc8e66880cd2bfdc:

  Merge remote-tracking branch 'qmp-unstable/queue/qmp' into staging (2014-02-01 23:32:31 +0000)

are available in the git repository at:


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

for you to fetch changes up to 890911464934aebcb4409ad2495449d15d7347b4:

  spice: hook qemu_chr_fe_set_open() event to ports (2014-02-03 11:05:15 +0100)

----------------------------------------------------------------
misc spice patches

----------------------------------------------------------------
Alon Levy (2):
      qxl: clear irq on reset
      hw/display/qxl: fix signed to unsigned comparison

Jeremy White (1):
      Add the ability to vary Spice playback and record rates, to facilitate Opus support.

Marc-André Lureau (1):
      spice: hook qemu_chr_fe_set_open() event to ports

 audio/spiceaudio.c | 27 +++++++++++++++++++++++++--
 hw/display/qxl.c   | 16 ++++++++++------
 spice-qemu-char.c  | 25 ++++++++++++++++++++-----
 3 files changed, 55 insertions(+), 13 deletions(-)

[Qemu-devel] [PATCH 1/4] qxl: clear irq on reset

[Gerd Hoffmann]

From: Alon Levy <alevy@redhat.com>

Without this we occasionally trigger an assert at
hw/pci/pci.c:pcibus_reset that asserts the irq_count is zero on reset.

This has become a problem with the new drm driver for linux, since doing
a reboot from console causes a race between console updates that set the
irq and the reset assertion that the irq is clear.

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

diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index e4f172e..56b61c8 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -1126,6 +1126,7 @@ static void qxl_reset_state(PCIQXLDevice *d)
     d->num_free_res = 0;
     d->last_release = NULL;
     memset(&d->ssd.dirty, 0, sizeof(d->ssd.dirty));
+    qxl_update_irq(d);
 }
 
 static void qxl_soft_reset(PCIQXLDevice *d)
-- 
1.8.3.1

[Qemu-devel] [PATCH 2/4] hw/display/qxl: fix signed to unsigned comparison

[Gerd Hoffmann]

From: Alon Levy <alevy@redhat.com>

Several small signedness / overflow corrections to qxl_create_guest_primary:
1. use 64 bit unsigned for size to avoid overflow possible from two 32
bit multiplicants.
2. correct sign for requested_height
3. add a more verbose error message when setting guest bug state (which
causes a complete guess blackout until reset, so it helps if it is
verbose).

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

diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index 56b61c8..334c271 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -19,6 +19,7 @@
  */
 
 #include <zlib.h>
+#include <stdint.h>
 
 #include "qemu-common.h"
 #include "qemu/timer.h"
@@ -1361,14 +1362,16 @@ static void qxl_create_guest_primary(PCIQXLDevice *qxl, int loadvm,
 {
     QXLDevSurfaceCreate surface;
     QXLSurfaceCreate *sc = &qxl->guest_primary.surface;
-    int size;
-    int requested_height = le32_to_cpu(sc->height);
+    uint32_t requested_height = le32_to_cpu(sc->height);
     int requested_stride = le32_to_cpu(sc->stride);
 
-    size = abs(requested_stride) * requested_height;
-    if (size > qxl->vgamem_size) {
-        qxl_set_guest_bug(qxl, "%s: requested primary larger then framebuffer"
-                               " size", __func__);
+    if (requested_stride == INT32_MIN ||
+        abs(requested_stride) * (uint64_t)requested_height
+                                        > qxl->vgamem_size) {
+        qxl_set_guest_bug(qxl, "%s: requested primary larger than framebuffer"
+                               " stride %d x height %" PRIu32 " > %" PRIu32,
+                               __func__, requested_stride, requested_height,
+                               qxl->vgamem_size);
         return;
     }
 
-- 
1.8.3.1

[Qemu-devel] [PATCH 3/4] Add the ability to vary Spice playback and record rates, to facilitate Opus support.

[Gerd Hoffmann]

From: Jeremy White <jwhite@codeweavers.com>

Signed-off-by: Jeremy White <jwhite@codeweavers.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 audio/spiceaudio.c | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/audio/spiceaudio.c b/audio/spiceaudio.c
index 5af436c..fceee50 100644
--- a/audio/spiceaudio.c
+++ b/audio/spiceaudio.c
@@ -25,8 +25,17 @@
 #include "audio.h"
 #include "audio_int.h"
 
-#define LINE_IN_SAMPLES 1024
-#define LINE_OUT_SAMPLES 1024
+#if SPICE_INTERFACE_PLAYBACK_MAJOR > 1 || SPICE_INTERFACE_PLAYBACK_MINOR >= 3
+#define LINE_OUT_SAMPLES (480 * 4)
+#else
+#define LINE_OUT_SAMPLES (256 * 4)
+#endif
+
+#if SPICE_INTERFACE_RECORD_MAJOR > 2 || SPICE_INTERFACE_RECORD_MINOR >= 3
+#define LINE_IN_SAMPLES (480 * 4)
+#else
+#define LINE_IN_SAMPLES (256 * 4)
+#endif
 
 typedef struct SpiceRateCtl {
     int64_t               start_ticks;
@@ -111,7 +120,11 @@ static int line_out_init (HWVoiceOut *hw, struct audsettings *as)
     SpiceVoiceOut *out = container_of (hw, SpiceVoiceOut, hw);
     struct audsettings settings;
 
+#if SPICE_INTERFACE_PLAYBACK_MAJOR > 1 || SPICE_INTERFACE_PLAYBACK_MINOR >= 3
+    settings.freq       = spice_server_get_best_playback_rate(NULL);
+#else
     settings.freq       = SPICE_INTERFACE_PLAYBACK_FREQ;
+#endif
     settings.nchannels  = SPICE_INTERFACE_PLAYBACK_CHAN;
     settings.fmt        = AUD_FMT_S16;
     settings.endianness = AUDIO_HOST_ENDIANNESS;
@@ -122,6 +135,9 @@ static int line_out_init (HWVoiceOut *hw, struct audsettings *as)
 
     out->sin.base.sif = &playback_sif.base;
     qemu_spice_add_interface (&out->sin.base);
+#if SPICE_INTERFACE_PLAYBACK_MAJOR > 1 || SPICE_INTERFACE_PLAYBACK_MINOR >= 3
+    spice_server_set_playback_rate(&out->sin, settings.freq);
+#endif
     return 0;
 }
 
@@ -232,7 +248,11 @@ static int line_in_init (HWVoiceIn *hw, struct audsettings *as)
     SpiceVoiceIn *in = container_of (hw, SpiceVoiceIn, hw);
     struct audsettings settings;
 
+#if SPICE_INTERFACE_RECORD_MAJOR > 2 || SPICE_INTERFACE_RECORD_MINOR >= 3
+    settings.freq       = spice_server_get_best_record_rate(NULL);
+#else
     settings.freq       = SPICE_INTERFACE_RECORD_FREQ;
+#endif
     settings.nchannels  = SPICE_INTERFACE_RECORD_CHAN;
     settings.fmt        = AUD_FMT_S16;
     settings.endianness = AUDIO_HOST_ENDIANNESS;
@@ -243,6 +263,9 @@ static int line_in_init (HWVoiceIn *hw, struct audsettings *as)
 
     in->sin.base.sif = &record_sif.base;
     qemu_spice_add_interface (&in->sin.base);
+#if SPICE_INTERFACE_RECORD_MAJOR > 2 || SPICE_INTERFACE_RECORD_MINOR >= 3
+    spice_server_set_record_rate(&in->sin, settings.freq);
+#endif
     return 0;
 }
 
-- 
1.8.3.1

[Qemu-devel] [PATCH 4/4] spice: hook qemu_chr_fe_set_open() event to ports

[Gerd Hoffmann]

From: Marc-André Lureau <marcandre.lureau@gmail.com>

This wires up a spice port event on virtio-ports open/close, so the
client is notified when the other end is ready.

Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 spice-qemu-char.c | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/spice-qemu-char.c b/spice-qemu-char.c
index 16439c5..6624559 100644
--- a/spice-qemu-char.c
+++ b/spice-qemu-char.c
@@ -212,7 +212,7 @@ static void spice_chr_close(struct CharDriverState *chr)
     g_free(s);
 }
 
-static void spice_chr_set_fe_open(struct CharDriverState *chr, int fe_open)
+static void spice_vmc_set_fe_open(struct CharDriverState *chr, int fe_open)
 {
     SpiceCharDriver *s = chr->opaque;
     if (fe_open) {
@@ -222,6 +222,19 @@ static void spice_chr_set_fe_open(struct CharDriverState *chr, int fe_open)
     }
 }
 
+static void spice_port_set_fe_open(struct CharDriverState *chr, int fe_open)
+{
+#if SPICE_SERVER_VERSION >= 0x000c02
+    SpiceCharDriver *s = chr->opaque;
+
+    if (fe_open) {
+        spice_server_port_event(&s->sin, SPICE_PORT_EVENT_OPENED);
+    } else {
+        spice_server_port_event(&s->sin, SPICE_PORT_EVENT_CLOSED);
+    }
+#endif
+}
+
 static void spice_chr_fe_event(struct CharDriverState *chr, int event)
 {
 #if SPICE_SERVER_VERSION >= 0x000c02
@@ -248,7 +261,9 @@ static void print_allowed_subtypes(void)
     fprintf(stderr, "\n");
 }
 
-static CharDriverState *chr_open(const char *subtype)
+static CharDriverState *chr_open(const char *subtype,
+    void (*set_fe_open)(struct CharDriverState *, int))
+
 {
     CharDriverState *chr;
     SpiceCharDriver *s;
@@ -262,7 +277,7 @@ static CharDriverState *chr_open(const char *subtype)
     chr->chr_write = spice_chr_write;
     chr->chr_add_watch = spice_chr_add_watch;
     chr->chr_close = spice_chr_close;
-    chr->chr_set_fe_open = spice_chr_set_fe_open;
+    chr->chr_set_fe_open = set_fe_open;
     chr->explicit_be_open = true;
     chr->chr_fe_event = spice_chr_fe_event;
 
@@ -291,7 +306,7 @@ CharDriverState *qemu_chr_open_spice_vmc(const char *type)
         return NULL;
     }
 
-    return chr_open(type);
+    return chr_open(type, spice_vmc_set_fe_open);
 }
 
 #if SPICE_SERVER_VERSION >= 0x000c02
@@ -305,7 +320,7 @@ CharDriverState *qemu_chr_open_spice_port(const char *name)
         return NULL;
     }
 
-    chr = chr_open("port");
+    chr = chr_open("port", spice_port_set_fe_open);
     s = chr->opaque;
     s->sin.portname = g_strdup(name);
 
-- 
1.8.3.1

Re: [Qemu-devel] [PULL 0/4] spice patch queue

[Peter Maydell]

On 3 February 2014 15:18, Gerd Hoffmann <kraxel@redhat.com> wrote:
>   Hi,
>
> Flushing the spice patch queue.  Nothing outstanding,
> just a small collection of misc spice patches.
>
> please pull,
>   Gerd

Applied, thanks. Congratulations on the first merged
pull request in QEMU which satisfies all of:
 (a) gpg signed
 (b) had the signature checked
 (c) applied by somebody who trusted that signature
 (d) not the trivial case of my trusting my own signature

thanks
-- PMM

[Qemu-devel] [PULL 0/4] spice patch queue

[Gerd Hoffmann]

  Hi,

A number of small bugfixes accumulated in the spice patch queue.
No major changes in there.  Time to flush it.

please pull,
  Gerd

The following changes since commit ce0274f730eacbd24c706523ddbbabb6b95d0659:

  Revert "gdbstub: Do not kill target in system emulation mode" (2015-05-28 16:57:35 +0100)

are available in the git repository at:

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

for you to fetch changes up to f7a8beb5e6a13dc924895244777d9ef08b23b367:

  spice: fix spice_chr_add_watch() pre-condition (2015-05-29 09:56:01 +0200)

----------------------------------------------------------------
spice: misc fixes.

----------------------------------------------------------------
Gerd Hoffmann (1):
      spice: don't update mm_time when spice-server is stopped.

Marc-André Lureau (3):
      virtio-console: notify chardev when writable
      spice-char: notify the server when chardev is writable
      spice: fix spice_chr_add_watch() pre-condition

 hw/char/virtio-console.c | 10 ++++++++++
 hw/display/qxl.c         |  4 ++++
 spice-qemu-char.c        | 13 ++++++++++++-
 ui/spice-core.c          |  1 +
 4 files changed, 27 insertions(+), 1 deletion(-)

Re: [Qemu-devel] [PULL 0/4] spice patch queue

[Peter Maydell]

On 29 May 2015 at 09:26, Gerd Hoffmann <kraxel@redhat.com> wrote:
>   Hi,
>
> A number of small bugfixes accumulated in the spice patch queue.
> No major changes in there.  Time to flush it.
>
> please pull,
>   Gerd
>
> The following changes since commit ce0274f730eacbd24c706523ddbbabb6b95d0659:
>
>   Revert "gdbstub: Do not kill target in system emulation mode" (2015-05-28 16:57:35 +0100)
>
> are available in the git repository at:
>
>   git://anongit.freedesktop.org/spice/qemu tags/pull-spice-20150529-1
>
> for you to fetch changes up to f7a8beb5e6a13dc924895244777d9ef08b23b367:
>
>   spice: fix spice_chr_add_watch() pre-condition (2015-05-29 09:56:01 +0200)
>
> ----------------------------------------------------------------
> spice: misc fixes.

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/4] spice patch queue

[Gerd Hoffmann]

  Hi,

Here comes the spice patch queue with a small collection of fixes.

cheers,
  Gerd

The following changes since commit 1680d485777ecf436d724631ea8722cc0c66990e:

  Merge remote-tracking branch 'rth/tcg-ldst-6' into staging (2013-10-14 09:59:59 -0700)

are available in the git repository at:


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

for you to fetch changes up to 9fa032866daae68357d99abc725c18fe9ed4b61b:

  spice: fix multihead support (2013-10-17 12:42:54 +0200)

----------------------------------------------------------------
Christophe Fergeau (1):
      Fix VNC SASL authentication when using a QXL device

Gerd Hoffmann (2):
      spice-display: add display channel id to the debug messages.
      spice: fix multihead support

Marc-André Lureau (1):
      spice: replace use of deprecated API

 hw/display/qxl.c        | 19 ++++++++--------
 include/ui/qemu-spice.h |  5 +++--
 ui/spice-core.c         | 40 +++++++++++++++++++++++----------
 ui/spice-display.c      | 60 ++++++++++++++++++++++++++++++++-----------------
 vl.c                    |  4 ++--
 5 files changed, 81 insertions(+), 47 deletions(-)

[Qemu-devel] [PULL 0/4] spice patch queue

[Gerd Hoffmann]

  Hi,

Here comes the spice patch queue.  It elimitates qxl dependency on
TARGET_PAGE_SIZE, so qemu can enter the "compile-once" pool.

please pull,
  Gerd

The following changes since commit 6c2679fc19560699679200fb42ab4659bcbe7f79:

  Merge remote-tracking branch 'kiszka/queues/slirp' into staging (2013-09-17 10:01:24 -0500)

are available in the git repository at:


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

for you to fetch changes up to 521e759cf1ca05fc59a8653e48f18f830edbda7e:

  qxl: compile only once (2013-09-18 11:13:29 +0200)

----------------------------------------------------------------
Gerd Hoffmann (4):
      qxl: define qxl operating on 4k pages
      qxl: simplify qxl_rom_size
      qxl: simplify page dirtying
      qxl: compile only once

 hw/display/Makefile.objs |  3 +--
 hw/display/qxl.c         | 12 +++++-------
 hw/display/qxl.h         |  3 +++
 3 files changed, 9 insertions(+), 9 deletions(-)