From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40211) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNJUi-0000pl-IM for qemu-devel@nongnu.org; Wed, 13 Jul 2016 08:42:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bNJUe-0002RW-BL for qemu-devel@nongnu.org; Wed, 13 Jul 2016 08:42:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42060) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNJUe-0002RM-3n for qemu-devel@nongnu.org; Wed, 13 Jul 2016 08:42:24 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 85DF27267D for ; Wed, 13 Jul 2016 12:42:23 +0000 (UTC) Date: Wed, 13 Jul 2016 13:42:20 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20160713124219.GB4573@work-vm> References: <1468413187-22071-1-git-send-email-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1468413187-22071-1-git-send-email-kraxel@redhat.com> Subject: Re: [Qemu-devel] [PATCH] qxl: fix qxl_set_dirty call in qxl_dirty_one_surface List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann Cc: qemu-devel@nongnu.org * Gerd Hoffmann (kraxel@redhat.com) wrote: > qxl_set_dirty() expects start and end as range specification. > qxl_dirty_one_surface passes 'size' instead of 'offset + size' as end > parameter. Fix that. Also use uint64_t everywhere while being at it. > > Bug was added by "e25139b qxl: set only off-screen surfaces dirty instead > of the whole vram" and carried forward unnoticed by "5cdc402 qxl: fix > surface migration". > > Reported-by: Dr. David Alan Gilbert > Signed-off-by: Gerd Hoffmann Reviewed-by: Dr. David Alan Gilbert > --- > hw/display/qxl.c | 11 ++++++----- > hw/display/trace-events | 2 +- > 2 files changed, 7 insertions(+), 6 deletions(-) > > diff --git a/hw/display/qxl.c b/hw/display/qxl.c > index 7da7b4e..252199a 100644 > --- a/hw/display/qxl.c > +++ b/hw/display/qxl.c > @@ -1811,16 +1811,17 @@ static void qxl_hw_update(void *opaque) > static void qxl_dirty_one_surface(PCIQXLDevice *qxl, QXLPHYSICAL pqxl, > uint32_t height, int32_t stride) > { > - uint64_t offset; > - uint32_t slot, size; > + uint64_t offset, size; > + uint32_t slot; > bool rc; > > rc = qxl_get_check_slot_offset(qxl, pqxl, &slot, &offset); > assert(rc == true); > - size = height * abs(stride); > - trace_qxl_surfaces_dirty(qxl->id, (int)offset, size); > + size = (uint64_t)height * abs(stride); > + trace_qxl_surfaces_dirty(qxl->id, offset, size); > qxl_set_dirty(qxl->guest_slots[slot].mr, > - qxl->guest_slots[slot].offset + offset, size); > + qxl->guest_slots[slot].offset + offset, > + qxl->guest_slots[slot].offset + offset + size); > } > > static void qxl_dirty_surfaces(PCIQXLDevice *qxl) > diff --git a/hw/display/trace-events b/hw/display/trace-events > index 9dd82ce..78f0465 100644 > --- a/hw/display/trace-events > +++ b/hw/display/trace-events > @@ -105,7 +105,7 @@ qxl_spice_reset_image_cache(int qid) "%d" > qxl_spice_reset_memslots(int qid) "%d" > qxl_spice_update_area(int qid, uint32_t surface_id, uint32_t left, uint32_t right, uint32_t top, uint32_t bottom) "%d sid=%d [%d,%d,%d,%d]" > qxl_spice_update_area_rest(int qid, uint32_t num_dirty_rects, uint32_t clear_dirty_region) "%d #d=%d clear=%d" > -qxl_surfaces_dirty(int qid, int offset, int size) "%d offset=%d size=%d" > +qxl_surfaces_dirty(int qid, uint64_t offset, uint64_t size) "%d offset=0x%"PRIx64" size=0x%"PRIx64 > qxl_send_events(int qid, uint32_t events) "%d %d" > qxl_send_events_vm_stopped(int qid, uint32_t events) "%d %d" > qxl_set_guest_bug(int qid) "%d" > -- > 1.8.3.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK