From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Li, Xin B" Subject: (no subject) Date: Mon, 17 Jul 2006 22:44:42 +0800 Message-ID: <0EBFB99D260C5B40AC33E0F807B1AD66A669BA@pdsmsx411.ccr.corp.intel.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="----_=_NextPart_001_01C6A9AF.8A8B6E9D" Return-path: Content-class: urn:content-classes:message 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. ------_=_NextPart_001_01C6A9AF.8A8B6E9D Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable on x86_64, when guest has more than 2G memory, "startx" will cause qemu dm die, this patch fixes it. Signed-off-by: Xin Li diff -r ecb8ff1fcf1f tools/ioemu/hw/vga.c --- a/tools/ioemu/hw/vga.c Fri Jul 14 18:53:27 2006 +0100 +++ b/tools/ioemu/hw/vga.c Mon Jul 17 22:35:54 2006 +0800 @@ -1392,7 +1392,8 @@ static void vga_draw_graphic(VGAState *s static void vga_draw_graphic(VGAState *s, int full_update) { int y1, y, update, page_min, page_max, linesize, y_start, double_scan, mask; - int width, height, shift_control, line_offset, page0, page1, bwidth; + int width, height, shift_control, line_offset, bwidth; + ram_addr_t page0, page1; int disp_width, multi_scan, multi_run; uint8_t *d; uint32_t v, addr1, addr; ------_=_NextPart_001_01C6A9AF.8A8B6E9D Content-Type: application/octet-stream; name="vga.patch" Content-Transfer-Encoding: base64 Content-Description: vga.patch Content-Disposition: attachment; filename="vga.patch" ZGlmZiAtciBlY2I4ZmYxZmNmMWYgdG9vbHMvaW9lbXUvaHcvdmdhLmMKLS0tIGEvdG9vbHMvaW9l bXUvaHcvdmdhLmMJRnJpIEp1bCAxNCAxODo1MzoyNyAyMDA2ICswMTAwCisrKyBiL3Rvb2xzL2lv ZW11L2h3L3ZnYS5jCU1vbiBKdWwgMTcgMjI6MzU6NTQgMjAwNiArMDgwMApAQCAtMTM5Miw3ICsx MzkyLDggQEAgc3RhdGljIHZvaWQgdmdhX2RyYXdfZ3JhcGhpYyhWR0FTdGF0ZSAqcwogc3RhdGlj IHZvaWQgdmdhX2RyYXdfZ3JhcGhpYyhWR0FTdGF0ZSAqcywgaW50IGZ1bGxfdXBkYXRlKQogewog ICAgIGludCB5MSwgeSwgdXBkYXRlLCBwYWdlX21pbiwgcGFnZV9tYXgsIGxpbmVzaXplLCB5X3N0 YXJ0LCBkb3VibGVfc2NhbiwgbWFzazsKLSAgICBpbnQgd2lkdGgsIGhlaWdodCwgc2hpZnRfY29u dHJvbCwgbGluZV9vZmZzZXQsIHBhZ2UwLCBwYWdlMSwgYndpZHRoOworICAgIGludCB3aWR0aCwg aGVpZ2h0LCBzaGlmdF9jb250cm9sLCBsaW5lX29mZnNldCwgYndpZHRoOworICAgIHJhbV9hZGRy X3QgcGFnZTAsIHBhZ2UxOwogICAgIGludCBkaXNwX3dpZHRoLCBtdWx0aV9zY2FuLCBtdWx0aV9y dW47CiAgICAgdWludDhfdCAqZDsKICAgICB1aW50MzJfdCB2LCBhZGRyMSwgYWRkcjsK ------_=_NextPart_001_01C6A9AF.8A8B6E9D 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 ------_=_NextPart_001_01C6A9AF.8A8B6E9D--