[Qemu-devel] [PULL v1 0/2] Merge tpm 2018/11/15 v1

[Qemu-devel] [PULL v1 0/2] Merge tpm 2018/11/15 v1

[Stefan Berger]

The 2 patches in this series fix some minor issues.

   Stefan

The following changes since commit cb968d275c145467c8b385a3618a207ec111eab1:

  Update version for v3.1.0-rc1 release (2018-11-13 18:16:14 +0000)

are available in the Git repository at:

  git://github.com/stefanberger/qemu-tpm.git tags/pull-tpm-2018-11-15-1

for you to fetch changes up to 5e58b58c478bd00c807bd7814ccab148d49cc901:

  tests: tpm: Use g_test_message rather than fprintf (2018-11-14 16:12:24 -0500)

----------------------------------------------------------------
Prasad J Pandit (1):
      tpm: use loop iterator to set sts data field

Stefan Berger (1):
      tests: tpm: Use g_test_message rather than fprintf

 hw/tpm/tpm_tis.c  | 2 +-
 tests/tpm-tests.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

2.17.1

[Qemu-devel] [PULL v1 1/2] tpm: use loop iterator to set sts data field

[Stefan Berger]

From: Prasad J Pandit <pjp@fedoraproject.org>

When TIS request is done, set 'sts' data field across all localities.

Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
---
 hw/tpm/tpm_tis.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
index 12f5c9a759..d9322692ee 100644
--- a/hw/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@@ -295,7 +295,7 @@ static void tpm_tis_request_completed(TPMIf *ti, int ret)
 
     if (s->cmd.selftest_done) {
         for (l = 0; l < TPM_TIS_NUM_LOCALITIES; l++) {
-            s->loc[locty].sts |= TPM_TIS_STS_SELFTEST_DONE;
+            s->loc[l].sts |= TPM_TIS_STS_SELFTEST_DONE;
         }
     }
 
-- 
2.17.1

[Qemu-devel] [PULL v1 2/2] tests: tpm: Use g_test_message rather than fprintf

[Stefan Berger]

Display a message during the test using g_test_message rather
than fprintf.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
 tests/tpm-tests.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/tpm-tests.c b/tests/tpm-tests.c
index 93a5beba01..582ec0cfd4 100644
--- a/tests/tpm-tests.c
+++ b/tests/tpm-tests.c
@@ -22,7 +22,7 @@ static bool
 tpm_test_swtpm_skip(void)
 {
     if (!tpm_util_swtpm_has_tpm2()) {
-        fprintf(stderr, "swtpm not in PATH or missing --tpm2 support; ");
+        g_test_message("swtpm not in PATH or missing --tpm2 support");
         return true;
     }
 
-- 
2.17.1

Re: [Qemu-devel] [PULL v1 0/2] Merge tpm 2018/11/15 v1

[Peter Maydell]

On 15 November 2018 at 14:09, Stefan Berger <stefanb@linux.vnet.ibm.com> wrote:
> The 2 patches in this series fix some minor issues.
>
>    Stefan
>
> The following changes since commit cb968d275c145467c8b385a3618a207ec111eab1:
>
>   Update version for v3.1.0-rc1 release (2018-11-13 18:16:14 +0000)
>
> are available in the Git repository at:
>
>   git://github.com/stefanberger/qemu-tpm.git tags/pull-tpm-2018-11-15-1
>
> for you to fetch changes up to 5e58b58c478bd00c807bd7814ccab148d49cc901:
>
>   tests: tpm: Use g_test_message rather than fprintf (2018-11-14 16:12:24 -0500)
>
> ----------------------------------------------------------------
> Prasad J Pandit (1):
>       tpm: use loop iterator to set sts data field
>
> Stefan Berger (1):
>       tests: tpm: Use g_test_message rather than fprintf

Applied, thanks.

-- PMM