| Message ID | 20240715221245.12435-6-yichen.wang@bytedance.com |
|---|---|
| State | New |
| Headers | show |
| Series | Implement QATzip compression method | expand |
> -----Original Message----- > From: Yichen Wang <yichen.wang@bytedance.com> > Sent: Tuesday, July 16, 2024 6:13 AM > To: Peter Xu <peterx@redhat.com>; Fabiano Rosas <farosas@suse.de>; Paolo > Bonzini <pbonzini@redhat.com>; Daniel P. Berrangé <berrange@redhat.com>; > Eduardo Habkost <eduardo@habkost.net>; Marc-André Lureau > <marcandre.lureau@redhat.com>; Thomas Huth <thuth@redhat.com>; Philippe > Mathieu-Daudé <philmd@linaro.org>; Eric Blake <eblake@redhat.com>; Markus > Armbruster <armbru@redhat.com>; Laurent Vivier <lvivier@redhat.com>; qemu- > devel@nongnu.org > Cc: Hao Xiang <hao.xiang@linux.dev>; Liu, Yuan1 <yuan1.liu@intel.com>; > Zou, Nanhai <nanhai.zou@intel.com>; Ho-Ren (Jack) Chuang > <horenchuang@bytedance.com>; Wang, Yichen <yichen.wang@bytedance.com>; > Bryan Zhang <bryan.zhang@bytedance.com> > Subject: [PATCH v6 5/5] tests/migration: Add integration test for 'qatzip' > compression method > > From: Bryan Zhang <bryan.zhang@bytedance.com> > > Adds an integration test for 'qatzip'. > > Signed-off-by: Bryan Zhang <bryan.zhang@bytedance.com> > Signed-off-by: Hao Xiang <hao.xiang@linux.dev> > Signed-off-by: Yichen Wang <yichen.wang@bytedance.com> > Reviewed-by: Fabiano Rosas <farosas@suse.de> > --- > tests/qtest/migration-test.c | 31 +++++++++++++++++++++++++++++++ > 1 file changed, 31 insertions(+) > > diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c > index 70b606b888..98f60d58a7 100644 > --- a/tests/qtest/migration-test.c > +++ b/tests/qtest/migration-test.c > @@ -32,6 +32,10 @@ > # endif /* CONFIG_TASN1 */ > #endif /* CONFIG_GNUTLS */ > > +#ifdef CONFIG_QATZIP > +#include <qatzip.h> > +#endif /* CONFIG_QATZIP */ It looks like <qatzip.h> file is not needed, maybe it can be removed. > /* For dirty ring test; so far only x86_64 is supported */ > #if defined(__linux__) && defined(HOST_X86_64) > #include "linux/kvm.h" > @@ -2992,6 +2996,18 @@ > test_migrate_precopy_tcp_multifd_zstd_start(QTestState *from, > } > #endif /* CONFIG_ZSTD */ > > +#ifdef CONFIG_QATZIP > +static void * > +test_migrate_precopy_tcp_multifd_qatzip_start(QTestState *from, > + QTestState *to) > +{ > + migrate_set_parameter_int(from, "multifd-qatzip-level", 2); > + migrate_set_parameter_int(to, "multifd-qatzip-level", 2); > + > + return test_migrate_precopy_tcp_multifd_start_common(from, to, > "qatzip"); > +} > +#endif > + > #ifdef CONFIG_QPL > static void * > test_migrate_precopy_tcp_multifd_qpl_start(QTestState *from, > @@ -3089,6 +3105,17 @@ static void test_multifd_tcp_zstd(void) > } > #endif > > +#ifdef CONFIG_QATZIP > +static void test_multifd_tcp_qatzip(void) > +{ > + MigrateCommon args = { > + .listen_uri = "defer", > + .start_hook = test_migrate_precopy_tcp_multifd_qatzip_start, > + }; > + test_precopy_common(&args); > +} > +#endif > + > #ifdef CONFIG_QPL > static void test_multifd_tcp_qpl(void) > { > @@ -3992,6 +4019,10 @@ int main(int argc, char **argv) > migration_test_add("/migration/multifd/tcp/plain/zstd", > test_multifd_tcp_zstd); > #endif > +#ifdef CONFIG_QATZIP > + migration_test_add("/migration/multifd/tcp/plain/qatzip", > + test_multifd_tcp_qatzip); > +#endif > #ifdef CONFIG_QPL > migration_test_add("/migration/multifd/tcp/plain/qpl", > test_multifd_tcp_qpl); > -- > Yichen Wang
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 70b606b888..98f60d58a7 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -32,6 +32,10 @@ # endif /* CONFIG_TASN1 */ #endif /* CONFIG_GNUTLS */ +#ifdef CONFIG_QATZIP +#include <qatzip.h> +#endif /* CONFIG_QATZIP */ + /* For dirty ring test; so far only x86_64 is supported */ #if defined(__linux__) && defined(HOST_X86_64) #include "linux/kvm.h" @@ -2992,6 +2996,18 @@ test_migrate_precopy_tcp_multifd_zstd_start(QTestState *from, } #endif /* CONFIG_ZSTD */ +#ifdef CONFIG_QATZIP +static void * +test_migrate_precopy_tcp_multifd_qatzip_start(QTestState *from, + QTestState *to) +{ + migrate_set_parameter_int(from, "multifd-qatzip-level", 2); + migrate_set_parameter_int(to, "multifd-qatzip-level", 2); + + return test_migrate_precopy_tcp_multifd_start_common(from, to, "qatzip"); +} +#endif + #ifdef CONFIG_QPL static void * test_migrate_precopy_tcp_multifd_qpl_start(QTestState *from, @@ -3089,6 +3105,17 @@ static void test_multifd_tcp_zstd(void) } #endif +#ifdef CONFIG_QATZIP +static void test_multifd_tcp_qatzip(void) +{ + MigrateCommon args = { + .listen_uri = "defer", + .start_hook = test_migrate_precopy_tcp_multifd_qatzip_start, + }; + test_precopy_common(&args); +} +#endif + #ifdef CONFIG_QPL static void test_multifd_tcp_qpl(void) { @@ -3992,6 +4019,10 @@ int main(int argc, char **argv) migration_test_add("/migration/multifd/tcp/plain/zstd", test_multifd_tcp_zstd); #endif +#ifdef CONFIG_QATZIP + migration_test_add("/migration/multifd/tcp/plain/qatzip", + test_multifd_tcp_qatzip); +#endif #ifdef CONFIG_QPL migration_test_add("/migration/multifd/tcp/plain/qpl", test_multifd_tcp_qpl);