From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Lalancette Subject: [PATCH]: QEMU: Additional error checking in Cirrus setup Date: Fri, 24 Aug 2007 14:21:06 -0400 Message-ID: <46CF2192.80109@redhat.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------020205030901040403010207" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format. --------------020205030901040403010207 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit All, Attached is a patch to do some additional error checking in QEMU when setting up the Cirrus Logic video device. In particular, it may be the case that that set_mm_mapping() fails because of xc_domain_populate_physmap(). In this case, we should not blindly go on; the xc_map_foreign_batch() that follows will cause a page fault and, at best, get mapped in a zeroed page from the dom0 (which is not what we want). While I'm in here, fix a memory leak on an error path. The patch is against 3.1.0, but should apply fairly easily to xen-unstable. Signed-off-by: Chris Lalancette --------------020205030901040403010207 Content-Type: text/x-patch; name="xen-3.1.0-qemu-error-check.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="xen-3.1.0-qemu-error-check.patch" diff -urp xen-3.1.0-src.orig/tools/ioemu/hw/cirrus_vga.c xen-3.1.0-src/tools/ioemu/hw/cirrus_vga.c --- xen-3.1.0-src.orig/tools/ioemu/hw/cirrus_vga.c 2007-05-18 10:45:21.000000000 -0400 +++ xen-3.1.0-src/tools/ioemu/hw/cirrus_vga.c 2007-08-24 09:58:43.000000000 -0400 @@ -2554,7 +2554,11 @@ static void *set_vram_mapping(unsigned l for (i = 0; i < nr_extents; i++) extent_start[i] = (begin + i * TARGET_PAGE_SIZE) >> TARGET_PAGE_BITS; - set_mm_mapping(xc_handle, domid, nr_extents, 0, extent_start); + if (set_mm_mapping(xc_handle, domid, nr_extents, 0, extent_start) < 0) { + fprintf(logfile, "Failed set_mm_mapping\n"); + free(extent_start); + return NULL; + } vram_pointer = xc_map_foreign_batch(xc_handle, domid, PROT_READ|PROT_WRITE, @@ -2562,6 +2566,7 @@ static void *set_vram_mapping(unsigned l if (vram_pointer == NULL) { fprintf(logfile, "xc_map_foreign_batch vgaram returned error %d\n", errno); + free(extent_start); return NULL; } --------------020205030901040403010207 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --------------020205030901040403010207--