999512f123
- vdpa: suspend function return 0 when the vdpa device is stopped - vdpa: don't suspend/resume device when vdpa device not started - vdpa: support vdpa device suspend/resume - vdpa: correct param passed in when unregister save - vdpa: set vring enable only if the vring address has already been set - shadow_dev: introduce shadow dev for virtio-net device - revert "tcg/loongarch64: Fix tcg_out_mov() Aborted" - migration: Set downtime_start even for postcopy - gdb-xml: fix duplicate register in arm-neon.xml - iotests: fix default machine type detection - migration: fix RAMBlock add NULL check - s390x: Fix spelling errors - ppc: spelling fixes - hw/scsi/vhost-scsi: don't double close vhostfd on error - virtio/vhost-vsock: don't double close vhostfd, remove redundant cleanup - hw/scsi/vhost-scsi: don't leak vqs on error - hw/i386/pc: Add missing property descriptions - pcie_aer: Don't trigger a LSI if none are defined - pci: Export the pci_intx() function - hw/qdev: Cosmetic around documentation - tests/unit: fix a -Wformat-truncation warning - tests/avocado: mark ReplayKernelNormal.test_mips64el_malta as flaky - i386/sev: Avoid SEV-ES crash due to missing MSR_EFER_LMA bit - ui/vnc-clipboard: fix inflate_buffer - hw/usb/hcd-xhci.c: spelling: tranfer Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit 68fee7dc06a6beb5f69d951e22a7f16091f269ff)
41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
From 1c60628eef43847595723a65ff9fd57f38cc70de Mon Sep 17 00:00:00 2001
|
|
From: jipengfei_yewu <jipengfei_yewu@cmss.chinamobile.com>
|
|
Date: Mon, 18 Dec 2023 09:57:38 +0000
|
|
Subject: [PATCH] iotests: fix default machine type detection
|
|
|
|
The machine type is being detected based on "-M help" output, and we're
|
|
searching for the line ending with " (default)". However, in downstream
|
|
one of the machine types s marked as deprecated might become the
|
|
default, in which case this logic breaks as the line would now end with
|
|
" (default) (deprecated)". To fix potential issues here, let's relax
|
|
that requirement and detect the mere presence of " (default)" line
|
|
instead.
|
|
|
|
cheery-pick from 3b7094fe8329c5c7bb0d685e1876aa30f59bece6
|
|
|
|
Signed-off-by: jipengfei_yewu <jipengfei_yewu@cmss.chinamobile.com>
|
|
Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
|
|
Message-ID: <20231122121538.32903-1-andrey.drobyshev@virtuozzo.com>
|
|
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
---
|
|
tests/qemu-iotests/testenv.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/tests/qemu-iotests/testenv.py b/tests/qemu-iotests/testenv.py
|
|
index 26ae6945cc..993e9c56be 100644
|
|
--- a/tests/qemu-iotests/testenv.py
|
|
+++ b/tests/qemu-iotests/testenv.py
|
|
@@ -40,7 +40,7 @@ def get_default_machine(qemu_prog: str) -> str:
|
|
|
|
machines = outp.split('\n')
|
|
try:
|
|
- default_machine = next(m for m in machines if m.endswith(' (default)'))
|
|
+ default_machine = next(m for m in machines if ' (default)' in m)
|
|
except StopIteration:
|
|
return ''
|
|
default_machine = default_machine.split(' ', 1)[0]
|
|
--
|
|
2.27.0
|
|
|