On Mon, 13 Feb 2023 at 20:33, Fabiano Rosas <[email protected]> wrote: > > The migration tests are currently broken for an aarch64 host because > the tests pass no 'machine' and 'cpu' options on the QEMU command > line. Most other architectures define a default value in QEMU for > these options, but arm does not. > > Add these options to the test class in case the test is being executed > in an aarch64 host. > > Signed-off-by: Fabiano Rosas <[email protected]> > Reviewed-by: Richard Henderson <[email protected]> > Acked-by: Philippe Mathieu-Daudé <[email protected]> > --- > tests/avocado/migration.py | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/tests/avocado/migration.py b/tests/avocado/migration.py > index 4b25680c50..ffd3db0f35 100644 > --- a/tests/avocado/migration.py > +++ b/tests/avocado/migration.py > @@ -11,6 +11,8 @@ > > > import tempfile > +import os > + > from avocado_qemu import QemuSystemTest > from avocado import skipUnless > > @@ -26,6 +28,14 @@ class Migration(QemuSystemTest): > > timeout = 10 > > + def setUp(self): > + super().setUp() > + > + arch = os.uname()[4] > + if arch == 'aarch64': > + self.machine = 'virt' > + self.cpu = 'max' > + > @staticmethod > def migration_finished(vm): > return vm.command('query-migrate')['status'] in ('completed', > 'failed') > --
This looks odd. Don't we run this test in our CI currently? I'm not sure that specialcasing aarch64 here is the right approach -- David, any opinions? thanks -- PMM
