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

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

[Qemu-devel] [PATCH 1/4] qxl: define qxl operating on 4k pages

[Gerd Hoffmann]

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

diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index c50e285..f0bfd2c 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -364,7 +364,7 @@ static void init_qxl_rom(PCIQXLDevice *d)
     num_pages          = d->vga.vram_size;
     num_pages         -= ram_header_size;
     num_pages         -= surface0_area_size;
-    num_pages          = num_pages / TARGET_PAGE_SIZE;
+    num_pages          = num_pages / QXL_PAGE_SIZE;
 
     rom->draw_area_offset   = cpu_to_le32(0);
     rom->surface0_area_size = cpu_to_le32(surface0_area_size);
@@ -528,7 +528,8 @@ static void interface_get_init_info(QXLInstance *sin, QXLDevInitInfo *info)
     info->num_memslots = NUM_MEMSLOTS;
     info->num_memslots_groups = NUM_MEMSLOTS_GROUPS;
     info->internal_groupslot_id = 0;
-    info->qxl_ram_size = le32_to_cpu(qxl->shadow_rom.num_pages) << TARGET_PAGE_BITS;
+    info->qxl_ram_size =
+        le32_to_cpu(qxl->shadow_rom.num_pages) << QXL_PAGE_BITS;
     info->n_surfaces = qxl->ssd.num_surfaces;
 }
 
diff --git a/hw/display/qxl.h b/hw/display/qxl.h
index 8e9b0c2..84f0182 100644
--- a/hw/display/qxl.h
+++ b/hw/display/qxl.h
@@ -27,6 +27,9 @@ enum qxl_mode {
 
 #define QXL_NUM_DIRTY_RECTS 64
 
+#define QXL_PAGE_BITS 12
+#define QXL_PAGE_SIZE (1 << QXL_PAGE_BITS);
+
 typedef struct PCIQXLDevice {
     PCIDevice          pci;
     SimpleSpiceDisplay ssd;
-- 
1.8.3.1

[Qemu-devel] [PATCH 2/4] qxl: simplify qxl_rom_size

[Gerd Hoffmann]

Nowdays rom size is fixed at 8192 for live migration compat reasons.
So we can ditch the pointless math trying to calculate the size needed.
Also make the size sanity check fail at compile time not runtime.

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

diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index f0bfd2c..bcbf97a 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -313,9 +313,7 @@ static ram_addr_t qxl_rom_size(void)
                                  sizeof(qxl_modes);
     uint32_t rom_size = 8192; /* two pages */
 
-    required_rom_size = MAX(required_rom_size, TARGET_PAGE_SIZE);
-    required_rom_size = msb_mask(required_rom_size * 2 - 1);
-    assert(required_rom_size <= rom_size);
+    QEMU_BUILD_BUG_ON(required_rom_size > rom_size);
     return rom_size;
 }
 
-- 
1.8.3.1

[Qemu-devel] [PATCH 3/4] qxl: simplify page dirtying

[Gerd Hoffmann]

No need to do target page size calculations here,
memory_region_set_dirty will care for us.

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

diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index bcbf97a..ee2db0d 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -414,9 +414,8 @@ static void qxl_ram_set_dirty(PCIQXLDevice *qxl, void *ptr)
     intptr_t offset;
 
     offset = ptr - base;
-    offset &= ~(TARGET_PAGE_SIZE-1);
     assert(offset < qxl->vga.vram_size);
-    qxl_set_dirty(&qxl->vga.vram, offset, offset + TARGET_PAGE_SIZE);
+    qxl_set_dirty(&qxl->vga.vram, offset, offset + 3);
 }
 
 /* can be called from spice server thread context */
-- 
1.8.3.1

[Qemu-devel] [PATCH 4/4] qxl: compile only once

[Gerd Hoffmann]

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/display/Makefile.objs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs
index 6e9fb3b..540df82 100644
--- a/hw/display/Makefile.objs
+++ b/hw/display/Makefile.objs
@@ -31,5 +31,4 @@ obj-$(CONFIG_TCX) += tcx.o
 
 obj-$(CONFIG_VGA) += vga.o
 
-common-obj-$(CONFIG_QXL) += qxl-logger.o qxl-render.o
-obj-$(CONFIG_QXL) += qxl.o
+common-obj-$(CONFIG_QXL) += qxl.o qxl-logger.o qxl-render.o
-- 
1.8.3.1

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

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

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