Skip to contentSkip to conversation

tests/qemu-iotests/235: Allow fallback to tcg and remove it from quick group

PATCH In review Thomas Huth 2 participants 2 messages Mar 1, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests/qemu-iotests/235: Allow fallback to tcg and remove it from quick group

iotest 235 currently only works with KVM - this is bad for systems where it is not available, e.g. CI pipelines. The test also works when using "tcg" as accelerator, so we can simply add that to the list of accelerators, too. But still, there might be the case that someone compiled their QEMU with --disable-tcg and still try to run the iotests in a CI pipeline where KVM is not available - in that case it would be best to use the "qtest" accelerator for this test. However, that currently hangs and I did not succeed to get it working with "accel=qtest" yet. Thus, as long as this is not fixed, it's likely better to remove this test from the "quick" group so that it does not fail on CI pipelines.

---
 tests/qemu-iotests/235   | 2 +-
 tests/qemu-iotests/group | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
tests/qemu-iotests/235 +1 -1
index d6edd97..90ef785 100755
@@ -49,7 +49,7 @@ qemu_img_create('-f', iotests.imgfmt, '-o', 'preallocation=metadata', disk,
                 str(size))
 
 vm = QEMUMachine(iotests.qemu_prog)
-vm.add_args('-machine', 'accel=kvm')
+vm.add_args('-machine', 'accel=kvm:tcg')
 if iotests.qemu_default_machine == 's390-ccw-virtio':
         vm.add_args('-no-shutdown')
 vm.add_args('-drive', 'id=src,file=' + disk)
tests/qemu-iotests/group +1 -1
index b5ca63c..12ebeba 100644
@@ -234,7 +234,7 @@
 232 auto quick
 233 auto quick
 234 auto quick migration
-235 auto quick
+235 auto
 236 auto quick
 237 rw auto quick
 238 auto quick
Signature · 1 line
1.8.3.1
#1 lore raw
Quoted 8 lines · Thomas Huth

iotest 235 currently only works with KVM - this is bad for systems where it is not available, e.g. CI pipelines. The test also works when using "tcg" as accelerator, so we can simply add that to the list of accelerators, too. But still, there might be the case that someone compiled their QEMU with --disable-tcg and still try to run the iotests in a CI pipeline where KVM is not available - in that case it would be best to use the "qtest" accelerator for this test. However, that currently hangs and I did not succeed to get it working with "accel=qtest" yet.

hmm, interesting, I can reproduce it. I think we'd better fix it instead.. I'll try but not now.

Thus, as long

Quoted 14 lines

as this is not fixed, it's likely better to remove this test from the "quick" group so that it does not fail on CI pipelines.

---
  tests/qemu-iotests/235   | 2 +-
  tests/qemu-iotests/group | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
tests/qemu-iotests/235 +0 -0
index d6edd97..90ef785 100755

tests/qemu-iotests/235 qemu_img_create('-f', iotests.imgfmt, '-o', 'preallocation=metadata', disk, · line 52

Quoted 5 lines
tests/qemu-iotests/235 +1 -1
@@ -49,7 +49,7 @@ qemu_img_create('-f', iotests.imgfmt, '-o', 'preallocation=metadata', disk,
                  str(size))
 
  vm = QEMUMachine(iotests.qemu_prog)
-vm.add_args('-machine', 'accel=kvm')
+vm.add_args('-machine', 'accel=kvm:tcg')

I tested now with accel=tcg, and it doesn't reproduce original bug.. On, the other hand, if kvm is not available anyway, why not run test for tcg, may be it'll find some other bug.

Quoted 17 lines
tests/qemu-iotests/235 +0 -0
  if iotests.qemu_default_machine == 's390-ccw-virtio':
          vm.add_args('-no-shutdown')
  vm.add_args('-drive', 'id=src,file=' + disk)
tests/qemu-iotests/group +1 -1
index b5ca63c..12ebeba 100644
@@ -234,7 +234,7 @@
  232 auto quick
  233 auto quick
  234 auto quick migration
-235 auto quick
+235 auto
  236 auto quick
  237 rw auto quick
  238 auto quick
Signature · 2 lines
Best regards,
Vladimir