[Qemu-devel] [PULL] spice patch queue

[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(-)

[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 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,

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 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,

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 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(-)

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,

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(-)

[Qemu-devel] [PATCH 1/3] qxl: stride fixup

[Gerd Hoffmann]

spice uses negative stride value to signal the bitmap is upside down.
The qxl renderer (used for scl, vnc and screenshots) wants a positive
value because it is easier to work with.  The positive value is then
stored in the very same variable, which has the drawback that the
upside-down test works only once.  Fix by using two variables.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/qxl-render.c |   23 ++++++++++++-----------
 hw/qxl.h        |    3 ++-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/hw/qxl-render.c b/hw/qxl-render.c
index c290739..a567693 100644
--- a/hw/qxl-render.c
+++ b/hw/qxl-render.c
@@ -28,16 +28,16 @@ static void qxl_flip(PCIQXLDevice *qxl, QXLRect *rect)
     int len, i;
 
     src += (qxl->guest_primary.surface.height - rect->top - 1) *
-        qxl->guest_primary.stride;
-    dst += rect->top  * qxl->guest_primary.stride;
+        qxl->guest_primary.abs_stride;
+    dst += rect->top  * qxl->guest_primary.abs_stride;
     src += rect->left * qxl->guest_primary.bytes_pp;
     dst += rect->left * qxl->guest_primary.bytes_pp;
     len  = (rect->right - rect->left) * qxl->guest_primary.bytes_pp;
 
     for (i = rect->top; i < rect->bottom; i++) {
         memcpy(dst, src, len);
-        dst += qxl->guest_primary.stride;
-        src -= qxl->guest_primary.stride;
+        dst += qxl->guest_primary.abs_stride;
+        src -= qxl->guest_primary.abs_stride;
     }
 }
 
@@ -45,7 +45,8 @@ void qxl_render_resize(PCIQXLDevice *qxl)
 {
     QXLSurfaceCreate *sc = &qxl->guest_primary.surface;
 
-    qxl->guest_primary.stride = sc->stride;
+    qxl->guest_primary.qxl_stride = sc->stride;
+    qxl->guest_primary.abs_stride = abs(sc->stride);
     qxl->guest_primary.resized++;
     switch (sc->format) {
     case SPICE_SURFACE_FMT_16_555:
@@ -87,11 +88,11 @@ void qxl_render_update(PCIQXLDevice *qxl)
         qemu_free_displaysurface(vga->ds);
 
         qxl->guest_primary.data = memory_region_get_ram_ptr(&qxl->vga.vram);
-        if (qxl->guest_primary.stride < 0) {
+        if (qxl->guest_primary.qxl_stride < 0) {
             /* spice surface is upside down -> need extra buffer to flip */
-            qxl->guest_primary.stride = -qxl->guest_primary.stride;
-            qxl->guest_primary.flipped = g_malloc(qxl->guest_primary.surface.width *
-                                                     qxl->guest_primary.stride);
+            qxl->guest_primary.flipped =
+                g_malloc(qxl->guest_primary.surface.width *
+                         qxl->guest_primary.abs_stride);
             ptr = qxl->guest_primary.flipped;
         } else {
             ptr = qxl->guest_primary.data;
@@ -100,7 +101,7 @@ void qxl_render_update(PCIQXLDevice *qxl)
                __FUNCTION__,
                qxl->guest_primary.surface.width,
                qxl->guest_primary.surface.height,
-               qxl->guest_primary.stride,
+               qxl->guest_primary.qxl_stride,
                qxl->guest_primary.bytes_pp,
                qxl->guest_primary.bits_pp,
                qxl->guest_primary.flipped ? "yes" : "no");
@@ -108,7 +109,7 @@ void qxl_render_update(PCIQXLDevice *qxl)
             qemu_create_displaysurface_from(qxl->guest_primary.surface.width,
                                             qxl->guest_primary.surface.height,
                                             qxl->guest_primary.bits_pp,
-                                            qxl->guest_primary.stride,
+                                            qxl->guest_primary.abs_stride,
                                             ptr);
         dpy_resize(vga->ds);
     }
diff --git a/hw/qxl.h b/hw/qxl.h
index 37b2619..766aa6d 100644
--- a/hw/qxl.h
+++ b/hw/qxl.h
@@ -48,7 +48,8 @@ typedef struct PCIQXLDevice {
         QXLSurfaceCreate surface;
         uint32_t       commands;
         uint32_t       resized;
-        int32_t        stride;
+        int32_t        qxl_stride;
+        uint32_t       abs_stride;
         uint32_t       bits_pp;
         uint32_t       bytes_pp;
         uint8_t        *data, *flipped;
-- 
1.7.1

[Qemu-devel] [PATCH 2/3] qxl: make sure we continue to run with a shared buffer

[Gerd Hoffmann]

The qxl renderer works only with a shared displaysurface.  So better
make sure we actually have one and restore it when needed.

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

diff --git a/hw/qxl-render.c b/hw/qxl-render.c
index a567693..2c51ba9 100644
--- a/hw/qxl-render.c
+++ b/hw/qxl-render.c
@@ -76,7 +76,14 @@ void qxl_render_update(PCIQXLDevice *qxl)
     VGACommonState *vga = &qxl->vga;
     QXLRect dirty[32], update;
     void *ptr;
-    int i;
+    int i, redraw = 0;
+
+    if (!is_buffer_shared(vga->ds->surface)) {
+        dprint(qxl, 1, "%s: restoring shared displaysurface\n", __func__);
+        qxl->guest_primary.resized++;
+        qxl->guest_primary.commands++;
+        redraw = 1;
+    }
 
     if (qxl->guest_primary.resized) {
         qxl->guest_primary.resized = 0;
@@ -127,6 +134,10 @@ void qxl_render_update(PCIQXLDevice *qxl)
     memset(dirty, 0, sizeof(dirty));
     qxl_spice_update_area(qxl, 0, &update,
                           dirty, ARRAY_SIZE(dirty), 1, QXL_SYNC);
+    if (redraw) {
+        memset(dirty, 0, sizeof(dirty));
+        dirty[0] = update;
+    }
 
     for (i = 0; i < ARRAY_SIZE(dirty); i++) {
         if (qemu_spice_rect_is_empty(dirty+i)) {
-- 
1.7.1

[Qemu-devel] [PATCH 3/3] qxl: create slots on post_load in vga state

[Gerd Hoffmann]

From: Alon Levy <alevy@redhat.com>

RHBZ 740547

If we migrate when the device is in vga state the guest
still believes the slots are created, and will cause operations
that reference the slots, causing a "panic: virtual address out of range"
on the first of them. Easy to see by migrating in vga mode with
a driver loaded, for instance windows cmd window in full screen mode,
and then exiting vga mode back to native mode will cause said panic.

Fixed by doing the slot recreation in post_load for vga mode as well.
Note that compat does not require any changes because it creates it's
only slot by a side effect of QXL_IO_SET_MODE.

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

diff --git a/hw/qxl.c b/hw/qxl.c
index 12f71aa..84ffd45 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -1663,12 +1663,25 @@ static int qxl_pre_load(void *opaque)
     return 0;
 }
 
+static void qxl_create_memslots(PCIQXLDevice *d)
+{
+    int i;
+
+    for (i = 0; i < NUM_MEMSLOTS; i++) {
+        if (!d->guest_slots[i].active) {
+            continue;
+        }
+        dprint(d, 1, "%s: restoring guest slot %d\n", __func__, i);
+        qxl_add_memslot(d, i, 0, QXL_SYNC);
+    }
+}
+
 static int qxl_post_load(void *opaque, int version)
 {
     PCIQXLDevice* d = opaque;
     uint8_t *ram_start = d->vga.vram_ptr;
     QXLCommandExt *cmds;
-    int in, out, i, newmode;
+    int in, out, newmode;
 
     dprint(d, 1, "%s: start\n", __FUNCTION__);
 
@@ -1685,19 +1698,16 @@ static int qxl_post_load(void *opaque, int version)
         qxl_mode_to_string(d->mode));
     newmode = d->mode;
     d->mode = QXL_MODE_UNDEFINED;
+
     switch (newmode) {
     case QXL_MODE_UNDEFINED:
         break;
     case QXL_MODE_VGA:
+        qxl_create_memslots(d);
         qxl_enter_vga_mode(d);
         break;
     case QXL_MODE_NATIVE:
-        for (i = 0; i < NUM_MEMSLOTS; i++) {
-            if (!d->guest_slots[i].active) {
-                continue;
-            }
-            qxl_add_memslot(d, i, 0, QXL_SYNC);
-        }
+        qxl_create_memslots(d);
         qxl_create_guest_primary(d, 1, QXL_SYNC);
 
         /* replay surface-create and cursor-set commands */
@@ -1722,6 +1732,8 @@ static int qxl_post_load(void *opaque, int version)
 
         break;
     case QXL_MODE_COMPAT:
+        /* note: no need to call qxl_create_memslots, qxl_set_mode
+         * creates the mem slot. */
         qxl_set_mode(d, d->shadow_rom.mode, 1);
         break;
     }
-- 
1.7.1

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 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,

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(-)
>
>