[Qemu-commits] [qemu/qemu] 834fb1: disas/libvixl: prepend the include path of libvixl...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 834fb1b269f4c9eb0ffc058fd6ab5a018c3bce1f
      
https://github.com/qemu/qemu/commit/834fb1b269f4c9eb0ffc058fd6ab5a018c3bce1f
  Author: Stefano Stabellini <address@hidden>
  Date:   2014-07-08 (Tue, 08 Jul 2014)

  Changed paths:
    M disas/libvixl/Makefile.objs

  Log Message:
  -----------
  disas/libvixl: prepend the include path of libvixl header files

Currently the Makefile of disas/libvixl appends
-I$(SRC_PATH)/disas/libvixl to QEMU_CFLAGS. As a consequence C++ files
that #include "utils.h", such as disas/libvixl/a64/instructions-a64.cc,
are going to look for utils.h on all the other include paths first.

When building QEMU as part of the Xen make system, another unrelated
utils.h file is going to be chosen for inclusion, causing a build
failure:

In file included from disas/libvixl/a64/instructions-a64.cc:27:0:
/qemu/disas/libvixl/a64/instructions-a64.h:88:64: error:
'rawbits_to_float' was not declared in this scope
 const float kFP32PositiveInfinity = rawbits_to_float(0x7f800000);

Fix the problem by prepending (rather than appending) the libvixl
include path to QEMU_CFLAGS.

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


  Commit: 6ec1588e09770ac7e9c60194faff6101111fc7f0
      
https://github.com/qemu/qemu/commit/6ec1588e09770ac7e9c60194faff6101111fc7f0
  Author: Peter Maydell <address@hidden>
  Date:   2014-07-08 (Tue, 08 Jul 2014)

  Changed paths:
    M hw/arm/vexpress.c

  Log Message:
  -----------
  hw/arm/vexpress: Alias NOR flash at 0 for vexpress-a9

Make the vexpress-a9 board alias the first NOR flash region at
address zero, like vexpress-a15. This makes "-bios" actually usable
on this board.

Signed-off-by: Peter Maydell <address@hidden>
Message-id: address@hidden
Reviewed-by: Greg Bellows <address@hidden>


  Commit: 75c9a1a0473cc5ca9756d11b236c715c7bc0ba67
      
https://github.com/qemu/qemu/commit/75c9a1a0473cc5ca9756d11b236c715c7bc0ba67
  Author: Peter Maydell <address@hidden>
  Date:   2014-07-08 (Tue, 08 Jul 2014)

  Changed paths:
    M target-arm/cpu-qom.h
    M target-arm/kvm32.c

  Log Message:
  -----------
  target-arm: Implement vCPU reset via KVM_ARM_VCPU_INIT for 32-bit CPUs

Implement kvm_arm_vcpu_init() as a simple call to arm_arm_vcpu_init()
(which uses the KVM_ARM_VCPU_INIT vcpu ioctl to tell the kernel
to re-initialize the vCPU), rather than via the complicated code
which saves a copy of the register state on first init and then
writes it back to the kernel. This is much simpler and brings the
32-bit KVM code into line with the 64-bit code.

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


  Commit: 67d01fb8066b7bfa9be1b2c8537ad3f2406d98cf
      
https://github.com/qemu/qemu/commit/67d01fb8066b7bfa9be1b2c8537ad3f2406d98cf
  Author: Peter Maydell <address@hidden>
  Date:   2014-07-08 (Tue, 08 Jul 2014)

  Changed paths:
    M disas/libvixl/Makefile.objs
    M hw/arm/vexpress.c
    M target-arm/cpu-qom.h
    M target-arm/kvm32.c

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

target-arm queue:
 * fix handling of KVM reset for 32-bit ARM CPUs
 * implement NOR flash alias for vexpress-a9
 * make sure libvixl gets its own utils.h rather than somebody else's

# gpg: Signature made Tue 08 Jul 2014 13:12:05 BST using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <address@hidden>"

* remotes/pmaydell/tags/pull-target-arm-20140708:
  target-arm: Implement vCPU reset via KVM_ARM_VCPU_INIT for 32-bit CPUs
  hw/arm/vexpress: Alias NOR flash at 0 for vexpress-a9
  disas/libvixl: prepend the include path of libvixl header files

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


Compare: https://github.com/qemu/qemu/compare/eaa498018594...67d01fb8066b