From patchwork Tue Jun 14 19:53:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 100427 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 91D8DB6F9C for ; Wed, 15 Jun 2011 06:05:38 +1000 (EST) Received: from localhost ([::1]:55213 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWZrj-0005eI-24 for incoming@patchwork.ozlabs.org; Tue, 14 Jun 2011 16:05:35 -0400 Received: from eggs.gnu.org ([140.186.70.92]:47526) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWZg3-0003XF-0p for qemu-devel@nongnu.org; Tue, 14 Jun 2011 15:53:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QWZg0-00006y-8N for qemu-devel@nongnu.org; Tue, 14 Jun 2011 15:53:30 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:38105) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWZfz-00004z-Oo for qemu-devel@nongnu.org; Tue, 14 Jun 2011 15:53:28 -0400 Received: by pzk30 with SMTP id 30so2932048pzk.4 for ; Tue, 14 Jun 2011 12:53:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:cc:subject:date:message-id :x-mailer; bh=szG/zaM87kVxGyrwyCOa8XzvqYQ/NxcNISHq2u0BkPE=; b=Fe2ZEqQ/rgE29/o2PE0v1ws8OiWYJsfqHC78ZnODf5e/6aSDgHuyGF7dlT13MBG1Vz n4EBJYtZ5t0QadNlFwM+nGqd7dTxVf+eiR1ZCP1tP0QYIMq8w13oYxXbMHU6ADvxXjT5 jmVNeM6U8bep1q5b+tHgHLb0RwWjZeWYIA9Zg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer; b=t7qtqOzDAov7NiKsAnXUB5FfWMV443MNr4MH5GpSjNZq2KGrcVCwgzWaTaGJhGGuTx AU5CG75gdPQtiKzgMX3DWvOWZ8sgIoM93by/gjT86k5VzFyHWv255Npz6KRMGQFHLgaB cxF8a0uA/X6qfGVt7LJ4DXsHWrKLLIvRpqpMQ= Received: by 10.68.25.166 with SMTP id d6mr3214939pbg.136.1308081206174; Tue, 14 Jun 2011 12:53: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 o2sm5805124pbj.81.2011.06.14.12.53.24 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 14 Jun 2011 12:53:25 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 14 Jun 2011 12:53:08 -0700 Message-Id: <1308081188-19695-1-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.4.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.210.45 Cc: Jan Kiszka Subject: [Qemu-devel] [PATCH, v2] 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 Cc: Jan Kiszka Acked-by: Jan Kiszka --- V1->V2: lfb_addr/end also widened to guest address width. 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;