[Qemu-commits] [qemu/qemu] a8f139: tcg/mips: Fix build error from merged memop+mmu_id...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: a8f13961fdcff3a5969b9884368e875aa068f1c9
      
https://github.com/qemu/qemu/commit/a8f13961fdcff3a5969b9884368e875aa068f1c9
  Author: James Hogan <address@hidden>
  Date:   2015-07-09 (Thu, 09 Jul 2015)

  Changed paths:
    M tcg/mips/tcg-target.c

  Log Message:
  -----------
  tcg/mips: Fix build error from merged memop+mmu_idx parameter

Commit 3972ef6f830d ("tcg: Push merged memop+mmu_idx parameter to
softmmu routines") caused the following build errors when building TCG
for MIPS:

In file included from tcg/tcg.c:258:0:
tcg/mips/tcg-target.c In function ‘tcg_out_qemu_ld_slow_path’:
tcg/mips/tcg-target.c:1015:22: error: ‘lb’ undeclared (first use in this 
function)
tcg/mips/tcg-target.c In function ‘tcg_out_qemu_st_slow_path’:
tcg/mips/tcg-target.c:1058:22: error: ‘lb’ undeclared (first use in this 
function)

It looks like lb was meant to refer to the TCGLabelQemuLdst *l
parameter, so fix both references to lb to refer to just l.

Fixes: 3972ef6f830d ("tcg: Push merged memop+mmu_idx parameter to softmmu 
routines")
Signed-off-by: James Hogan <address@hidden>
Reviewed-by: Leon Alrae <address@hidden>
Message-id: address@hidden
Cc: Aurelien Jarno <address@hidden>
Cc: Leon Alrae <address@hidden>
Cc: Richard Henderson <address@hidden>
Cc: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 5a2db89615c8efabbeca74fe5e0f14f312d3bbe3
      
https://github.com/qemu/qemu/commit/5a2db89615c8efabbeca74fe5e0f14f312d3bbe3
  Author: James Hogan <address@hidden>
  Date:   2015-07-09 (Thu, 09 Jul 2015)

  Changed paths:
    M target-mips/kvm.c

  Log Message:
  -----------
  mips/kvm: Sync with newer MIPS KVM headers

The KVM_REG_MIPS_COUNT_* definitions are now included in
linux-headers/asm-mips/kvm.h since commit b061808d39fa ("linux-headers:
update linux headers to kvm/next"), therefore the duplicate definitions
in target-mips/kvm.c can now be dropped (the definitions were tweaked
slightly in commit 7a52ce8a1607 ("linux-headers: update") which
triggered the following build warnings turned errors):

target-mips/kvm.c:232:0: error: "KVM_REG_MIPS_COUNT_CTL" redefined [-Werror]
linux-headers/asm/kvm.h:129:0: note: this is the location of the previous 
definition
target-mips/kvm.c:236:0: error: "KVM_REG_MIPS_COUNT_RESUME" redefined [-Werror]
linux-headers/asm/kvm.h:141:0: note: this is the location of the previous 
definition
target-mips/kvm.c:239:0: error: "KVM_REG_MIPS_COUNT_HZ" redefined [-Werror]
linux-headers/asm/kvm.h:147:0: note: this is the location of the previous 
definition

Also update the MIPS_C0_{32,64} macros to utilise definitions more
recently added to the asm-mips/kvm.h header.

Signed-off-by: James Hogan <address@hidden>
Reviewed-by: Leon Alrae <address@hidden>
Message-id: address@hidden
Cc: Paolo Bonzini <address@hidden>
Cc: Leon Alrae <address@hidden>
Cc: Aurelien Jarno <address@hidden>
Cc: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/acf7b7fdf31f...5a2db89615c8