[Qemu-devel] [PULL] spice patch queue

[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] [PATCH 1/2] spice: add sanity check for spice ports

[Gerd Hoffmann]

Make sure at least one port (port=.. or tls-port=...)
is specified.  Also apply range checks to the port numbers.

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

diff --git a/ui/spice-core.c b/ui/spice-core.c
index e142452..1100417 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -480,7 +480,16 @@ void qemu_spice_init(void)
     port = qemu_opt_get_number(opts, "port", 0);
     tls_port = qemu_opt_get_number(opts, "tls-port", 0);
     if (!port && !tls_port) {
-        return;
+        fprintf(stderr, "neither port nor tls-port specified for spice.");
+        exit(1);
+    }
+    if (port < 0 || port > 65535) {
+        fprintf(stderr, "spice port is out of range");
+        exit(1);
+    }
+    if (tls_port < 0 || tls_port > 65535) {
+        fprintf(stderr, "spice tls-port is out of range");
+        exit(1);
     }
     password = qemu_opt_get(opts, "password");
 
-- 
1.7.1

Re: [Qemu-devel] [PATCH 1/2] spice: add sanity check for spice ports

[Alon Levy]

On Wed, Jul 20, 2011 at 12:25:37PM +0200, Gerd Hoffmann wrote:
> Make sure at least one port (port=.. or tls-port=...)
> is specified.  Also apply range checks to the port numbers.
> 
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

ACK.

> ---
>  ui/spice-core.c |   11 ++++++++++-
>  1 files changed, 10 insertions(+), 1 deletions(-)
> 
> diff --git a/ui/spice-core.c b/ui/spice-core.c
> index e142452..1100417 100644
> --- a/ui/spice-core.c
> +++ b/ui/spice-core.c
> @@ -480,7 +480,16 @@ void qemu_spice_init(void)
>      port = qemu_opt_get_number(opts, "port", 0);
>      tls_port = qemu_opt_get_number(opts, "tls-port", 0);
>      if (!port && !tls_port) {
> -        return;
> +        fprintf(stderr, "neither port nor tls-port specified for spice.");
> +        exit(1);
> +    }
> +    if (port < 0 || port > 65535) {
> +        fprintf(stderr, "spice port is out of range");
> +        exit(1);
> +    }
> +    if (tls_port < 0 || tls_port > 65535) {
> +        fprintf(stderr, "spice tls-port is out of range");
> +        exit(1);
>      }
>      password = qemu_opt_get(opts, "password");
>  
> -- 
> 1.7.1
> 
> 

[Qemu-devel] [PATCH 2/2] qxl: upon reset, if spice worker is stopped, the command rings can be not empty

[Gerd Hoffmann]

From: Yonit Halperin <yhalperi@redhat.com>

Spice worker does no longer process commands when it is stopped.
Otherwise, it might crash during migration when attempting to process
commands while the guest is not completely loaded.

Cc: Alon Levy <alevy@redhat.com>

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

diff --git a/hw/qxl.c b/hw/qxl.c
index 0b9a4c7..a6fb7f0 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -656,8 +656,8 @@ static void qxl_reset_state(PCIQXLDevice *d)
     QXLRam *ram = d->ram;
     QXLRom *rom = d->rom;
 
-    assert(SPICE_RING_IS_EMPTY(&ram->cmd_ring));
-    assert(SPICE_RING_IS_EMPTY(&ram->cursor_ring));
+    assert(!d->ssd.running || SPICE_RING_IS_EMPTY(&ram->cmd_ring));
+    assert(!d->ssd.running || SPICE_RING_IS_EMPTY(&ram->cursor_ring));
     d->shadow_rom.update_id = cpu_to_le32(0);
     *rom = d->shadow_rom;
     qxl_rom_set_dirty(d);
-- 
1.7.1