{"id":806566,"url":"http://patchwork.ozlabs.org/api/1.0/patches/806566/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/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":""},"msgid":"<20170828123933.30323-3-kraxel@redhat.com>","date":"2017-08-28T12:39:33","name":"[v3,2/2] 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.0/people/589/?format=json","name":"Gerd Hoffmann","email":"kraxel@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170828123933.30323-3-kraxel@redhat.com/mbox/","series":[{"id":161,"url":"http://patchwork.ozlabs.org/api/1.0/series/161/?format=json","date":"2017-08-28T12:39:31","name":"[v3,1/2] qxl: drop mono cursor support","version":3,"mbox":"http://patchwork.ozlabs.org/series/161/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806566/checks/","tags":{},"headers":{"Return-Path":"","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=)","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx07.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 3xgrvn6gRgz9sDB\n\tfor ;\n\tMon, 28 Aug 2017 22:40:21 +1000 (AEST)","from localhost ([::1]:39685 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dmJL1-00007L-Fu\n\tfor incoming@patchwork.ozlabs.org; Mon, 28 Aug 2017 08:40:19 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:44304)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dmJKP-0008WL-9V\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 08:39:42 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dmJKL-0002Yo-Ak\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 08:39:41 -0400","from mx1.redhat.com ([209.132.183.28]:39408)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dmJKL-0002Y5-4d\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 08:39:37 -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 1D646C04B303;\n\tMon, 28 Aug 2017 12:39:36 +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 E28977F79E;\n\tMon, 28 Aug 2017 12:39:33 +0000 (UTC)","by sirius.home.kraxel.org (Postfix, from userid 1000)\n\tid 2104F204A5; Mon, 28 Aug 2017 14:39:33 +0200 (CEST)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 1D646C04B303","From":"Gerd Hoffmann ","To":"qemu-devel@nongnu.org","Date":"Mon, 28 Aug 2017 14:39:33 +0200","Message-Id":"<20170828123933.30323-3-kraxel@redhat.com>","In-Reply-To":"<20170828123933.30323-1-kraxel@redhat.com>","References":"<20170828123933.30323-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.31]);\n\tMon, 28 Aug 2017 12:39:36 +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] [PATCH v3 2/2] qxl: add support for chunked cursors.","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"=?utf-8?q?Ren=C3=A9_Rebe?= ,\n\tGerd Hoffmann ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Signed-off-by: Gerd Hoffmann \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":["v3","2/2"]}