On Tue, Jul 19, 2022 at 10:53:33PM +0100, Peter Maydell wrote:
> On Tue, 19 Jul 2022 at 18:16, Dr. David Alan Gilbert (git)
> <dgilb...@redhat.com> wrote:
> >
> > From: "Dr. David Alan Gilbert" <dgilb...@redhat.com>
> >
> > The following changes since commit da7da9d5e608200ecc0749ff37be246e9cd3314f:
> >
> > Merge tag 'pull-request-2022-07-19' of https://gitlab.com/thuth/qemu into
> > staging (2022-07-19 13:05:06 +0100)
> >
> > are available in the Git repository at:
> >
> > https://gitlab.com/dagrh/qemu.git tags/pull-migration-20220719c
> >
> > for you to fetch changes up to ec0345c1000b3a57b557da4c2e3f2114dd23903a:
> >
> > migration: Avoid false-positive on non-supported scenarios for
> > zero-copy-send (2022-07-19 17:33:22 +0100)
> >
> > ----------------------------------------------------------------
> > Migration pull 2022-07-19
> >
> > Hyman's dirty page rate limit set
> > Ilya's fix for zlib vs migration
> > Peter's postcopy-preempt
> > Cleanup from Dan
> > zero-copy tidy ups from Leo
> > multifd doc fix from Juan
> >
> > Signed-off-by: Dr. David Alan Gilbert <dgilb...@redhat.com>
> >
> > ----------------------------------------------------------------
>
> Fails to build on some configs, eg:
> https://gitlab.com/qemu-project/qemu/-/jobs/2743059797
> https://gitlab.com/qemu-project/qemu/-/jobs/2743059743
>
> ../tests/qtest/migration-test.c: In function 'test_postcopy_preempt_tls_psk':
> ../tests/qtest/migration-test.c:1168:23: error:
> 'test_migrate_tls_psk_start_match' undeclared (first use in this
> function)
> 1168 | .start_hook = test_migrate_tls_psk_start_match,
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ../tests/qtest/migration-test.c:1168:23: note: each undeclared
> identifier is reported only once for each function it appears in
> ../tests/qtest/migration-test.c:1169:24: error:
> 'test_migrate_tls_psk_finish' undeclared (first use in this function)
> 1169 | .finish_hook = test_migrate_tls_psk_finish,
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> ../tests/qtest/migration-test.c: In function 'test_postcopy_recovery_tls_psk':
> ../tests/qtest/migration-test.c:1247:23: error:
> 'test_migrate_tls_psk_start_match' undeclared (first use in this
> function)
> 1247 | .start_hook = test_migrate_tls_psk_start_match,
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ../tests/qtest/migration-test.c:1248:24: error:
> 'test_migrate_tls_psk_finish' undeclared (first use in this function)
> 1248 | .finish_hook = test_migrate_tls_psk_finish,
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> ../tests/qtest/migration-test.c: In function 'test_postcopy_preempt_all':
> ../tests/qtest/migration-test.c:1268:23: error:
> 'test_migrate_tls_psk_start_match' undeclared (first use in this
> function)
> 1268 | .start_hook = test_migrate_tls_psk_start_match,
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ../tests/qtest/migration-test.c:1269:24: error:
> 'test_migrate_tls_psk_finish' undeclared (first use in this function)
> 1269 | .finish_hook = test_migrate_tls_psk_finish,
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> At top level:
> ../tests/qtest/migration-test.c:1264:13: error:
> 'test_postcopy_preempt_all' defined but not used
> [-Werror=unused-function]
> 1264 | static void test_postcopy_preempt_all(void)
> | ^~~~~~~~~~~~~~~~~~~~~~~~~
> ../tests/qtest/migration-test.c:1244:13: error:
> 'test_postcopy_recovery_tls_psk' defined but not used
> [-Werror=unused-function]
> 1244 | static void test_postcopy_recovery_tls_psk(void)
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ../tests/qtest/migration-test.c:1164:13: error:
> 'test_postcopy_preempt_tls_psk' defined but not used
> [-Werror=unused-function]
> 1164 | static void test_postcopy_preempt_tls_psk(void)
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Sorry my fault. We'll need to fix the 3 test patches one by one to use "#ifdef
CONFIG_GNUTLS" properly for those functions..
I've attached the three small fixups, Peter/Dave, let me know what's the
best way to redo this.
Thanks,
--
Peter Xu
>From 7d361c8d61a51ed0df9e1606c3a6f8c306028181 Mon Sep 17 00:00:00 2001
From: Peter Xu <pet...@redhat.com>
Date: Tue, 19 Jul 2022 18:16:40 -0400
Subject: [PATCH 1/3] fixup! tests: Add postcopy tls migration test
Content-type: text/plain
Signed-off-by: Peter Xu <pet...@redhat.com>
---
tests/qtest/migration-test.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index 81780189a8..87dc87ba8b 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -1133,6 +1133,7 @@ static void test_postcopy(void)
test_postcopy_common(&args);
}
+#ifdef CONFIG_GNUTLS
static void test_postcopy_tls_psk(void)
{
MigrateCommon args = {
@@ -1142,6 +1143,7 @@ static void test_postcopy_tls_psk(void)
test_postcopy_common(&args);
}
+#endif
static void test_postcopy_preempt(void)
{
--
2.32.0
>From c76945ab7b9a38456f077267ccb51133ef087e35 Mon Sep 17 00:00:00 2001
From: Peter Xu <pet...@redhat.com>
Date: Tue, 19 Jul 2022 18:16:57 -0400
Subject: [PATCH 2/3] fixup! tests: Add postcopy preempt tests
Content-type: text/plain
Signed-off-by: Peter Xu <pet...@redhat.com>
---
tests/qtest/migration-test.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index 87dc87ba8b..490ee71b75 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -1154,6 +1154,7 @@ static void test_postcopy_preempt(void)
test_postcopy_common(&args);
}
+#ifdef CONFIG_GNUTLS
static void test_postcopy_preempt_tls_psk(void)
{
MigrateCommon args = {
@@ -1164,6 +1165,7 @@ static void test_postcopy_preempt_tls_psk(void)
test_postcopy_common(&args);
}
+#endif
static void test_postcopy_recovery_common(MigrateCommon *args)
{
@@ -1253,6 +1255,7 @@ static void test_postcopy_preempt_recovery(void)
test_postcopy_recovery_common(&args);
}
+#ifdef CONFIG_GNUTLS
/* This contains preempt+recovery+tls test altogether */
static void test_postcopy_preempt_all(void)
{
@@ -1264,6 +1267,7 @@ static void test_postcopy_preempt_all(void)
test_postcopy_recovery_common(&args);
}
+#endif
static void test_baddest(void)
{
--
2.32.0
>From 3f6e48d9cd915378284fe897ddab19112c097f1f Mon Sep 17 00:00:00 2001
From: Peter Xu <pet...@redhat.com>
Date: Tue, 19 Jul 2022 18:17:05 -0400
Subject: [PATCH 3/3] fixup! tests: Add postcopy tls recovery migration test
Content-type: text/plain
Signed-off-by: Peter Xu <pet...@redhat.com>
---
tests/qtest/migration-test.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index 490ee71b75..b0843d35d4 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -1236,6 +1236,7 @@ static void test_postcopy_recovery(void)
test_postcopy_recovery_common(&args);
}
+#ifdef CONFIG_GNUTLS
static void test_postcopy_recovery_tls_psk(void)
{
MigrateCommon args = {
@@ -1245,6 +1246,7 @@ static void test_postcopy_recovery_tls_psk(void)
test_postcopy_recovery_common(&args);
}
+#endif
static void test_postcopy_preempt_recovery(void)
{
--
2.32.0
