[Qemu-commits] [qemu/qemu] 89be9e: tpm: move qdev_prop_tpm to hw/tpm/

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 89be9e99c83095af25ce16907143c31f2959188b
      
https://github.com/qemu/qemu/commit/89be9e99c83095af25ce16907143c31f2959188b
  Author: Cornelia Huck <address@hidden>
  Date:   2017-12-19 (Tue, 19 Dec 2017)

  Changed paths:
    M hw/core/qdev-properties-system.c
    M hw/tpm/Makefile.objs
    M hw/tpm/tpm_util.c
    M hw/tpm/tpm_util.h
    M include/hw/qdev-properties.h

  Log Message:
  -----------
  tpm: move qdev_prop_tpm to hw/tpm/

Building with --disable-tpm yields

../hw/core/qdev-properties-system.o: In function `set_tpm':
/home/cohuck/git/qemu/hw/core/qdev-properties-system.c:274: undefined reference 
to `qemu_find_tpm_be'
/home/cohuck/git/qemu/hw/core/qdev-properties-system.c:278: undefined reference 
to `tpm_backend_init'
../hw/core/qdev-properties-system.o: In function `release_tpm':
/home/cohuck/git/qemu/hw/core/qdev-properties-system.c:291: undefined reference 
to `tpm_backend_reset'

Move the implementation of DEFINE_PROP_TPMBE to hw/tpm/ so that it is
only built when tpm is actually configured, and build tpm_util in every
case.

Fixes: 493b78303532 ("qdev: add DEFINE_PROP_TPMBE")
Reported-by: Thomas Huth <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Signed-off-by: Stefan Berger <address@hidden>


  Commit: 062fcb27c4c1af6902f497ec9316c1c0ead90e81
      
https://github.com/qemu/qemu/commit/062fcb27c4c1af6902f497ec9316c1c0ead90e81
  Author: Peter Maydell <address@hidden>
  Date:   2017-12-19 (Tue, 19 Dec 2017)

  Changed paths:
    M hw/core/qdev-properties-system.c
    M hw/tpm/Makefile.objs
    M hw/tpm/tpm_util.c
    M hw/tpm/tpm_util.h
    M include/hw/qdev-properties.h

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/stefanberger/tags/pull-tpm-2017-12-19-1' into staging

Merge tpm 2017/12/19 v1

# gpg: Signature made Tue 19 Dec 2017 11:51:13 GMT
# gpg:                using RSA key 0x75AD65802A0B4211
# gpg: Good signature from "Stefan Berger <address@hidden>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: B818 B9CA DF90 89C2 D5CE  C66B 75AD 6580 2A0B 4211

* remotes/stefanberger/tags/pull-tpm-2017-12-19-1:
  tpm: move qdev_prop_tpm to hw/tpm/

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


Compare: https://github.com/qemu/qemu/compare/46db367db704...062fcb27c4c1