[Qemu-commits] [qemu/qemu] 3ccdbe: tci: Fix build regression

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 3ccdbecf80a322a31dbf452d433321c67f82d534
      
https://github.com/qemu/qemu/commit/3ccdbecf80a322a31dbf452d433321c67f82d534
  Author: Stefan Weil <address@hidden>
  Date:   2016-04-07 (Thu, 07 Apr 2016)

  Changed paths:
    M tci.c

  Log Message:
  -----------
  tci: Fix build regression

Commit d38ea87ac54af64ef611de434d07c12dc0399216 cleaned the include
statements which resulted in a wrong order of assert.h and the definition
of NDEBUG in tci.c. Normally NDEBUG modifies the definition of the assert
macro, but here this definition comes too late which results in a failing
build.

To fix this, a new macro tci_assert which depends on CONFIG_DEBUG_TCG
is introduced. Only builds with CONFIG_DEBUG_TCG will use assertions.
Even in this case, it is still possible to disable assertions by
defining NDEBUG via compiler settings.

Tested-by: Michael Roth <address@hidden>
Signed-off-by: Stefan Weil <address@hidden>


  Commit: 5542417dae2aaa5755ccfaddba4a481c5277e97c
      
https://github.com/qemu/qemu/commit/5542417dae2aaa5755ccfaddba4a481c5277e97c
  Author: Peter Maydell <address@hidden>
  Date:   2016-04-08 (Fri, 08 Apr 2016)

  Changed paths:
    M tci.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/weil/tags/pull-tci-20160407' into 
staging

tci patch queue

# gpg: Signature made Thu 07 Apr 2016 18:01:55 BST using RSA key ID 677450AD
# gpg: Good signature from "Stefan Weil <address@hidden>"
# gpg:                 aka "Stefan Weil <address@hidden>"
# gpg:                 aka "Stefan Weil <address@hidden>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4923 6FEA 75C9 5D69 8EC2  B78A E08C 21D5 6774 50AD

* remotes/weil/tags/pull-tci-20160407:
  tci: Fix build regression

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


Compare: https://github.com/qemu/qemu/compare/28ee01269e91...5542417dae2a