From patchwork Fri Jun 24 19:23:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 101897 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 80B3FB6F90 for ; Sat, 25 Jun 2011 07:02:17 +1000 (EST) Received: from localhost ([::1]:36576 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QaDW1-0006zX-Fm for incoming@patchwork.ozlabs.org; Fri, 24 Jun 2011 17:02:13 -0400 Received: from eggs.gnu.org ([140.186.70.92]:52475) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QaBzQ-0007sj-HJ for qemu-devel@nongnu.org; Fri, 24 Jun 2011 15:24:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QaBzP-0000sF-BE for qemu-devel@nongnu.org; Fri, 24 Jun 2011 15:24:28 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:61113) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QaBzO-0000pt-FL for qemu-devel@nongnu.org; Fri, 24 Jun 2011 15:24:26 -0400 Received: by mail-wy0-f173.google.com with SMTP id 28so2380750wyf.4 for ; Fri, 24 Jun 2011 12:24:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=tmt3cRHcyn/AjTR9faFhES8OW+V//8MbT692u1T20dw=; b=BRcPnVuHfbdVrB44cvFsvxoiJS8Stq799kkGTB2pruGNgoG/NHr5ex2P2UWHHrBVzl 0T8h63c36Ug8m0zK3lOziDzRMv4ZCunozlXQD/67sxrz9RqdhrNzIl6K1RQkdtKyLWrw DFouXH0QUuDMMg7inyLLnd65u6SAPJYh6e1do= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; b=sdykiuL16BBKTQAib6szco7G8UOVnqsQBU0XseoAEqF4xprCt+MCZqBm7dIXtAL6sg Q5DpidYV8mu3593H6sot25966hlSAf03XQjE531xfyNbPdpkpH0JAvklbUadv+5JTuaI oluioRr/0e8iWW0UMdtWnJHPdXXlPMY49jTmQ= Received: by 10.227.142.141 with SMTP id q13mr451098wbu.114.1308943466007; Fri, 24 Jun 2011 12:24:26 -0700 (PDT) Received: from localhost.localdomain (c-71-227-161-214.hsd1.wa.comcast.net [71.227.161.214]) by mx.google.com with ESMTPS id ex2sm2224860wbb.14.2011.06.24.12.24.24 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 24 Jun 2011 12:24:25 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 24 Jun 2011 12:23:55 -0700 Message-Id: <1308943435-24993-9-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1308943435-24993-1-git-send-email-rth@twiddle.net> References: <1308943435-24993-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.173 Subject: [Qemu-devel] [PATCH 8/8] vga: Fix type of lfb/map_addr/end. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org These addresses have been passed through pci_to_cpu_addr, and thus need to be full target_phys_addr_t. Signed-off-by: Richard Henderson --- hw/vga_int.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/vga_int.h b/hw/vga_int.h index d2811bd..eee91a8 100644 --- a/hw/vga_int.h +++ b/hw/vga_int.h @@ -106,13 +106,13 @@ typedef void (* vga_update_retrace_info_fn)(struct VGACommonState *s); typedef struct VGACommonState { uint8_t *vram_ptr; ram_addr_t vram_offset; + target_phys_addr_t lfb_addr; + target_phys_addr_t lfb_end; + target_phys_addr_t map_addr; + target_phys_addr_t map_end; uint32_t vram_size; - uint32_t lfb_addr; - uint32_t lfb_end; - uint32_t map_addr; - uint32_t map_end; - uint32_t lfb_vram_mapped; /* whether 0xa0000 is mapped as ram */ uint32_t latch; + uint32_t lfb_vram_mapped; /* whether 0xa0000 is mapped as ram */ uint8_t sr_index; uint8_t sr[256]; uint8_t gr_index;