{"id":808685,"url":"http://patchwork.ozlabs.org/api/1.2/patches/808685/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901125742.4249-5-kraxel@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170901125742.4249-5-kraxel@redhat.com>","list_archive_url":null,"date":"2017-09-01T12:57:41","name":"[PULL,4/5] qxl: add support for chunked cursors.","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"6b96a88a5fd13dd0871a385e9f1aac79c1efe36d","submitter":{"id":589,"url":"http://patchwork.ozlabs.org/api/1.2/people/589/?format=json","name":"Gerd Hoffmann","email":"kraxel@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901125742.4249-5-kraxel@redhat.com/mbox/","series":[{"id":1026,"url":"http://patchwork.ozlabs.org/api/1.2/series/1026/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1026","date":"2017-09-01T12:57:38","name":"[PULL,1/5] vga: fix display update region calculation (split screen)","version":1,"mbox":"http://patchwork.ozlabs.org/series/1026/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/808685/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808685/checks/","tags":{},"related":[],"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)","ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=kraxel@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xkKlQ5t08z9s7F\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri,  1 Sep 2017 23:26:42 +1000 (AEST)","from localhost ([::1]:40126 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dnly4-0002fs-MU\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 09:26:40 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:54736)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <kraxel@redhat.com>) id 1dnlWB-0001wz-5w\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 08:57:55 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <kraxel@redhat.com>) id 1dnlW6-0007oq-MM\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 08:57:51 -0400","from mx1.redhat.com ([209.132.183.28]:39230)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <kraxel@redhat.com>) id 1dnlW6-0007oO-Gd\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 08:57:46 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 7545F129A\n\tfor <qemu-devel@nongnu.org>; Fri,  1 Sep 2017 12:57:45 +0000 (UTC)","from sirius.home.kraxel.org (ovpn-116-70.ams2.redhat.com\n\t[10.36.116.70])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id A0B4C60317;\n\tFri,  1 Sep 2017 12:57:44 +0000 (UTC)","by sirius.home.kraxel.org (Postfix, from userid 1000)\n\tid 6C75216A899; Fri,  1 Sep 2017 14:57:42 +0200 (CEST)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 7545F129A","From":"Gerd Hoffmann <kraxel@redhat.com>","To":"qemu-devel@nongnu.org","Date":"Fri,  1 Sep 2017 14:57:41 +0200","Message-Id":"<20170901125742.4249-5-kraxel@redhat.com>","In-Reply-To":"<20170901125742.4249-1-kraxel@redhat.com>","References":"<20170901125742.4249-1-kraxel@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.29]);\n\tFri, 01 Sep 2017 12:57:45 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PULL 4/5] qxl: add support for chunked cursors.","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"Gerd Hoffmann <kraxel@redhat.com>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"},"content":"Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>\nMessage-id: 20170828123933.30323-3-kraxel@redhat.com\n---\n hw/display/qxl-render.c | 36 +++++++++++++++++++++++++++++-------\n 1 file changed, 29 insertions(+), 7 deletions(-)","diff":"diff --git a/hw/display/qxl-render.c b/hw/display/qxl-render.c\nindex e1b3f05ecb..90e0865618 100644\n--- a/hw/display/qxl-render.c\n+++ b/hw/display/qxl-render.c\n@@ -204,7 +204,33 @@ void qxl_render_update_area_done(PCIQXLDevice *qxl, QXLCookie *cookie)\n     g_free(cookie);\n }\n \n-static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl, QXLCursor *cursor)\n+static void qxl_unpack_chunks(void *dest, size_t size, PCIQXLDevice *qxl,\n+                              QXLDataChunk *chunk, uint32_t group_id)\n+{\n+    uint32_t max_chunks = 32;\n+    size_t offset = 0;\n+    size_t bytes;\n+\n+    for (;;) {\n+        bytes = MIN(size - offset, chunk->data_size);\n+        memcpy(dest + offset, chunk->data, bytes);\n+        offset += bytes;\n+        if (offset == size) {\n+            return;\n+        }\n+        chunk = qxl_phys2virt(qxl, chunk->next_chunk, group_id);\n+        if (!chunk) {\n+            return;\n+        }\n+        max_chunks--;\n+        if (max_chunks == 0) {\n+            return;\n+        }\n+    }\n+}\n+\n+static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl, QXLCursor *cursor,\n+                              uint32_t group_id)\n {\n     QEMUCursor *c;\n     size_t size;\n@@ -215,7 +241,7 @@ static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl, QXLCursor *cursor)\n     switch (cursor->header.type) {\n     case SPICE_CURSOR_TYPE_ALPHA:\n         size = sizeof(uint32_t) * cursor->header.width * cursor->header.height;\n-        memcpy(c->data, cursor->chunk.data, size);\n+        qxl_unpack_chunks(c->data, size, qxl, &cursor->chunk, group_id);\n         if (qxl->debug > 2) {\n             cursor_print_ascii_art(c, \"qxl/alpha\");\n         }\n@@ -259,11 +285,7 @@ int qxl_render_cursor(PCIQXLDevice *qxl, QXLCommandExt *ext)\n         if (!cursor) {\n             return 1;\n         }\n-        if (cursor->chunk.data_size != cursor->data_size) {\n-            fprintf(stderr, \"%s: multiple chunks\\n\", __FUNCTION__);\n-            return 1;\n-        }\n-        c = qxl_cursor(qxl, cursor);\n+        c = qxl_cursor(qxl, cursor, ext->group_id);\n         if (c == NULL) {\n             c = cursor_builtin_left_ptr();\n         }\n","prefixes":["PULL","4/5"]}