diff mbox series

[PULL,02/12] tests/qtest/migration-test: enable on s390x with TCG

Message ID 20240702103310.347201-3-thuth@redhat.com (mailing list archive)
State New, archived
Headers show
Series [PULL,01/12] hw/intc/s390_flic: Fix interrupt controller migration on s390x with TCG | expand

Commit Message

Thomas Huth July 2, 2024, 10:33 a.m. UTC
From: Nicholas Piggin <npiggin@gmail.com>

s390x with TCG is more stable now. Enable it.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Message-Id: <20240525131241.378473-3-npiggin@gmail.com>
Reviewed-by: Prasad Pandit <pjp@fedoraproject.org>
[thuth: Added "with TCG" to the commit message]
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/qtest/migration-test.c | 12 ------------
 1 file changed, 12 deletions(-)

Comments

Nicholas Piggin July 4, 2024, 11:20 a.m. UTC | #1
On Tue Jul 2, 2024 at 8:33 PM AEST, Thomas Huth wrote:
> From: Nicholas Piggin <npiggin@gmail.com>
>
> s390x with TCG is more stable now. Enable it.

Ah, you did a more complete version of my flic fix that migrates all the
state. I didn't see that go by but yeah I suspect that was probably the
correct thing to do. Thanks for that.

Should the s390x flic migrate fix could be got to stable, perhaps?

There's some kvm-unit-tests s390x migration tests that can be enabled
after the fix too don't forget.

Thanks,
Nick

>
> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
> Message-Id: <20240525131241.378473-3-npiggin@gmail.com>
> Reviewed-by: Prasad Pandit <pjp@fedoraproject.org>
> [thuth: Added "with TCG" to the commit message]
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  tests/qtest/migration-test.c | 12 ------------
>  1 file changed, 12 deletions(-)
>
> diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
> index 571fc1334c..70b606b888 100644
> --- a/tests/qtest/migration-test.c
> +++ b/tests/qtest/migration-test.c
> @@ -3823,16 +3823,6 @@ int main(int argc, char **argv)
>                         test_vmstate_checker_script);
>  #endif
>  
> -    /*
> -     * On s390x with TCG, migration is observed to hang due to the 'pending'
> -     * state of the flic interrupt controller not being migrated or
> -     * reconstructed post-migration. Disable it until the problem is resolved.
> -     */
> -    if (g_str_equal(arch, "s390x") && !has_kvm) {
> -        g_test_message("Skipping tests: s390x host with KVM is required");
> -        goto test_add_done;
> -    }
> -
>      if (is_x86) {
>          migration_test_add("/migration/precopy/unix/suspend/live",
>                             test_precopy_unix_suspend_live);
> @@ -4036,8 +4026,6 @@ int main(int argc, char **argv)
>                             test_vcpu_dirty_limit);
>      }
>  
> -test_add_done:
> -
>      ret = g_test_run();
>  
>      g_assert_cmpint(ret, ==, 0);
Thomas Huth July 4, 2024, 11:48 a.m. UTC | #2
On 04/07/2024 13.20, Nicholas Piggin wrote:
> On Tue Jul 2, 2024 at 8:33 PM AEST, Thomas Huth wrote:
>> From: Nicholas Piggin <npiggin@gmail.com>
>>
>> s390x with TCG is more stable now. Enable it.
> 
> Ah, you did a more complete version of my flic fix that migrates all the
> state. I didn't see that go by but yeah I suspect that was probably the
> correct thing to do. Thanks for that.

Drat, seems like I forgot to CC: you on that patch, sorry for that, that was 
by accident and certainly not on purpose :-(

> Should the s390x flic migrate fix could be got to stable, perhaps?

We need a new machine type for enabling the fix, so it does not make much 
sense on stable, unfortunately.

> There's some kvm-unit-tests s390x migration tests that can be enabled
> after the fix too don't forget.

Right, I'll try to remember to enable it once QEMU 9.1 has been released.

  Thomas
Nicholas Piggin July 5, 2024, 12:11 a.m. UTC | #3
On Thu Jul 4, 2024 at 9:48 PM AEST, Thomas Huth wrote:
> On 04/07/2024 13.20, Nicholas Piggin wrote:
> > On Tue Jul 2, 2024 at 8:33 PM AEST, Thomas Huth wrote:
> >> From: Nicholas Piggin <npiggin@gmail.com>
> >>
> >> s390x with TCG is more stable now. Enable it.
> > 
> > Ah, you did a more complete version of my flic fix that migrates all the
> > state. I didn't see that go by but yeah I suspect that was probably the
> > correct thing to do. Thanks for that.
>
> Drat, seems like I forgot to CC: you on that patch, sorry for that, that was 
> by accident and certainly not on purpose :-(

Ah that's fine I was leaving it for s390x people as I said, and
you're s390x people :)

> > Should the s390x flic migrate fix could be got to stable, perhaps?
>
> We need a new machine type for enabling the fix, so it does not make much 
> sense on stable, unfortunately.

Okay.

> > There's some kvm-unit-tests s390x migration tests that can be enabled
> > after the fix too don't forget.
>
> Right, I'll try to remember to enable it once QEMU 9.1 has been released.

Great.

Thanks,
Nick
diff mbox series

Patch

diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index 571fc1334c..70b606b888 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -3823,16 +3823,6 @@  int main(int argc, char **argv)
                        test_vmstate_checker_script);
 #endif
 
-    /*
-     * On s390x with TCG, migration is observed to hang due to the 'pending'
-     * state of the flic interrupt controller not being migrated or
-     * reconstructed post-migration. Disable it until the problem is resolved.
-     */
-    if (g_str_equal(arch, "s390x") && !has_kvm) {
-        g_test_message("Skipping tests: s390x host with KVM is required");
-        goto test_add_done;
-    }
-
     if (is_x86) {
         migration_test_add("/migration/precopy/unix/suspend/live",
                            test_precopy_unix_suspend_live);
@@ -4036,8 +4026,6 @@  int main(int argc, char **argv)
                            test_vcpu_dirty_limit);
     }
 
-test_add_done:
-
     ret = g_test_run();
 
     g_assert_cmpint(ret, ==, 0);