[Qemu-commits] [qemu/qemu] fea01f: i.MX: move i.MX31 CCM object to register array

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: fea01f9604cc7f7834911d9b0517fa48b6e32147
      
https://github.com/qemu/qemu/commit/fea01f9604cc7f7834911d9b0517fa48b6e32147
  Author: Jean-Christophe DUBOIS <address@hidden>
  Date:   2016-01-11 (Mon, 11 Jan 2016)

  Changed paths:
    M hw/misc/imx31_ccm.c
    M include/hw/misc/imx31_ccm.h

  Log Message:
  -----------
  i.MX: move i.MX31 CCM object to register array

With this i.MX25 and i.MX31 will have closer implementations.

Moreover all i.MX31 CCM registers are now present.

Signed-off-by: Jean-Christophe Dubois <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>


  Commit: b3d21a04b8e671453a001fadd82874c28852b522
      
https://github.com/qemu/qemu/commit/b3d21a04b8e671453a001fadd82874c28852b522
  Author: Andrew Jones <address@hidden>
  Date:   2016-01-11 (Mon, 11 Jan 2016)

  Changed paths:
    M hw/dma/xilinx_axidma.c

  Log Message:
  -----------
  hw/dma/xilinx_axidma: remove dead code

stream_desc_show() (and DEBUG_ENET) appear to be unused, as the
function isn't compilable (there are broken PRI format strings).

Signed-off-by: Andrew Jones <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 5de6f3c0f4641a6c08be62a75546a3e2529eebf5
      
https://github.com/qemu/qemu/commit/5de6f3c0f4641a6c08be62a75546a3e2529eebf5
  Author: Peter Maydell <address@hidden>
  Date:   2016-01-11 (Mon, 11 Jan 2016)

  Changed paths:
    M disas/arm-a64.cc
    M disas/libvixl/Makefile.objs
    M disas/libvixl/README
    R disas/libvixl/a64/assembler-a64.h
    R disas/libvixl/a64/constants-a64.h
    R disas/libvixl/a64/cpu-a64.h
    R disas/libvixl/a64/decoder-a64.cc
    R disas/libvixl/a64/decoder-a64.h
    R disas/libvixl/a64/disasm-a64.cc
    R disas/libvixl/a64/disasm-a64.h
    R disas/libvixl/a64/instructions-a64.cc
    R disas/libvixl/a64/instructions-a64.h
    R disas/libvixl/code-buffer.h
    R disas/libvixl/globals.h
    R disas/libvixl/platform.h
    R disas/libvixl/utils.cc
    R disas/libvixl/utils.h
    A disas/libvixl/vixl/a64/assembler-a64.h
    A disas/libvixl/vixl/a64/constants-a64.h
    A disas/libvixl/vixl/a64/cpu-a64.h
    A disas/libvixl/vixl/a64/decoder-a64.cc
    A disas/libvixl/vixl/a64/decoder-a64.h
    A disas/libvixl/vixl/a64/disasm-a64.cc
    A disas/libvixl/vixl/a64/disasm-a64.h
    A disas/libvixl/vixl/a64/instructions-a64.cc
    A disas/libvixl/vixl/a64/instructions-a64.h
    A disas/libvixl/vixl/code-buffer.h
    A disas/libvixl/vixl/compiler-intrinsics.cc
    A disas/libvixl/vixl/compiler-intrinsics.h
    A disas/libvixl/vixl/globals.h
    A disas/libvixl/vixl/invalset.h
    A disas/libvixl/vixl/platform.h
    A disas/libvixl/vixl/utils.cc
    A disas/libvixl/vixl/utils.h

  Log Message:
  -----------
  disas/libvixl: Update to upstream VIXL 1.12

Update our copy of libvixl to upstream's 1.12 release.
The major benefit from QEMU's point of view is that some instructions
previously disassembled as "unimplemented (System)" are now displayed
as something more useful. It also fixes some warnings about format
strings that newer w64-mingw32 compilers were emitting.

We didn't have any local changes to libvixl so nothing needed
to be forward-ported.

Although this is a large commit (due to upstream renaming most
of the files), only a few of the files changed in this commit
are not just straight copies of upstream libvixl files:
 disas/arm-a64.cc
 disas/libvixl/Makefile.objs
 disas/libvixl/README

Note that this commit introduces some signed-unsigned comparison
warnings on the old mingw compilers. Those compilers have broken
TLS support anyway so have only ever been much use for compile tests;
anybody still using them should add -Wno-sign-compare to their
--extra-cflags.

Signed-off-by: Peter Maydell <address@hidden>


  Commit: fea9b3ca9cc4685f89e0b929a61e51098fbb4f49
      
https://github.com/qemu/qemu/commit/fea9b3ca9cc4685f89e0b929a61e51098fbb4f49
  Author: Ashok Kumar <address@hidden>
  Date:   2016-01-11 (Mon, 11 Jan 2016)

  Changed paths:
    M hw/arm/virt.c

  Log Message:
  -----------
  hw/arm/virt: Support legacy -nic command line syntax

Support the legacy -nic syntax for creating PCI network devices
as well as the new-style -device options. This makes life easier
for people moving from x86 KVM virtualization to ARM KVM virtualization
and expecting their network configuration options to work the same
way for both setups.

We use "virtio" as the default NIC model if the user doesn't specify one.

Signed-off-by: Ashok Kumar <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
[PMM: expanded and clarified commit message]
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 7b8a354d4716ab2c201fad04c22b8d4a16a1b8c6
      
https://github.com/qemu/qemu/commit/7b8a354d4716ab2c201fad04c22b8d4a16a1b8c6
  Author: Peter Maydell <address@hidden>
  Date:   2016-01-11 (Mon, 11 Jan 2016)

  Changed paths:
    M disas/arm-a64.cc
    M disas/libvixl/Makefile.objs
    M disas/libvixl/README
    R disas/libvixl/a64/assembler-a64.h
    R disas/libvixl/a64/constants-a64.h
    R disas/libvixl/a64/cpu-a64.h
    R disas/libvixl/a64/decoder-a64.cc
    R disas/libvixl/a64/decoder-a64.h
    R disas/libvixl/a64/disasm-a64.cc
    R disas/libvixl/a64/disasm-a64.h
    R disas/libvixl/a64/instructions-a64.cc
    R disas/libvixl/a64/instructions-a64.h
    R disas/libvixl/code-buffer.h
    R disas/libvixl/globals.h
    R disas/libvixl/platform.h
    R disas/libvixl/utils.cc
    R disas/libvixl/utils.h
    A disas/libvixl/vixl/a64/assembler-a64.h
    A disas/libvixl/vixl/a64/constants-a64.h
    A disas/libvixl/vixl/a64/cpu-a64.h
    A disas/libvixl/vixl/a64/decoder-a64.cc
    A disas/libvixl/vixl/a64/decoder-a64.h
    A disas/libvixl/vixl/a64/disasm-a64.cc
    A disas/libvixl/vixl/a64/disasm-a64.h
    A disas/libvixl/vixl/a64/instructions-a64.cc
    A disas/libvixl/vixl/a64/instructions-a64.h
    A disas/libvixl/vixl/code-buffer.h
    A disas/libvixl/vixl/compiler-intrinsics.cc
    A disas/libvixl/vixl/compiler-intrinsics.h
    A disas/libvixl/vixl/globals.h
    A disas/libvixl/vixl/invalset.h
    A disas/libvixl/vixl/platform.h
    A disas/libvixl/vixl/utils.cc
    A disas/libvixl/vixl/utils.h
    M hw/arm/virt.c
    M hw/dma/xilinx_axidma.c
    M hw/misc/imx31_ccm.c
    M include/hw/misc/imx31_ccm.h

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/pmaydell/tags/pull-target-arm-20160111-1' into staging

target-arm queue:
 * i.MX: move i.MX31 CCM object to register array
 * xilinx_axidma: remove dead code
 * disas/libvixl: Update to upstream VIXL 1.12
 * virt: Support legacy -nic command line syntax

# gpg: Signature made Mon 11 Jan 2016 16:05:58 GMT using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <address@hidden>"
# gpg:                 aka "Peter Maydell <address@hidden>"
# gpg:                 aka "Peter Maydell <address@hidden>"

* remotes/pmaydell/tags/pull-target-arm-20160111-1:
  hw/arm/virt: Support legacy -nic command line syntax
  disas/libvixl: Update to upstream VIXL 1.12
  hw/dma/xilinx_axidma: remove dead code
  i.MX: move i.MX31 CCM object to register array

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/ac0d9dbf3360...7b8a354d4716