[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 11fb99: i386: Eliminate all TPM related code
|
From: |
Peter Maydell |
|
Subject: |
[Qemu-commits] [qemu/qemu] 11fb99: i386: Eliminate all TPM related code if CONFIG_TPM... |
|
Date: |
Wed, 16 Jun 2021 05:51:11 -0700 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: 11fb99e6f48ca51364e070bb3cd365680edee90c
https://github.com/qemu/qemu/commit/11fb99e6f48ca51364e070bb3cd365680edee90c
Author: Stefan Berger <stefanb@linux.ibm.com>
Date: 2021-06-15 (Tue, 15 Jun 2021)
Changed paths:
M hw/i386/acpi-build.c
M stubs/tpm.c
Log Message:
-----------
i386: Eliminate all TPM related code if CONFIG_TPM is not set
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210614191335.1968807-2-stefanb@linux.ibm.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Commit: f50be48a7b64905ca8556fa5ca18beb11004fa4a
https://github.com/qemu/qemu/commit/f50be48a7b64905ca8556fa5ca18beb11004fa4a
Author: Stefan Berger <stefanb@linux.ibm.com>
Date: 2021-06-15 (Tue, 15 Jun 2021)
Changed paths:
M hw/arm/sysbus-fdt.c
M hw/arm/virt-acpi-build.c
M hw/arm/virt.c
Log Message:
-----------
arm: Eliminate all TPM related code if CONFIG_TPM is not set
Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210614191335.1968807-3-stefanb@linux.ibm.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Commit: 295f7dcb609e02d8902180e48ffa590bea531d7e
https://github.com/qemu/qemu/commit/295f7dcb609e02d8902180e48ffa590bea531d7e
Author: Stefan Berger <stefanb@linux.ibm.com>
Date: 2021-06-15 (Tue, 15 Jun 2021)
Changed paths:
M hw/acpi/aml-build.c
M include/hw/acpi/tpm.h
Log Message:
-----------
acpi: Eliminate all TPM related code if CONFIG_TPM is not set
Cc: M: Michael S. Tsirkin <mst@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210614191335.1968807-4-stefanb@linux.ibm.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Commit: e542b71805dc4b7827e6c2f00a1170a61843345e
https://github.com/qemu/qemu/commit/e542b71805dc4b7827e6c2f00a1170a61843345e
Author: Stefan Berger <stefanb@linux.ibm.com>
Date: 2021-06-15 (Tue, 15 Jun 2021)
Changed paths:
M include/sysemu/tpm.h
M include/sysemu/tpm_backend.h
M stubs/tpm.c
Log Message:
-----------
sysemu: Make TPM structures inaccessible if CONFIG_TPM is not defined
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210614191335.1968807-5-stefanb@linux.ibm.com>
[PMD: Remove tpm_init() / tpm_cleanup() stubs]
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Commit: caff255a546d12530cf7c28e60690cd0e65851fd
https://github.com/qemu/qemu/commit/caff255a546d12530cf7c28e60690cd0e65851fd
Author: Philippe Mathieu-Daudé <philmd@redhat.com>
Date: 2021-06-15 (Tue, 15 Jun 2021)
Changed paths:
M MAINTAINERS
M monitor/hmp-cmds.c
M qapi/tpm.json
M stubs/meson.build
R stubs/tpm.c
Log Message:
-----------
tpm: Return QMP error when TPM is disabled in build
When the management layer queries a binary built using --disable-tpm
for TPM devices, it gets confused by getting empty responses:
{ "execute": "query-tpm" }
{
"return": [
]
}
{ "execute": "query-tpm-types" }
{
"return": [
]
}
{ "execute": "query-tpm-models" }
{
"return": [
]
}
To make it clearer by returning an error:
- Make the TPM QAPI schema conditional
All of tpm.json is now 'if': 'defined(CONFIG_TPM)'.
- Adapt the HMP command
- Remove stubs which became unnecessary
The management layer now gets a 'CommandNotFound' error:
{ "execute": "query-tpm" }
{
"error": {
"class": "CommandNotFound",
"desc": "The command query-tpm has not been found"
}
}
Suggested-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Commit: 1dd259ae24a26d8a987ab83aefb5c04dbe5f4b2a
https://github.com/qemu/qemu/commit/1dd259ae24a26d8a987ab83aefb5c04dbe5f4b2a
Author: Peter Maydell <peter.maydell@linaro.org>
Date: 2021-06-15 (Tue, 15 Jun 2021)
Changed paths:
M MAINTAINERS
M hw/acpi/aml-build.c
M hw/arm/sysbus-fdt.c
M hw/arm/virt-acpi-build.c
M hw/arm/virt.c
M hw/i386/acpi-build.c
M include/hw/acpi/tpm.h
M include/sysemu/tpm.h
M include/sysemu/tpm_backend.h
M monitor/hmp-cmds.c
M qapi/tpm.json
M stubs/meson.build
R stubs/tpm.c
Log Message:
-----------
Merge remote-tracking branch
'remotes/stefanberger/tags/pull-tpm-2021-06-15-1' into staging
Merge tpm 2021/06/15 v1
# gpg: Signature made Tue 15 Jun 2021 16:09:31 BST
# gpg: using RSA key B818B9CADF9089C2D5CEC66B75AD65802A0B4211
# gpg: Good signature from "Stefan Berger <stefanb@linux.vnet.ibm.com>"
[unknown]
# 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-2021-06-15-1:
tpm: Return QMP error when TPM is disabled in build
sysemu: Make TPM structures inaccessible if CONFIG_TPM is not defined
acpi: Eliminate all TPM related code if CONFIG_TPM is not set
arm: Eliminate all TPM related code if CONFIG_TPM is not set
i386: Eliminate all TPM related code if CONFIG_TPM is not set
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Compare: https://github.com/qemu/qemu/compare/1ea06abceec6...1dd259ae24a2