From: Thomas Huth <thuth@redhat.com>
To: "Philippe Mathieu-Daudé" <philmd@redhat.com>, qemu-devel@nongnu.org
Cc: Laurent Vivier <lvivier@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Stefan Berger <stefanb@linux.ibm.com>
Subject: Re: [PATCH] tests/qtest/tpm: Declare input buffers const and static
Date: Wed, 2 Sep 2020 11:47:56 +0200 [thread overview]
Message-ID: <ea048124-3902-8a36-c9a7-6e7dfbba3d5c@redhat.com> (raw)
In-Reply-To: <20200902080909.161034-1-philmd@redhat.com>
On 02/09/2020 10.09, Philippe Mathieu-Daudé wrote:
> The functions using these arrays expect a "const unsigned char *"
> argument, it is safe to declare these as 'static const'.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> tests/qtest/tpm-tests.c | 4 ++--
> tests/qtest/tpm-util.c | 10 +++++-----
> 2 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/tests/qtest/tpm-tests.c b/tests/qtest/tpm-tests.c
> index a2f2838e15b..70c80f8379a 100644
> --- a/tests/qtest/tpm-tests.c
> +++ b/tests/qtest/tpm-tests.c
> @@ -59,7 +59,7 @@ void tpm_test_swtpm_test(const char *src_tpm_path, tx_func *tx,
> tpm_util_startup(s, tx);
> tpm_util_pcrextend(s, tx);
>
> - unsigned char tpm_pcrread_resp[] =
> + static const unsigned char tpm_pcrread_resp[] =
> "\x80\x01\x00\x00\x00\x3e\x00\x00\x00\x00\x00\x00\x00\x16\x00\x00"
> "\x00\x01\x00\x0b\x03\x00\x04\x00\x00\x00\x00\x01\x00\x20\xf6\x85"
> "\x98\xe5\x86\x8d\xe6\x8b\x97\x29\x99\x60\xf2\x71\x7d\x17\x67\x89"
> @@ -107,7 +107,7 @@ void tpm_test_swtpm_migration_test(const char *src_tpm_path,
> tpm_util_startup(src_qemu, tx);
> tpm_util_pcrextend(src_qemu, tx);
>
> - unsigned char tpm_pcrread_resp[] =
> + static const unsigned char tpm_pcrread_resp[] =
> "\x80\x01\x00\x00\x00\x3e\x00\x00\x00\x00\x00\x00\x00\x16\x00\x00"
> "\x00\x01\x00\x0b\x03\x00\x04\x00\x00\x00\x00\x01\x00\x20\xf6\x85"
> "\x98\xe5\x86\x8d\xe6\x8b\x97\x29\x99\x60\xf2\x71\x7d\x17\x67\x89"
> diff --git a/tests/qtest/tpm-util.c b/tests/qtest/tpm-util.c
> index e2b29ef0f8c..3ed6c8548a6 100644
> --- a/tests/qtest/tpm-util.c
> +++ b/tests/qtest/tpm-util.c
> @@ -98,9 +98,9 @@ void tpm_util_tis_transfer(QTestState *s,
> void tpm_util_startup(QTestState *s, tx_func *tx)
> {
> unsigned char buffer[1024];
> - unsigned char tpm_startup[] =
> + static const unsigned char tpm_startup[] =
> "\x80\x01\x00\x00\x00\x0c\x00\x00\x01\x44\x00\x00";
> - unsigned char tpm_startup_resp[] =
> + static const unsigned char tpm_startup_resp[] =
> "\x80\x01\x00\x00\x00\x0a\x00\x00\x00\x00";
>
> tx(s, tpm_startup, sizeof(tpm_startup), buffer, sizeof(buffer));
> @@ -112,14 +112,14 @@ void tpm_util_startup(QTestState *s, tx_func *tx)
> void tpm_util_pcrextend(QTestState *s, tx_func *tx)
> {
> unsigned char buffer[1024];
> - unsigned char tpm_pcrextend[] =
> + static const unsigned char tpm_pcrextend[] =
> "\x80\x02\x00\x00\x00\x41\x00\x00\x01\x82\x00\x00\x00\x0a\x00\x00"
> "\x00\x09\x40\x00\x00\x09\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00"
> "\x0b\x74\x65\x73\x74\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
> "\x00";
>
> - unsigned char tpm_pcrextend_resp[] =
> + static const unsigned char tpm_pcrextend_resp[] =
> "\x80\x02\x00\x00\x00\x13\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
> "\x01\x00\x00";
>
> @@ -133,7 +133,7 @@ void tpm_util_pcrread(QTestState *s, tx_func *tx,
> const unsigned char *exp_resp, size_t exp_resp_size)
> {
> unsigned char buffer[1024];
> - unsigned char tpm_pcrread[] =
> + static const unsigned char tpm_pcrread[] =
> "\x80\x01\x00\x00\x00\x14\x00\x00\x01\x7e\x00\x00\x00\x01\x00\x0b"
> "\x03\x00\x04\x00";
>
>
Reviewed-by: Thomas Huth <thuth@redhat.com>
and queued (together with your ahci patch) to my qtest-next branch.
prev parent reply other threads:[~2020-09-02 9:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-02 8:09 [PATCH] tests/qtest/tpm: Declare input buffers const and static Philippe Mathieu-Daudé
2020-09-02 8:39 ` Darren Kenny
2020-09-02 14:37 ` Stefan Berger
2020-09-02 15:59 ` Thomas Huth
2020-09-02 9:47 ` Thomas Huth [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ea048124-3902-8a36-c9a7-6e7dfbba3d5c@redhat.com \
--to=thuth@redhat.com \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanb@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).