motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-07 17:53:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: Pass TPM interface model to functions creating command line

Browse source 
Pass the TPM interface model, such as 'tpm-crb', through to the functions
that create the command line for QEMU.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Stefan Berger 2018-05-30 14:31:12 -04:00
parent 2b4ccb87ec
commit ea71a33691
5 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tests/tpm-tests.c
View file

@ -18,7 +18,8 @@
#include "libqtest.h"
#include "tpm-tests.h"
void tpm_test_swtpm_test(const char *src_tpm_path, tx_func *tx)
void tpm_test_swtpm_test(const char *src_tpm_path, tx_func *tx,
const char *ifmodel)
{
char *args = NULL;
QTestState *s;
@ -36,8 +37,8 @@ void tpm_test_swtpm_test(const char *src_tpm_path, tx_func *tx)
args = g_strdup_printf(
"-chardev socket,id=chr,path=%s "
"-tpmdev emulator,id=dev,chardev=chr "
"-device tpm-crb,tpmdev=dev",
addr->u.q_unix.path);
"-device %s,tpmdev=dev",
addr->u.q_unix.path, ifmodel);
s = qtest_start(args);
g_free(args);
@ -64,7 +65,8 @@ void tpm_test_swtpm_test(const char *src_tpm_path, tx_func *tx)
void tpm_test_swtpm_migration_test(const char *src_tpm_path,
const char *dst_tpm_path,
const char *uri, tx_func *tx)
const char *uri, tx_func *tx,
const char *ifmodel)
{
gboolean succ;
GPid src_tpm_pid, dst_tpm_pid;
@ -87,7 +89,8 @@ void tpm_test_swtpm_migration_test(const char *src_tpm_path,
}
tpm_util_migration_start_qemu(&src_qemu, &dst_qemu,
src_tpm_addr, dst_tpm_addr, uri);
src_tpm_addr, dst_tpm_addr, uri,
ifmodel);
tpm_util_startup(src_qemu, tx);
tpm_util_pcrextend(src_qemu, tx);