Commit ea71a336 authored by Stefan Berger's avatar Stefan Berger
Browse files

test: Pass TPM interface model to functions creating command line 



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

Signed-off-by: default avatarStefan Berger <stefanb@linux.vnet.ibm.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
parent 2b4ccb87

tests/tpm-crb-swtpm-test.c

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static void tpm_crb_swtpm_test(const void *data) 
{

    const TestState *ts = data;



    tpm_test_swtpm_test(ts->src_tpm_path, tpm_util_crb_transfer);

    tpm_test_swtpm_test(ts->src_tpm_path, tpm_util_crb_transfer, "tpm-crb");

}



static void tpm_crb_swtpm_migration_test(const void *data)
@@ -36,7 +36,7 @@ static void tpm_crb_swtpm_migration_test(const void *data) 
    const TestState *ts = data;



    tpm_test_swtpm_migration_test(ts->src_tpm_path, ts->dst_tpm_path, ts->uri,

                                  tpm_util_crb_transfer);

                                  tpm_util_crb_transfer, "tpm-crb");

}



int main(int argc, char **argv)

tests/tpm-tests.c

+8 −5
Original line number Diff line number Diff line
@@ -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);

tests/tpm-tests.h

+4 −2
Original line number Diff line number Diff line
@@ -15,10 +15,12 @@ 


#include "tpm-util.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);



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);



#endif /* TESTS_TPM_TESTS_H */

tests/tpm-util.c

+6 −5
Original line number Diff line number Diff line
@@ -248,25 +248,26 @@ void tpm_util_migration_start_qemu(QTestState **src_qemu, 
                                   QTestState **dst_qemu,

                                   SocketAddress *src_tpm_addr,

                                   SocketAddress *dst_tpm_addr,

                                   const char *miguri)

                                   const char *miguri,

                                   const char *ifmodel)

{

    char *src_qemu_args, *dst_qemu_args;



    src_qemu_args = g_strdup_printf(

        "-chardev socket,id=chr,path=%s "

        "-tpmdev emulator,id=dev,chardev=chr "

        "-device tpm-crb,tpmdev=dev ",

        src_tpm_addr->u.q_unix.path);

        "-device %s,tpmdev=dev ",

        src_tpm_addr->u.q_unix.path, ifmodel);



    *src_qemu = qtest_init(src_qemu_args);



    dst_qemu_args = g_strdup_printf(

        "-chardev socket,id=chr,path=%s "

        "-tpmdev emulator,id=dev,chardev=chr "

        "-device tpm-crb,tpmdev=dev "

        "-device %s,tpmdev=dev "

        "-incoming %s",

        dst_tpm_addr->u.q_unix.path,

        miguri);

        ifmodel, miguri);



    *dst_qemu = qtest_init(dst_qemu_args);

tests/tpm-util.h

+2 −1
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ void tpm_util_migration_start_qemu(QTestState **src_qemu, 
                                   QTestState **dst_qemu,

                                   SocketAddress *src_tpm_addr,

                                   SocketAddress *dst_tpm_addr,

                                   const char *miguri);

                                   const char *miguri,

                                   const char *ifmodel);



void tpm_util_wait_for_migration_complete(QTestState *who);