From patchwork Sun Jan 22 13:07:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 137238 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 009DD1007D1 for ; Mon, 23 Jan 2012 00:08:32 +1100 (EST) Received: from localhost ([::1]:33751 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rox9p-0003fl-SW for incoming@patchwork.ozlabs.org; Sun, 22 Jan 2012 08:08:29 -0500 Received: from eggs.gnu.org ([140.186.70.92]:43428) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rox9i-0003ec-5x for qemu-devel@nongnu.org; Sun, 22 Jan 2012 08:08:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rox9g-0000xM-Mi for qemu-devel@nongnu.org; Sun, 22 Jan 2012 08:08:22 -0500 Received: from mail-iy0-f173.google.com ([209.85.210.173]:33505) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rox9g-0000sU-Ey for qemu-devel@nongnu.org; Sun, 22 Jan 2012 08:08:20 -0500 Received: by mail-iy0-f173.google.com with SMTP id k25so817455iah.4 for ; Sun, 22 Jan 2012 05:08:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; bh=Wx5O8HIE3h5jDZLOuiRS2k4ON0kmXwMhk39A4yX+QgM=; b=RdmK4PDS+d6mbGuSdDMT5NYoHP1lQW+q1wBLpdHaQaboMpCmIe7D/ObLDSgAeLBESi NcFpzKcD/NtLwlYnLLU1CUOWtZ2sEvk4RxGMgR+Zwtg6JUNxOOQbnAxv5kXVxk90XPo9 xXzXs1y7HMRS2MKSFsXHu7sEoc9Cry7s/pLp4= Received: by 10.50.15.169 with SMTP id y9mr9022igc.9.1327237700326; Sun, 22 Jan 2012 05:08:20 -0800 (PST) MIME-Version: 1.0 Received: by 10.50.193.229 with HTTP; Sun, 22 Jan 2012 05:07:59 -0800 (PST) From: Blue Swirl Date: Sun, 22 Jan 2012 13:07:59 +0000 Message-ID: To: qemu-devel X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.210.173 Subject: [Qemu-devel] [PATCH 3/3] vga: compile cirrus_vga in hwlib 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 Remove target dependencies and compile Cirrus VGA in hwlib. Address masking can be removed since memory API handles that now. Signed-off-by: Blue Swirl --- Makefile.objs | 1 + Makefile.target | 1 - hw/cirrus_vga.c | 3 --- 3 files changed, 1 insertions(+), 4 deletions(-) } @@ -1897,8 +1896,6 @@ static void cirrus_mmio_blt_write(CirrusVGAState * s, unsigned address, * * write mode 4/5 * - * assume TARGET_PAGE_SIZE >= 16 - * ***************************************/ static void cirrus_mem_writeb_mode4and5_8bpp(CirrusVGAState * s, From 47e5a9f8e0c43fbf2c2b0cb1edd12763bc91706d Mon Sep 17 00:00:00 2001 Message-Id: <47e5a9f8e0c43fbf2c2b0cb1edd12763bc91706d.1327237042.git.blauwirbel@gmail.com> In-Reply-To: <41f0624d559ef63f1f3c97f4d4ecb3e310935eb9.1327237042.git.blauwirbel@gmail.com> References: <41f0624d559ef63f1f3c97f4d4ecb3e310935eb9.1327237042.git.blauwirbel@gmail.com> From: Blue Swirl Date: Sun, 9 Oct 2011 09:58:00 +0000 Subject: [PATCH 3/3] vga: compile cirrus_vga in hwlib Remove target dependencies and compile Cirrus VGA in hwlib. Address masking can be removed since memory API handles that now. Signed-off-by: Blue Swirl --- Makefile.objs | 1 + Makefile.target | 1 - hw/cirrus_vga.c | 3 --- 3 files changed, 1 insertions(+), 4 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index f94c881..d404e30 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -287,6 +287,7 @@ hw-obj-$(CONFIG_VGA_ISA) += vga-isa.o hw-obj-$(CONFIG_VGA_ISA_MM) += vga-isa-mm.o hw-obj-$(CONFIG_VMWARE_VGA) += vmware_vga.o hw-obj-$(CONFIG_VMMOUSE) += vmmouse.o +hw-obj-$(CONFIG_VGA_CIRRUS) += cirrus_vga.o hw-obj-$(CONFIG_RC4030) += rc4030.o hw-obj-$(CONFIG_DP8393X) += dp8393x.o diff --git a/Makefile.target b/Makefile.target index bb18d72..309d761 100644 --- a/Makefile.target +++ b/Makefile.target @@ -197,7 +197,6 @@ obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p-device.o obj-$(CONFIG_KVM) += kvm.o kvm-all.o obj-$(CONFIG_NO_KVM) += kvm-stub.o obj-$(CONFIG_VGA) += vga.o -obj-$(CONFIG_VGA_CIRRUS) += cirrus_vga.o obj-y += memory.o savevm.o LIBS+=-lz diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index a031079..7ce35ec 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -618,7 +618,6 @@ static void cirrus_invalidate_region(CirrusVGAState * s, int off_begin, for (y = 0; y < lines; y++) { off_cur = off_begin; off_cur_end = (off_cur + bytesperline) & s->cirrus_addr_mask; - off_cur &= TARGET_PAGE_MASK; memory_region_set_dirty(&s->vga.vram, off_cur, off_cur_end - off_cur); off_begin += off_pitch; } @@ -1897,8 +1896,6 @@ static void cirrus_mmio_blt_write(CirrusVGAState * s, unsigned address, * * write mode 4/5 * - * assume TARGET_PAGE_SIZE >= 16 - * ***************************************/ static void cirrus_mem_writeb_mode4and5_8bpp(CirrusVGAState * s, -- 1.7.2.5