aboutsummaryrefslogtreecommitdiff
path: root/tests/qtest/tpm-util.c
diff options
context:
space:
mode:
authorEric Auger <eric.auger@redhat.com>2020-03-05 17:51:47 +0100
committerStefan Berger <stefanb@linux.vnet.ibm.com>2020-03-05 12:18:33 -0500
commit551cabdfa9acaf6bb245a5c01d3fa4a15fc714de (patch)
treef79ad9e658e97abb8a746f937dafc3b09d524708 /tests/qtest/tpm-util.c
parentfcaa204194e15ba24cd53087dd616aabbc29e64f (diff)
downloadqemu-551cabdfa9acaf6bb245a5c01d3fa4a15fc714de.zip
qemu-551cabdfa9acaf6bb245a5c01d3fa4a15fc714de.tar.gz
qemu-551cabdfa9acaf6bb245a5c01d3fa4a15fc714de.tar.bz2
test: tpm: pass optional machine options to swtpm test functions
We plan to use swtpm test functions on ARM for testing the sysbus TPM-TIS device. However on ARM there is no default machine type. So we need to explictly pass some machine options on startup. Let's allow this by adding a new parameter to both swtpm test functions and update all call sites. Signed-off-by: Eric Auger <eric.auger@redhat.com> Reviewed-by: Stefan Berger <stefanb@linux.ibm.com> Message-id: 20200305165149.618-9-eric.auger@redhat.com Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Diffstat (limited to 'tests/qtest/tpm-util.c')
-rw-r--r--tests/qtest/tpm-util.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/qtest/tpm-util.c b/tests/qtest/tpm-util.c
index e08b137..7ecdae2 100644
--- a/tests/qtest/tpm-util.c
+++ b/tests/qtest/tpm-util.c
@@ -258,23 +258,27 @@ void tpm_util_migration_start_qemu(QTestState **src_qemu,
SocketAddress *src_tpm_addr,
SocketAddress *dst_tpm_addr,
const char *miguri,
- const char *ifmodel)
+ const char *ifmodel,
+ const char *machine_options)
{
char *src_qemu_args, *dst_qemu_args;
src_qemu_args = g_strdup_printf(
+ "%s "
"-chardev socket,id=chr,path=%s "
"-tpmdev emulator,id=dev,chardev=chr "
"-device %s,tpmdev=dev ",
- src_tpm_addr->u.q_unix.path, ifmodel);
+ machine_options ? : "", src_tpm_addr->u.q_unix.path, ifmodel);
*src_qemu = qtest_init(src_qemu_args);
dst_qemu_args = g_strdup_printf(
+ "%s "
"-chardev socket,id=chr,path=%s "
"-tpmdev emulator,id=dev,chardev=chr "
"-device %s,tpmdev=dev "
"-incoming %s",
+ machine_options ? : "",
dst_tpm_addr->u.q_unix.path,
ifmodel, miguri);