[Qemu-devel] [PATCH 6/6] vga: compile cirrus_vga in hwlib

[Qemu-devel] [PATCH 6/6] vga: compile cirrus_vga in hwlib

[Blue Swirl]

Remove target dependencies and compile Cirrus VGA in hwlib.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---
 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 3a699ee..932c68a 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 33df81f..00094b1 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -206,7 +206,6 @@ obj-$(CONFIG_KVM) += kvm.o kvm-all.o
 obj-$(CONFIG_NO_KVM) += kvm-stub.o
 obj-y += memory.o
 obj-$(CONFIG_VGA) += vga.o
-obj-$(CONFIG_VGA_CIRRUS) += cirrus_vga.o
 LIBS+=-lz

 QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index 846c8f5..0c86794 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

Re: [Qemu-devel] [PATCH 6/6] vga: compile cirrus_vga in hwlib

[Jan Kiszka]

[-- Attachment #1: Type: text/plain, Size: 2195 bytes --]

On 2011-12-10 17:45, Blue Swirl wrote:
> Remove target dependencies and compile Cirrus VGA in hwlib.
> 
> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
> ---
>  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 3a699ee..932c68a 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 33df81f..00094b1 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -206,7 +206,6 @@ obj-$(CONFIG_KVM) += kvm.o kvm-all.o
>  obj-$(CONFIG_NO_KVM) += kvm-stub.o
>  obj-y += memory.o
>  obj-$(CONFIG_VGA) += vga.o
> -obj-$(CONFIG_VGA_CIRRUS) += cirrus_vga.o
>  LIBS+=-lz
> 
>  QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
> diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
> index 846c8f5..0c86794 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;

Why is this redundant? Would be good to have the reasoning documented in
the commit message.

>          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,

Looking forward to seeing the second longest compilation step (after
translate.o) pushed out of the hot path.

Jan


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]