mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Make all qtest targets work with "--without-default-devices"

Browse Source 
* Replace assert(0) and assert(false) in qtests and s390x code
 * Enable the device aliases for or1k
 * Some other small test improvements
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmbpWwwRHHRodXRoQHJl
 ZGhhdC5jb20ACgkQLtnXdP5wLbUj2A//VQwwbbuQa4FO/fu8mX0/iL43IZPLkVvC
 XPesidMwEsaNlfnUGLwjr9/F9sU7NXSkEdBWshU69ER9D4FPvRlZ6xOc0GB2HHEm
 2zYBaQoMvB/g5/FMkp5/YqPc/FvYMxePTX0syJCUkdf9hbM3YJagUgSKaz/2ZJRu
 +wztsRMSGx9WBeabTWgbAtGlfEqtfSGdfFHbNtoEVmO/K3rvcAHJhPXZpSmdq4CV
 ymwYQ3Ul1Sdz/34TzshhkY9VvYU6n1zuB+kGrjPcQrOdBV/ukJuBiFkHfSZm/2ch
 zTqbdXvkds867vHMo9s3JeVKPa8ZytKn4ycXXgVS5AZtrnEnyHztlVHWbwbHSafF
 rVGXnE3FabzKL4sEKGzOjMegnwdWtpBNwMVKUZIgURqDXAVVR2m+lf2pW/Niz2WR
 m0LNIcg0NPvxPwuq1xLVHc3CLNSCszu4Ao5YRhKimf3hb+FvzHty3dxn+DDg4+Q4
 hHqQRcbWILhYJEwcAVkfaMTtCh/RESiNi0U7Teqvr+aqBsJP8kdCkE5rY7cqzrqn
 aDaompDZ8QG1QA1c3NaxtmNsvTvpm8gBySrqbMizo8UHQd85HDdXFkAZfI4HWKDi
 jhZAEyh1HLeXrgDT/D0WBWQdPLjDZewTvqgqT/A5XbdR1u4XYXcxwMCpIN1iKFoY
 8qu0hIcsILM=
 =DXEK
 -----END PGP SIGNATURE-----

Merge tag 'pull-request-2024-09-17' of https://gitlab.com/thuth/qemu into staging

* Make all qtest targets work with "--without-default-devices"
* Replace assert(0) and assert(false) in qtests and s390x code
* Enable the device aliases for or1k
* Some other small test improvements

# -----BEGIN PGP SIGNATURE-----
#
# iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmbpWwwRHHRodXRoQHJl
# ZGhhdC5jb20ACgkQLtnXdP5wLbUj2A//VQwwbbuQa4FO/fu8mX0/iL43IZPLkVvC
# XPesidMwEsaNlfnUGLwjr9/F9sU7NXSkEdBWshU69ER9D4FPvRlZ6xOc0GB2HHEm
# 2zYBaQoMvB/g5/FMkp5/YqPc/FvYMxePTX0syJCUkdf9hbM3YJagUgSKaz/2ZJRu
# +wztsRMSGx9WBeabTWgbAtGlfEqtfSGdfFHbNtoEVmO/K3rvcAHJhPXZpSmdq4CV
# ymwYQ3Ul1Sdz/34TzshhkY9VvYU6n1zuB+kGrjPcQrOdBV/ukJuBiFkHfSZm/2ch
# zTqbdXvkds867vHMo9s3JeVKPa8ZytKn4ycXXgVS5AZtrnEnyHztlVHWbwbHSafF
# rVGXnE3FabzKL4sEKGzOjMegnwdWtpBNwMVKUZIgURqDXAVVR2m+lf2pW/Niz2WR
# m0LNIcg0NPvxPwuq1xLVHc3CLNSCszu4Ao5YRhKimf3hb+FvzHty3dxn+DDg4+Q4
# hHqQRcbWILhYJEwcAVkfaMTtCh/RESiNi0U7Teqvr+aqBsJP8kdCkE5rY7cqzrqn
# aDaompDZ8QG1QA1c3NaxtmNsvTvpm8gBySrqbMizo8UHQd85HDdXFkAZfI4HWKDi
# jhZAEyh1HLeXrgDT/D0WBWQdPLjDZewTvqgqT/A5XbdR1u4XYXcxwMCpIN1iKFoY
# 8qu0hIcsILM=
# =DXEK
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue 17 Sep 2024 11:33:48 BST
# gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg:                issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg:                 aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* tag 'pull-request-2024-09-17' of https://gitlab.com/thuth/qemu:
  .gitlab-ci.d/crossbuilds.yml: Force 'make check' to -j2 for cross-i686-tci
  tests/functional: Move the mips64el fuloong2e test into the thorough category
  docs/fuzz: fix outdated mention to enable-sanitizers
  system: Enable the device aliases for or1k, too
  system: Sort QEMU_ARCH_VIRTIO_PCI definition
  tests/qtest: remove break after g_assert_not_reached()
  tests/qtest: replace assert(false) with g_assert_not_reached()
  include/hw/s390x: replace assert(false) with g_assert_not_reached()
  tests/unit: replace assert(0) with g_assert_not_reached()
  tests/qtest: replace assert(0) with g_assert_not_reached()
  gitlab: fix logic for changing docker tag on stable branches
  .gitlab-ci.d/buildtest: Build most targets in the build-without-defaults job
  tests/qtest: Disable numa-test if the default machine is not available
  tests/qtest/meson.build: Add more CONFIG switches checks for the x86 tests
  tests/qtest/hd-geo-test: Check for availability of "pc" machine before using it
  tests/qtest/boot-order-test: Make the machine name mandatory in this test
  tests/qtest/cdrom-test: Improve the machine detection in the cdrom test

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2024-09-17 14:02:02 +01:00
commit 9b47188186
16 changed files with 129 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.d/base.yml
View File

@ -128,7 +128,7 @@ variables:
when: manual when: manual
# Jobs can run if any jobs they depend on were successful # Jobs can run if any jobs they depend on were successful
- if: '$QEMU_JOB_SKIPPED && $CI_PROJECT_NAMESPACE == $QEMU_CI_UPSTREAM && $CI_COMMIT_BRANCH =~ /staging-[[:digit:]]+\.[[:digit:]]/' - if: '$CI_PROJECT_NAMESPACE == $QEMU_CI_UPSTREAM && $CI_COMMIT_BRANCH =~ /staging-[[:digit:]]+\.[[:digit:]]/'
when: on_success when: on_success
variables: variables:
QEMU_CI_CONTAINER_TAG: $CI_COMMIT_REF_SLUG QEMU_CI_CONTAINER_TAG: $CI_COMMIT_REF_SLUG

9
.gitlab-ci.d/buildtest.yml
View File

@ -659,9 +659,6 @@ build-tci:
- make check-tcg - make check-tcg
# Check our reduced build configurations # Check our reduced build configurations
# requires libfdt: aarch64, arm, loongarch64, microblaze, microblazeel,
# or1k, ppc64, riscv32, riscv64, rx
# fails qtest without boards: i386, x86_64
build-without-defaults: build-without-defaults:
extends: .native_build_job_template extends: .native_build_job_template
needs: needs:
@ -675,11 +672,7 @@ build-without-defaults:
--disable-pie --disable-pie
--disable-qom-cast-debug --disable-qom-cast-debug
--disable-strip --disable-strip
TARGETS: alpha-softmmu avr-softmmu hppa-softmmu m68k-softmmu --target-list-exclude=aarch64-softmmu,microblaze-softmmu,mips64-softmmu,mipsel-softmmu,ppc64-softmmu,sh4el-softmmu,xtensa-softmmu,x86_64-softmmu
mips-softmmu mips64-softmmu mipsel-softmmu mips64el-softmmu
ppc-softmmu s390x-softmmu sh4-softmmu sh4eb-softmmu sparc-softmmu
sparc64-softmmu tricore-softmmu xtensa-softmmu xtensaeb-softmmu
hexagon-linux-user i386-linux-user s390x-linux-user
MAKE_CHECK_ARGS: check MAKE_CHECK_ARGS: check
build-libvhost-user: build-libvhost-user:

5
docs/devel/testing/fuzzing.rst
View File

@ -21,8 +21,9 @@ Building the fuzzers
To build the fuzzers, install a recent version of clang: To build the fuzzers, install a recent version of clang:
Configure with (substitute the clang binaries with the version you installed). Configure with (substitute the clang binaries with the version you installed).
Here, enable-sanitizers, is optional but it allows us to reliably detect bugs Here, enable-asan and enable-ubsan are optional but they allow us to reliably
such as out-of-bounds accesses, use-after-frees, double-frees etc.:: detect bugs such as out-of-bounds accesses, uses-after-free, double-frees
etc.::
CC=clang-8 CXX=clang++-8 /path/to/configure \ CC=clang-8 CXX=clang++-8 /path/to/configure \
--enable-fuzzing --enable-asan --enable-ubsan --enable-fuzzing --enable-asan --enable-ubsan

2
include/hw/s390x/cpu-topology.h
View File

@ -57,7 +57,7 @@ static inline void s390_topology_setup_cpu(MachineState *ms,
static inline void s390_topology_reset(void) static inline void s390_topology_reset(void)
{ {
/* Unreachable, CPU topology not implemented for TCG */ /* Unreachable, CPU topology not implemented for TCG */
assert(false); g_assert_not_reached();
} }
#endif #endif

18
system/qdev-monitor.c
View File

@ -55,12 +55,18 @@ typedef struct QDevAlias
} QDevAlias; } QDevAlias;
/* default virtio transport per architecture */ /* default virtio transport per architecture */
#define QEMU_ARCH_VIRTIO_PCI (QEMU_ARCH_ALPHA | QEMU_ARCH_ARM | \ #define QEMU_ARCH_VIRTIO_PCI (QEMU_ARCH_ALPHA | \
QEMU_ARCH_HPPA | QEMU_ARCH_I386 | \ QEMU_ARCH_ARM | \
QEMU_ARCH_MIPS | QEMU_ARCH_PPC | \ QEMU_ARCH_HPPA | \
QEMU_ARCH_RISCV | QEMU_ARCH_SH4 | \ QEMU_ARCH_I386 | \
QEMU_ARCH_SPARC | QEMU_ARCH_XTENSA | \ QEMU_ARCH_LOONGARCH | \
QEMU_ARCH_LOONGARCH) QEMU_ARCH_MIPS | \
QEMU_ARCH_OPENRISC | \
QEMU_ARCH_PPC | \
QEMU_ARCH_RISCV | \
QEMU_ARCH_SH4 | \
QEMU_ARCH_SPARC | \
QEMU_ARCH_XTENSA)
#define QEMU_ARCH_VIRTIO_CCW (QEMU_ARCH_S390X) #define QEMU_ARCH_VIRTIO_CCW (QEMU_ARCH_S390X)
#define QEMU_ARCH_VIRTIO_MMIO (QEMU_ARCH_M68K) #define QEMU_ARCH_VIRTIO_MMIO (QEMU_ARCH_M68K)

5
tests/functional/meson.build
View File

@ -86,11 +86,8 @@ tests_mipsel_system_thorough = [
'mipsel_malta', 'mipsel_malta',
] ]
tests_mips64el_system_quick = [
'mips64el_fuloong2e',
]
tests_mips64el_system_thorough = [ tests_mips64el_system_thorough = [
'mips64el_fuloong2e',
'mips64el_loongson3v', 'mips64el_loongson3v',
'mips64el_malta', 'mips64el_malta',
] ]

4
tests/qtest/boot-order-test.c
View File

@ -31,7 +31,7 @@ static void test_a_boot_order(const char *machine,
uint64_t actual; uint64_t actual;
QTestState *qts; QTestState *qts;
if (machine && !qtest_has_machine(machine)) { if (!qtest_has_machine(machine)) {
g_test_skip("Machine is not available"); g_test_skip("Machine is not available");
return; return;
} }
@ -107,7 +107,7 @@ static const boot_order_test test_cases_pc[] = {
static void test_pc_boot_order(void) static void test_pc_boot_order(void)
{ {
test_boot_orders(NULL, read_boot_order_pc, test_cases_pc); test_boot_orders("pc", read_boot_order_pc, test_cases_pc);
} }
static uint64_t read_boot_order_pmac(QTestState *qts) static uint64_t read_boot_order_pmac(QTestState *qts)

23
tests/qtest/cdrom-test.c
View File

@ -135,6 +135,7 @@ static void add_x86_tests(void)
return; return;
} }
if (qtest_has_machine("pc")) {
qtest_add_data_func("cdrom/boot/default", "-cdrom ", test_cdboot); qtest_add_data_func("cdrom/boot/default", "-cdrom ", test_cdboot);
if (qtest_has_device("virtio-scsi-ccw")) { if (qtest_has_device("virtio-scsi-ccw")) {
qtest_add_data_func("cdrom/boot/virtio-scsi", qtest_add_data_func("cdrom/boot/virtio-scsi",
@ -142,14 +143,7 @@ static void add_x86_tests(void)
"-blockdev file,node-name=cdr,filename=", "-blockdev file,node-name=cdr,filename=",
test_cdboot); test_cdboot);
} }
/*
* Unstable CI test under load
* See https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg05509.html
*/
if (g_test_slow() && qtest_has_machine("isapc")) {
qtest_add_data_func("cdrom/boot/isapc", "-M isapc "
"-drive if=ide,media=cdrom,file=", test_cdboot);
}
if (qtest_has_device("am53c974")) { if (qtest_has_device("am53c974")) {
qtest_add_data_func("cdrom/boot/am53c974", qtest_add_data_func("cdrom/boot/am53c974",
"-device am53c974 -device scsi-cd,drive=cd1 " "-device am53c974 -device scsi-cd,drive=cd1 "
@ -168,6 +162,18 @@ static void add_x86_tests(void)
"-blockdev file,node-name=cd1,filename=", "-blockdev file,node-name=cd1,filename=",
test_cdboot); test_cdboot);
} }
}
/*
* Unstable CI test under load
* See https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg05509.html
*/
if (g_test_slow() && qtest_has_machine("isapc")) {
qtest_add_data_func("cdrom/boot/isapc", "-M isapc "
"-drive if=ide,media=cdrom,file=", test_cdboot);
}
if (qtest_has_machine("q35")) {
if (qtest_has_device("megasas")) { if (qtest_has_device("megasas")) {
qtest_add_data_func("cdrom/boot/megasas", "-M q35 " qtest_add_data_func("cdrom/boot/megasas", "-M q35 "
"-device megasas -device scsi-cd,drive=cd1 " "-device megasas -device scsi-cd,drive=cd1 "
@ -181,6 +187,7 @@ static void add_x86_tests(void)
test_cdboot); test_cdboot);
} }
} }
}
static void add_s390x_tests(void) static void add_s390x_tests(void)
{ {

17
tests/qtest/hd-geo-test.c
View File

@ -1074,6 +1074,7 @@ int main(int argc, char **argv)
} }
} }
if (qtest_has_machine("pc")) {
qtest_add_func("hd-geo/ide/none", test_ide_none); qtest_add_func("hd-geo/ide/none", test_ide_none);
qtest_add_func("hd-geo/ide/drive/mbr/blank", test_ide_drive_mbr_blank); qtest_add_func("hd-geo/ide/drive/mbr/blank", test_ide_drive_mbr_blank);
qtest_add_func("hd-geo/ide/drive/mbr/lba", test_ide_drive_mbr_lba); qtest_add_func("hd-geo/ide/drive/mbr/lba", test_ide_drive_mbr_lba);
@ -1084,7 +1085,15 @@ int main(int argc, char **argv)
qtest_add_func("hd-geo/ide/device/mbr/chs", test_ide_device_mbr_chs); qtest_add_func("hd-geo/ide/device/mbr/chs", test_ide_device_mbr_chs);
qtest_add_func("hd-geo/ide/device/user/chs", test_ide_device_user_chs); qtest_add_func("hd-geo/ide/device/user/chs", test_ide_device_user_chs);
qtest_add_func("hd-geo/ide/device/user/chst", test_ide_device_user_chst); qtest_add_func("hd-geo/ide/device/user/chst", test_ide_device_user_chst);
if (have_qemu_img()) { }
if (!have_qemu_img()) {
g_test_message("QTEST_QEMU_IMG not set or qemu-img missing; "
"skipping hd-geo/override/* tests");
goto test_add_done;
}
if (qtest_has_machine("pc")) {
qtest_add_func("hd-geo/override/ide", test_override_ide); qtest_add_func("hd-geo/override/ide", test_override_ide);
if (qtest_has_device("lsi53c895a")) { if (qtest_has_device("lsi53c895a")) {
qtest_add_func("hd-geo/override/scsi", test_override_scsi); qtest_add_func("hd-geo/override/scsi", test_override_scsi);
@ -1104,6 +1113,7 @@ int main(int argc, char **argv)
qtest_add_func("hd-geo/override/virtio_blk", qtest_add_func("hd-geo/override/virtio_blk",
test_override_virtio_blk); test_override_virtio_blk);
} }
}
if (qtest_has_machine("q35")) { if (qtest_has_machine("q35")) {
qtest_add_func("hd-geo/override/sata", test_override_sata); qtest_add_func("hd-geo/override/sata", test_override_sata);
@ -1123,11 +1133,6 @@ int main(int argc, char **argv)
qtest_add_func("hd-geo/override/virtio_blk_q35", qtest_add_func("hd-geo/override/virtio_blk_q35",
test_override_virtio_blk_q35); test_override_virtio_blk_q35);
} }
}
} else {
g_test_message("QTEST_QEMU_IMG not set or qemu-img missing; "
"skipping hd-geo/override/* tests");
} }
test_add_done: test_add_done:

2
tests/qtest/ipmi-bt-test.c
View File

@ -251,7 +251,7 @@ static void emu_msg_handler(void)
msg[msg_len++] = 0xa0; msg[msg_len++] = 0xa0;
write_emu_msg(msg, msg_len); write_emu_msg(msg, msg_len);
} else { } else {
g_assert(0); g_assert_not_reached();
} }
} }

4
tests/qtest/ipmi-kcs-test.c
View File

@ -145,7 +145,7 @@ static void kcs_cmd(uint8_t *cmd, unsigned int cmd_len,
break; break;
default: default:
g_assert(0); g_assert_not_reached();
} }
*rsp_len = j; *rsp_len = j;
} }
@ -184,7 +184,7 @@ static void kcs_abort(uint8_t *cmd, unsigned int cmd_len,
break; break;
default: default:
g_assert(0); g_assert_not_reached();
} }
/* Start the abort here */ /* Start the abort here */

31
tests/qtest/meson.build
View File

@ -50,7 +50,15 @@ qtests_filter = \
qtests_i386 = \ qtests_i386 = \
(slirp.found() ? ['pxe-test'] : []) + \ (slirp.found() ? ['pxe-test'] : []) + \
qtests_filter + \ qtests_filter + \
(have_tools ? ['ahci-test'] : []) + \ (config_all_devices.has_key('CONFIG_ACPI_VMGENID') ? ['vmgenid-test'] : []) + \
(config_all_devices.has_key('CONFIG_AHCI_ICH9') and have_tools ? ['ahci-test'] : []) + \
(config_all_devices.has_key('CONFIG_AHCI_ICH9') ? ['tco-test'] : []) + \
(config_all_devices.has_key('CONFIG_FDC_ISA') ? ['fdc-test'] : []) + \
(config_all_devices.has_key('CONFIG_I440FX') ? ['fw_cfg-test'] : []) + \
(config_all_devices.has_key('CONFIG_I440FX') ? ['i440fx-test'] : []) + \
(config_all_devices.has_key('CONFIG_I440FX') ? ['ide-test'] : []) + \
(config_all_devices.has_key('CONFIG_I440FX') ? ['numa-test'] : []) + \
(config_all_devices.has_key('CONFIG_I440FX') ? ['test-x86-cpuid-compat'] : []) + \
(config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \ (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \
(config_all_devices.has_key('CONFIG_SGA') ? ['boot-serial-test'] : []) + \ (config_all_devices.has_key('CONFIG_SGA') ? ['boot-serial-test'] : []) + \
(config_all_devices.has_key('CONFIG_ISA_IPMI_KCS') ? ['ipmi-kcs-test'] : []) + \ (config_all_devices.has_key('CONFIG_ISA_IPMI_KCS') ? ['ipmi-kcs-test'] : []) + \
@ -64,6 +72,7 @@ qtests_i386 = \
(config_all_devices.has_key('CONFIG_I82801B11') ? ['i82801b11-test'] : []) + \ (config_all_devices.has_key('CONFIG_I82801B11') ? ['i82801b11-test'] : []) + \
(config_all_devices.has_key('CONFIG_IOH3420') ? ['ioh3420-test'] : []) + \ (config_all_devices.has_key('CONFIG_IOH3420') ? ['ioh3420-test'] : []) + \
(config_all_devices.has_key('CONFIG_LPC_ICH9') ? ['lpc-ich9-test'] : []) + \ (config_all_devices.has_key('CONFIG_LPC_ICH9') ? ['lpc-ich9-test'] : []) + \
(config_all_devices.has_key('CONFIG_MC146818RTC') ? ['rtc-test'] : []) + \
(config_all_devices.has_key('CONFIG_USB_UHCI') ? ['usb-hcd-uhci-test'] : []) + \ (config_all_devices.has_key('CONFIG_USB_UHCI') ? ['usb-hcd-uhci-test'] : []) + \
(config_all_devices.has_key('CONFIG_USB_UHCI') and \ (config_all_devices.has_key('CONFIG_USB_UHCI') and \
config_all_devices.has_key('CONFIG_USB_EHCI') ? ['usb-hcd-ehci-test'] : []) + \ config_all_devices.has_key('CONFIG_USB_EHCI') ? ['usb-hcd-ehci-test'] : []) + \
@ -77,6 +86,7 @@ qtests_i386 = \
(config_all_devices.has_key('CONFIG_MEGASAS_SCSI_PCI') ? ['fuzz-megasas-test'] : []) + \ (config_all_devices.has_key('CONFIG_MEGASAS_SCSI_PCI') ? ['fuzz-megasas-test'] : []) + \
(config_all_devices.has_key('CONFIG_LSI_SCSI_PCI') ? ['fuzz-lsi53c895a-test'] : []) + \ (config_all_devices.has_key('CONFIG_LSI_SCSI_PCI') ? ['fuzz-lsi53c895a-test'] : []) + \
(config_all_devices.has_key('CONFIG_VIRTIO_SCSI') ? ['fuzz-virtio-scsi-test'] : []) + \ (config_all_devices.has_key('CONFIG_VIRTIO_SCSI') ? ['fuzz-virtio-scsi-test'] : []) + \
(config_all_devices.has_key('CONFIG_Q35') ? ['q35-test'] : []) + \
(config_all_devices.has_key('CONFIG_SB16') ? ['fuzz-sb16-test'] : []) + \ (config_all_devices.has_key('CONFIG_SB16') ? ['fuzz-sb16-test'] : []) + \
(config_all_devices.has_key('CONFIG_SDHCI_PCI') ? ['fuzz-sdcard-test'] : []) + \ (config_all_devices.has_key('CONFIG_SDHCI_PCI') ? ['fuzz-sdcard-test'] : []) + \
(config_all_devices.has_key('CONFIG_ESP_PCI') ? ['am53c974-test'] : []) + \ (config_all_devices.has_key('CONFIG_ESP_PCI') ? ['am53c974-test'] : []) + \
@ -92,25 +102,16 @@ qtests_i386 = \
config_all_devices.has_key('CONFIG_PARALLEL') ? ['bios-tables-test'] : []) + \ config_all_devices.has_key('CONFIG_PARALLEL') ? ['bios-tables-test'] : []) + \
qtests_pci + \ qtests_pci + \
qtests_cxl + \ qtests_cxl + \
['fdc-test', [
'ide-test',
'hd-geo-test', 'hd-geo-test',
'boot-order-test', 'boot-order-test',
'rtc-test',
'i440fx-test',
'fw_cfg-test',
'device-plug-test', 'device-plug-test',
'drive_del-test', 'drive_del-test',
'tco-test',
'cpu-plug-test', 'cpu-plug-test',
'q35-test',
'vmgenid-test',
'migration-test', 'migration-test',
'test-x86-cpuid-compat',
'numa-test'
] ]
if dbus_display if dbus_display and config_all_devices.has_key('CONFIG_VGA')
qtests_i386 += ['dbus-display-test'] qtests_i386 += ['dbus-display-test']
endif endif
@ -141,7 +142,8 @@ qtests_hppa = ['boot-serial-test'] + \
(config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : []) (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : [])
qtests_loongarch64 = qtests_filter + \ qtests_loongarch64 = qtests_filter + \
['boot-serial-test', 'numa-test'] (config_all_devices.has_key('CONFIG_LOONGARCH_VIRT') ? ['numa-test'] : []) + \
['boot-serial-test']
qtests_m68k = ['boot-serial-test'] + \ qtests_m68k = ['boot-serial-test'] + \
qtests_filter qtests_filter
@ -174,11 +176,12 @@ qtests_ppc64 = \
(config_all_devices.has_key('CONFIG_POWERNV') ? ['pnv-xscom-test'] : []) + \ (config_all_devices.has_key('CONFIG_POWERNV') ? ['pnv-xscom-test'] : []) + \
(config_all_devices.has_key('CONFIG_POWERNV') ? ['pnv-spi-seeprom-test'] : []) + \ (config_all_devices.has_key('CONFIG_POWERNV') ? ['pnv-spi-seeprom-test'] : []) + \
(config_all_devices.has_key('CONFIG_POWERNV') ? ['pnv-host-i2c-test'] : []) + \ (config_all_devices.has_key('CONFIG_POWERNV') ? ['pnv-host-i2c-test'] : []) + \
(config_all_devices.has_key('CONFIG_PSERIES') ? ['numa-test'] : []) + \
(config_all_devices.has_key('CONFIG_PSERIES') ? ['rtas-test'] : []) + \ (config_all_devices.has_key('CONFIG_PSERIES') ? ['rtas-test'] : []) + \
(slirp.found() ? ['pxe-test'] : []) + \ (slirp.found() ? ['pxe-test'] : []) + \
(config_all_devices.has_key('CONFIG_USB_UHCI') ? ['usb-hcd-uhci-test'] : []) + \ (config_all_devices.has_key('CONFIG_USB_UHCI') ? ['usb-hcd-uhci-test'] : []) + \
(config_all_devices.has_key('CONFIG_USB_XHCI_NEC') ? ['usb-hcd-xhci-test'] : []) + \ (config_all_devices.has_key('CONFIG_USB_XHCI_NEC') ? ['usb-hcd-xhci-test'] : []) + \
qtests_pci + ['migration-test', 'numa-test', 'cpu-plug-test', 'drive_del-test'] qtests_pci + ['migration-test', 'cpu-plug-test', 'drive_del-test']
qtests_sh4 = (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) qtests_sh4 = (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : [])
qtests_sh4eb = (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) qtests_sh4eb = (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : [])

1
tests/qtest/migration-helpers.c
View File

@ -76,7 +76,6 @@ static QDict *SocketAddress_to_qdict(SocketAddress *addr)
break; break;
default: default:
g_assert_not_reached(); g_assert_not_reached();
break;
} }
return dict; return dict;

10
tests/qtest/numa-test.c
View File

@ -162,7 +162,7 @@ static void pc_numa_cpu(const void *data)
} else if (socket == 1 && core == 1 && thread == 1) { } else if (socket == 1 && core == 1 && thread == 1) {
g_assert_cmpint(node, ==, 1); g_assert_cmpint(node, ==, 1);
} else { } else {
g_assert(false); g_assert_not_reached();
} }
qobject_unref(e); qobject_unref(e);
} }
@ -207,7 +207,7 @@ static void spapr_numa_cpu(const void *data)
} else if (core == 3) { } else if (core == 3) {
g_assert_cmpint(node, ==, 1); g_assert_cmpint(node, ==, 1);
} else { } else {
g_assert(false); g_assert_not_reached();
} }
qobject_unref(e); qobject_unref(e);
} }
@ -257,7 +257,7 @@ static void aarch64_numa_cpu(const void *data)
} else if (socket == 1 && cluster == 0 && core == 0 && thread == 0) { } else if (socket == 1 && cluster == 0 && core == 0 && thread == 0) {
g_assert_cmpint(node, ==, 0); g_assert_cmpint(node, ==, 0);
} else { } else {
g_assert(false); g_assert_not_reached();
} }
qobject_unref(e); qobject_unref(e);
} }
@ -305,7 +305,7 @@ static void loongarch64_numa_cpu(const void *data)
} else if (socket == 1 && core == 0 && thread == 0) { } else if (socket == 1 && core == 0 && thread == 0) {
g_assert_cmpint(node, ==, 0); g_assert_cmpint(node, ==, 0);
} else { } else {
g_assert(false); g_assert_not_reached();
} }
qobject_unref(e); qobject_unref(e);
} }
@ -367,7 +367,7 @@ static void pc_dynamic_cpu_cfg(const void *data)
} else if (socket == 1) { } else if (socket == 1) {
g_assert_cmpint(node, ==, 0); g_assert_cmpint(node, ==, 0);
} else { } else {
g_assert(false); g_assert_not_reached();
} }
qobject_unref(e); qobject_unref(e);
} }

2
tests/qtest/rtl8139-test.c
View File

@ -65,7 +65,7 @@ PORT(IntrMask, w, 0x3c)
PORT(IntrStatus, w, 0x3E) PORT(IntrStatus, w, 0x3E)
PORT(TimerInt, l, 0x54) PORT(TimerInt, l, 0x54)
#define fatal(...) do { g_test_message(__VA_ARGS__); g_assert(0); } while (0) #define fatal(...) do { g_test_message(__VA_ARGS__); g_assert_not_reached(); } while (0)
static void test_timer(void) static void test_timer(void)
{ {

4
tests/unit/test-xs-node.c
View File

@ -212,7 +212,7 @@ static void compare_tx(gpointer key, gpointer val, gpointer opaque)
printf("Comparison failure in TX %u after serdes:\n", tx_id); printf("Comparison failure in TX %u after serdes:\n", tx_id);
dump_ref("Original", t1->root, 0); dump_ref("Original", t1->root, 0);
dump_ref("Deserialised", t2->root, 0); dump_ref("Deserialised", t2->root, 0);
g_assert(0); g_assert_not_reached();
} }
g_assert(t1->nr_nodes == t2->nr_nodes); g_assert(t1->nr_nodes == t2->nr_nodes);
} }
@ -257,7 +257,7 @@ static void check_serdes(XenstoreImplState *s)
printf("Comparison failure in main tree after serdes:\n"); printf("Comparison failure in main tree after serdes:\n");
dump_ref("Original", s->root, 0); dump_ref("Original", s->root, 0);
dump_ref("Deserialised", s2->root, 0); dump_ref("Deserialised", s2->root, 0);
g_assert(0); g_assert_not_reached();
} }
nr_transactions1 = g_hash_table_size(s->transactions); nr_transactions1 = g_hash_table_size(s->transactions);