* [Qemu-devel] [PATCH v2 1/3] qxl: drop mono cursor support
2017-08-28 12:34 [Qemu-devel] [PATCH v2 0/3] qxl: add support for chunked cursors Gerd Hoffmann
@ 2017-08-28 12:34 ` Gerd Hoffmann
2017-08-28 12:35 ` [Qemu-devel] [PATCH v2 2/3] qxl: add support for chunked cursors Gerd Hoffmann
2017-08-28 12:35 ` [Qemu-devel] [PATCH v2 3/3] qxl_unpack_chunks: codestyle fixups Gerd Hoffmann
2 siblings, 0 replies; 4+ messages in thread
From: Gerd Hoffmann @ 2017-08-28 12:34 UTC (permalink / raw)
To: qemu-devel; +Cc: René Rebe, Gerd Hoffmann
The chunk size sanity check in qxl_render_cursor works for
SPICE_CURSOR_TYPE_ALPHA cursors only. So support for
SPICE_CURSOR_TYPE_MONO cursors must be broken for ages without anyone
noticing. Most likely it simply isn't used any more by guest drivers.
Drop the dead code.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/display/qxl-render.c | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/hw/display/qxl-render.c b/hw/display/qxl-render.c
index 9ad9d9e0f5..e1b3f05ecb 100644
--- a/hw/display/qxl-render.c
+++ b/hw/display/qxl-render.c
@@ -207,7 +207,6 @@ void qxl_render_update_area_done(PCIQXLDevice *qxl, QXLCookie *cookie)
static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl, QXLCursor *cursor)
{
QEMUCursor *c;
- uint8_t *image, *mask;
size_t size;
c = cursor_alloc(cursor->header.width, cursor->header.height);
@@ -221,14 +220,6 @@ static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl, QXLCursor *cursor)
cursor_print_ascii_art(c, "qxl/alpha");
}
break;
- case SPICE_CURSOR_TYPE_MONO:
- mask = cursor->chunk.data;
- image = mask + cursor_get_mono_bpl(c) * c->width;
- cursor_set_mono(c, 0xffffff, 0x000000, image, 1, mask);
- if (qxl->debug > 2) {
- cursor_print_ascii_art(c, "qxl/mono");
- }
- break;
default:
fprintf(stderr, "%s: not implemented: type %d\n",
__FUNCTION__, cursor->header.type);
--
2.9.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Qemu-devel] [PATCH v2 2/3] qxl: add support for chunked cursors.
2017-08-28 12:34 [Qemu-devel] [PATCH v2 0/3] qxl: add support for chunked cursors Gerd Hoffmann
2017-08-28 12:34 ` [Qemu-devel] [PATCH v2 1/3] qxl: drop mono cursor support Gerd Hoffmann
@ 2017-08-28 12:35 ` Gerd Hoffmann
2017-08-28 12:35 ` [Qemu-devel] [PATCH v2 3/3] qxl_unpack_chunks: codestyle fixups Gerd Hoffmann
2 siblings, 0 replies; 4+ messages in thread
From: Gerd Hoffmann @ 2017-08-28 12:35 UTC (permalink / raw)
To: qemu-devel; +Cc: René Rebe, Gerd Hoffmann
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/display/qxl-render.c | 33 ++++++++++++++++++++++++++-------
1 file changed, 26 insertions(+), 7 deletions(-)
diff --git a/hw/display/qxl-render.c b/hw/display/qxl-render.c
index e1b3f05ecb..b2c98f90c0 100644
--- a/hw/display/qxl-render.c
+++ b/hw/display/qxl-render.c
@@ -204,7 +204,30 @@ void qxl_render_update_area_done(PCIQXLDevice *qxl, QXLCookie *cookie)
g_free(cookie);
}
-static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl, QXLCursor *cursor)
+static void qxl_unpack_chunks(void *dest, size_t size, PCIQXLDevice *qxl,
+ QXLDataChunk *chunk, uint32_t group_id)
+{
+ uint32_t max_chunks = 32;
+ size_t offset = 0;
+ size_t bytes;
+
+ for (;;) {
+ bytes = MIN(size - offset, chunk->data_size);
+ memcpy(dest + offset, chunk->data, bytes);
+ offset += bytes;
+ if (offset == size)
+ return;
+ chunk = qxl_phys2virt(qxl, chunk->next_chunk, group_id);
+ if (!chunk)
+ return;
+ max_chunks--;
+ if (max_chunks == 0)
+ return;
+ }
+}
+
+static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl, QXLCursor *cursor,
+ uint32_t group_id)
{
QEMUCursor *c;
size_t size;
@@ -215,7 +238,7 @@ static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl, QXLCursor *cursor)
switch (cursor->header.type) {
case SPICE_CURSOR_TYPE_ALPHA:
size = sizeof(uint32_t) * cursor->header.width * cursor->header.height;
- memcpy(c->data, cursor->chunk.data, size);
+ qxl_unpack_chunks(c->data, size, qxl, &cursor->chunk, group_id);
if (qxl->debug > 2) {
cursor_print_ascii_art(c, "qxl/alpha");
}
@@ -259,11 +282,7 @@ int qxl_render_cursor(PCIQXLDevice *qxl, QXLCommandExt *ext)
if (!cursor) {
return 1;
}
- if (cursor->chunk.data_size != cursor->data_size) {
- fprintf(stderr, "%s: multiple chunks\n", __FUNCTION__);
- return 1;
- }
- c = qxl_cursor(qxl, cursor);
+ c = qxl_cursor(qxl, cursor, ext->group_id);
if (c == NULL) {
c = cursor_builtin_left_ptr();
}
--
2.9.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Qemu-devel] [PATCH v2 3/3] qxl_unpack_chunks: codestyle fixups
2017-08-28 12:34 [Qemu-devel] [PATCH v2 0/3] qxl: add support for chunked cursors Gerd Hoffmann
2017-08-28 12:34 ` [Qemu-devel] [PATCH v2 1/3] qxl: drop mono cursor support Gerd Hoffmann
2017-08-28 12:35 ` [Qemu-devel] [PATCH v2 2/3] qxl: add support for chunked cursors Gerd Hoffmann
@ 2017-08-28 12:35 ` Gerd Hoffmann
2 siblings, 0 replies; 4+ messages in thread
From: Gerd Hoffmann @ 2017-08-28 12:35 UTC (permalink / raw)
To: qemu-devel; +Cc: René Rebe, Gerd Hoffmann
---
hw/display/qxl-render.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/hw/display/qxl-render.c b/hw/display/qxl-render.c
index b2c98f90c0..90e0865618 100644
--- a/hw/display/qxl-render.c
+++ b/hw/display/qxl-render.c
@@ -215,14 +215,17 @@ static void qxl_unpack_chunks(void *dest, size_t size, PCIQXLDevice *qxl,
bytes = MIN(size - offset, chunk->data_size);
memcpy(dest + offset, chunk->data, bytes);
offset += bytes;
- if (offset == size)
+ if (offset == size) {
return;
+ }
chunk = qxl_phys2virt(qxl, chunk->next_chunk, group_id);
- if (!chunk)
+ if (!chunk) {
return;
+ }
max_chunks--;
- if (max_chunks == 0)
+ if (max_chunks == 0) {
return;
+ }
}
}
--
2.9.3
^ permalink raw reply related [flat|nested] 4+ messages in thread