[v4] tests/migration-test: Allow testing older machine types

[PATCH v4 09/12] tests/qtest/migration: Set q35 as the default machine for x86_86

Posted by Fabiano Rosas 2 years, 3 months ago

Change the x86_64 to use the q35 machines in tests from now on. Keep
testing the pc macine on 32bit.

Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
this could affect bisecting, so I put it in separate patch to be
easier to revert
---
 tests/qtest/migration-test.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index b45a389de8..b718634b1c 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -756,7 +756,12 @@ static int test_migrate_start(QTestState **from, QTestState **to,
     got_dst_resume = false;
     if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
         memory_size = "150M";
-        machine_alias = "pc";
+
+        if (g_str_equal(arch, "i386")) {
+            machine_alias = "pc";
+        } else {
+            machine_alias = "q35";
+        }
         arch_opts = g_strdup_printf(
             "-drive if=none,id=d0,file=%s,format=raw "
             "-device ide-hd,drive=d0,secs=1,cyls=1,heads=1", bootpath);
-- 
2.35.3

Re: [PATCH v4 09/12] tests/qtest/migration: Set q35 as the default machine for x86_86

Posted by Juan Quintela 2 years, 3 months ago

Fabiano Rosas <farosas@suse.de> wrote:
> Change the x86_64 to use the q35 machines in tests from now on. Keep
> testing the pc macine on 32bit.
>
> Signed-off-by: Fabiano Rosas <farosas@suse.de>

Reviewed-by: Juan Quintela <quintela@redhat.com>

Re: [PATCH v4 09/12] tests/qtest/migration: Set q35 as the default machine for x86_86

Posted by Thomas Huth 2 years, 3 months ago

On 18/10/2023 21.27, Fabiano Rosas wrote:
> Change the x86_64 to use the q35 machines in tests from now on. Keep
> testing the pc macine on 32bit.
> 
> Signed-off-by: Fabiano Rosas <farosas@suse.de>
> ---
> this could affect bisecting, so I put it in separate patch to be
> easier to revert
> ---
>   tests/qtest/migration-test.c | 7 ++++++-
>   1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
> index b45a389de8..b718634b1c 100644
> --- a/tests/qtest/migration-test.c
> +++ b/tests/qtest/migration-test.c
> @@ -756,7 +756,12 @@ static int test_migrate_start(QTestState **from, QTestState **to,
>       got_dst_resume = false;
>       if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
>           memory_size = "150M";
> -        machine_alias = "pc";
> +
> +        if (g_str_equal(arch, "i386")) {
> +            machine_alias = "pc";
> +        } else {
> +            machine_alias = "q35";
> +        }
>           arch_opts = g_strdup_printf(
>               "-drive if=none,id=d0,file=%s,format=raw "
>               "-device ide-hd,drive=d0,secs=1,cyls=1,heads=1", bootpath);

Reviewed-by: Thomas Huth <thuth@redhat.com>