Misc fixes for 8.0 (testing, plugins, gitdm)
- update Alpine image used for testing images - include libslirp in custom runner build env - update gitlab-runner recipe for CentOS - update docker calls for better caching behaviour - document some plugin callbacks - don't use tags to define drives for lkft baseline tests - fix missing clear of plugin_mem_cbs - fix iotests to report individual results - update the gitdm metadata for contributors - avoid printing comments before g_test_init() - probe for multiprocess support before running avocado test - refactor igb.py into netdev-ethtool.py avocado test - rebuild openbsd to have more space space for iotests -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEZoWumedRZ7yvyN81+9DbCVqeKkQFAmQbGkoACgkQ+9DbCVqe KkT2kQgAif70dGyn2bcv7OYv2LgAcSzDGTIsOfMM6gYc9bm3nU/R/cj9cy8Qgbnu v6BSVeig5AVBWI1UTuMNeKW1BWoQYfxg2kdduSyAzMZS44r09ch9iabSbxbadC1e L1RrRWlzs/MwWX8IclAyEj1jr+DB+/DwoG61IP3215XXSy84e/XV4j+JAyBEzXQ9 LdznGyqyItg3S6rnVpRP/wjR0P3VlrYOLOjFfCw7gB8JrlW7KIr8hWkHXYuS2mF5 UyXTBwbXwYB5BAx0zXC3SVgl0Gs1qymaRUX77dlotlpVVo0Ql8a06dHPtYrjMNgA /Nyat3Dbbu7Rai+IzZIJl3tGx850wg== =XR0M -----END PGP SIGNATURE----- Merge tag 'pull-for-8.0-220323-1' of https://gitlab.com/stsquad/qemu into staging Misc fixes for 8.0 (testing, plugins, gitdm) - update Alpine image used for testing images - include libslirp in custom runner build env - update gitlab-runner recipe for CentOS - update docker calls for better caching behaviour - document some plugin callbacks - don't use tags to define drives for lkft baseline tests - fix missing clear of plugin_mem_cbs - fix iotests to report individual results - update the gitdm metadata for contributors - avoid printing comments before g_test_init() - probe for multiprocess support before running avocado test - refactor igb.py into netdev-ethtool.py avocado test - rebuild openbsd to have more space space for iotests # -----BEGIN PGP SIGNATURE----- # # iQEzBAABCgAdFiEEZoWumedRZ7yvyN81+9DbCVqeKkQFAmQbGkoACgkQ+9DbCVqe # KkT2kQgAif70dGyn2bcv7OYv2LgAcSzDGTIsOfMM6gYc9bm3nU/R/cj9cy8Qgbnu # v6BSVeig5AVBWI1UTuMNeKW1BWoQYfxg2kdduSyAzMZS44r09ch9iabSbxbadC1e # L1RrRWlzs/MwWX8IclAyEj1jr+DB+/DwoG61IP3215XXSy84e/XV4j+JAyBEzXQ9 # LdznGyqyItg3S6rnVpRP/wjR0P3VlrYOLOjFfCw7gB8JrlW7KIr8hWkHXYuS2mF5 # UyXTBwbXwYB5BAx0zXC3SVgl0Gs1qymaRUX77dlotlpVVo0Ql8a06dHPtYrjMNgA # /Nyat3Dbbu7Rai+IzZIJl3tGx850wg== # =XR0M # -----END PGP SIGNATURE----- # gpg: Signature made Wed 22 Mar 2023 15:10:02 GMT # gpg: using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44 # gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full] # Primary key fingerprint: 6685 AE99 E751 67BC AFC8 DF35 FBD0 DB09 5A9E 2A44 * tag 'pull-for-8.0-220323-1' of https://gitlab.com/stsquad/qemu: (35 commits) qtests: avoid printing comments before g_test_init() contrib/gitdm: add group map for AMD contrib/gitdm: add more individual contributors contrib/gitdm: add revng to domain map contrib/gitdm: add Alibaba to the domain-map contrib/gitdm: add Amazon to the domain map contrib/gitdm: Add SYRMIA to the domain map contrib/gitdm: Add ASPEED Technology to the domain map iotests: remove the check-block.sh script iotests: register each I/O test separately with meson iotests: always use a unique sub-directory per test iotests: connect stdin to /dev/null when running tests iotests: print TAP protocol version when reporting tests iotests: strip subdir path when listing tests iotests: allow test discovery before building iotests: explicitly pass source/build dir to 'check' command tests/vm: custom openbsd partitioning to increase /home space tests/vm: skip X11 in openbsd installation include/qemu/plugin: Inline qemu_plugin_disable_mem_helpers include/qemu: Split out plugin-event.h ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
60ca584b8a
|
@ -1,4 +1,9 @@
|
|||
# All centos-stream-8 jobs should run successfully in an environment
|
||||
# setup by the scripts/ci/setup/stream/8/build-environment.yml task
|
||||
# "Installation of extra packages to build QEMU"
|
||||
|
||||
centos-stream-8-x86_64:
|
||||
extends: .custom_runner_template
|
||||
allow_failure: true
|
||||
needs: []
|
||||
stage: build
|
||||
|
@ -8,15 +13,6 @@ centos-stream-8-x86_64:
|
|||
rules:
|
||||
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
|
||||
- if: "$CENTOS_STREAM_8_x86_64_RUNNER_AVAILABLE"
|
||||
artifacts:
|
||||
name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
|
||||
when: on_failure
|
||||
expire_in: 7 days
|
||||
paths:
|
||||
- build/tests/results/latest/results.xml
|
||||
- build/tests/results/latest/test-results
|
||||
reports:
|
||||
junit: build/tests/results/latest/results.xml
|
||||
before_script:
|
||||
- JOBS=$(expr $(nproc) + 1)
|
||||
script:
|
||||
|
@ -25,6 +21,4 @@ centos-stream-8-x86_64:
|
|||
- ../scripts/ci/org.centos/stream/8/x86_64/configure
|
||||
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
|
||||
- make -j"$JOBS"
|
||||
- make NINJA=":" check
|
||||
|| { cat meson-logs/testlog.txt; exit 1; } ;
|
||||
- ../scripts/ci/org.centos/stream/8/x86_64/test-avocado
|
||||
- make NINJA=":" check check-avocado
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
#include "qemu/accel.h"
|
||||
#include "hw/boards.h"
|
||||
#include "sysemu/cpus.h"
|
||||
|
||||
#include "qemu/error-report.h"
|
||||
#include "accel-softmmu.h"
|
||||
|
||||
int accel_init_machine(AccelState *accel, MachineState *ms)
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
#include "sysemu/cpus.h"
|
||||
#include "sysemu/tcg.h"
|
||||
#include "exec/exec-all.h"
|
||||
#include "qemu/plugin.h"
|
||||
|
||||
bool tcg_allowed;
|
||||
|
||||
|
@ -65,6 +66,8 @@ void cpu_loop_exit(CPUState *cpu)
|
|||
{
|
||||
/* Undo the setting in cpu_tb_exec. */
|
||||
cpu->can_do_io = 1;
|
||||
/* Undo any setting in generated code. */
|
||||
qemu_plugin_disable_mem_helpers(cpu);
|
||||
siglongjmp(cpu->jmp_env, 1);
|
||||
}
|
||||
|
||||
|
|
|
@ -459,6 +459,7 @@ cpu_tb_exec(CPUState *cpu, TranslationBlock *itb, int *tb_exit)
|
|||
qemu_thread_jit_execute();
|
||||
ret = tcg_qemu_tb_exec(env, tb_ptr);
|
||||
cpu->can_do_io = 1;
|
||||
qemu_plugin_disable_mem_helpers(cpu);
|
||||
/*
|
||||
* TODO: Delay swapping back to the read-write region of the TB
|
||||
* until we actually need to modify the TB. The read-only copy,
|
||||
|
@ -526,7 +527,6 @@ static void cpu_exec_exit(CPUState *cpu)
|
|||
if (cc->tcg_ops->cpu_exec_exit) {
|
||||
cc->tcg_ops->cpu_exec_exit(cpu);
|
||||
}
|
||||
QEMU_PLUGIN_ASSERT(cpu->plugin_mem_cbs == NULL);
|
||||
}
|
||||
|
||||
void cpu_exec_step_atomic(CPUState *cpu)
|
||||
|
@ -580,7 +580,6 @@ void cpu_exec_step_atomic(CPUState *cpu)
|
|||
qemu_mutex_unlock_iothread();
|
||||
}
|
||||
assert_no_pages_locked();
|
||||
qemu_plugin_disable_mem_helpers(cpu);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -1004,7 +1003,6 @@ cpu_exec_loop(CPUState *cpu, SyncClocks *sc)
|
|||
|
||||
cpu_loop_exec_tb(cpu, tb, pc, &last_tb, &tb_exit);
|
||||
|
||||
QEMU_PLUGIN_ASSERT(cpu->plugin_mem_cbs == NULL);
|
||||
/* Try to align the host and virtual clocks
|
||||
if the guest is in advance */
|
||||
align_clocks(sc, cpu);
|
||||
|
@ -1029,7 +1027,6 @@ static int cpu_exec_setjmp(CPUState *cpu, SyncClocks *sc)
|
|||
if (qemu_mutex_iothread_locked()) {
|
||||
qemu_mutex_unlock_iothread();
|
||||
}
|
||||
qemu_plugin_disable_mem_helpers(cpu);
|
||||
|
||||
assert_no_pages_locked();
|
||||
}
|
||||
|
|
|
@ -48,6 +48,7 @@
|
|||
#include "qemu/option.h"
|
||||
#include "qemu/sockets.h"
|
||||
#include "qemu/cutils.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "sysemu/sysemu.h"
|
||||
#include "monitor/monitor.h"
|
||||
#include "monitor/hmp.h"
|
||||
|
|
|
@ -4,7 +4,12 @@
|
|||
# This maps email domains to nice easy to read company names
|
||||
#
|
||||
|
||||
linux.alibaba.com Alibaba
|
||||
amazon.com Amazon
|
||||
amazon.co.uk Amazon
|
||||
amazon.de Amazon
|
||||
amd.com AMD
|
||||
aspeedtech.com ASPEED Technology Inc.
|
||||
baidu.com Baidu
|
||||
bytedance.com ByteDance
|
||||
cmss.chinamobile.com China Mobile
|
||||
|
@ -32,17 +37,18 @@ oracle.com Oracle
|
|||
proxmox.com Proxmox
|
||||
quicinc.com Qualcomm Innovation Center
|
||||
redhat.com Red Hat
|
||||
rev.ng rev.ng Labs
|
||||
rt-rk.com RT-RK
|
||||
samsung.com Samsung
|
||||
siemens.com Siemens
|
||||
sifive.com SiFive
|
||||
suse.com SUSE
|
||||
suse.de SUSE
|
||||
syrmia.com SYRMIA
|
||||
ventanamicro.com Ventana Micro Systems
|
||||
virtuozzo.com Virtuozzo
|
||||
vrull.eu VRULL
|
||||
wdc.com Western Digital
|
||||
windriver.com Wind River
|
||||
xilinx.com Xilinx
|
||||
yadro.com YADRO
|
||||
yandex-team.ru Yandex
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
#
|
||||
# Alibaba contributors including its subsidiaries
|
||||
#
|
||||
|
||||
# c-sky.com, now part of T-Head, wholly-owned entity of Alibaba Group
|
||||
ren_guo@c-sky.com
|
||||
zhiwei_liu@c-sky.com
|
|
@ -0,0 +1,8 @@
|
|||
# AMD acquired Xilinx and contributors have been slowly updating emails
|
||||
|
||||
edgar.iglesias@xilinx.com
|
||||
fnu.vikram@xilinx.com
|
||||
francisco.iglesias@xilinx.com
|
||||
sai.pavan.boddu@xilinx.com
|
||||
stefano.stabellini@xilinx.com
|
||||
tong.ho@xilinx.com
|
|
@ -38,3 +38,7 @@ paul@nowt.org
|
|||
git@xen0n.name
|
||||
simon@simonsafar.com
|
||||
research_trasio@irq.a4lg.com
|
||||
shentey@gmail.com
|
||||
bmeng@tinylab.org
|
||||
strahinja.p.jankovic@gmail.com
|
||||
Jason@zx2c4.com
|
||||
|
|
1
cpu.c
1
cpu.c
|
@ -42,6 +42,7 @@
|
|||
#include "hw/core/accel-cpu.h"
|
||||
#include "trace/trace-root.h"
|
||||
#include "qemu/accel.h"
|
||||
#include "qemu/plugin.h"
|
||||
|
||||
uintptr_t qemu_host_page_size;
|
||||
intptr_t qemu_host_page_mask;
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
#include "qapi/qapi-commands-dump.h"
|
||||
#include "qapi/qapi-events-dump.h"
|
||||
#include "qapi/qmp/qerror.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "hw/misc/vmcoreinfo.h"
|
||||
#include "migration/blocker.h"
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
#include "qemu/osdep.h"
|
||||
#include "sysemu/dump.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "qapi/qmp/qerror.h"
|
||||
#include "exec/cpu-defs.h"
|
||||
#include "hw/core/cpu.h"
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
#include "qemu/ctype.h"
|
||||
#include "qemu/cutils.h"
|
||||
#include "qemu/module.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "trace.h"
|
||||
#include "exec/gdbstub.h"
|
||||
#include "gdbstub/syscalls.h"
|
||||
|
|
|
@ -31,6 +31,8 @@ EmailMap contrib/gitdm/domain-map
|
|||
# identifiable corporate emails. Please keep this list sorted.
|
||||
#
|
||||
|
||||
GroupMap contrib/gitdm/group-map-alibaba Alibaba
|
||||
GroupMap contrib/gitdm/group-map-amd AMD
|
||||
GroupMap contrib/gitdm/group-map-cadence Cadence Design Systems
|
||||
GroupMap contrib/gitdm/group-map-codeweavers CodeWeavers
|
||||
GroupMap contrib/gitdm/group-map-facebook Facebook
|
||||
|
|
|
@ -19,6 +19,8 @@
|
|||
#include "exec/address-spaces.h"
|
||||
#include "cpu.h"
|
||||
#include "qom/object.h"
|
||||
#include "qemu/error-report.h"
|
||||
|
||||
|
||||
#define RAM_SIZE (512 * MiB)
|
||||
#define FLASH_SIZE (32 * MiB)
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "hw/boards.h"
|
||||
#include "hw/qdev-properties.h"
|
||||
#include "hw/arm/allwinner-a10.h"
|
||||
|
|
|
@ -37,6 +37,8 @@
|
|||
#include "qemu/cutils.h"
|
||||
#include "qom/object.h"
|
||||
#include "hw/net/mv88w8618_eth.h"
|
||||
#include "qemu/error-report.h"
|
||||
|
||||
|
||||
#define MP_MISC_BASE 0x80002000
|
||||
#define MP_MISC_SIZE 0x00001000
|
||||
|
|
|
@ -30,6 +30,8 @@
|
|||
#include "sysemu/blockdev.h"
|
||||
#include "sysemu/sysemu.h"
|
||||
#include "sysemu/block-backend.h"
|
||||
#include "qemu/error-report.h"
|
||||
|
||||
|
||||
#define NPCM7XX_POWER_ON_STRAPS_DEFAULT ( \
|
||||
NPCM7XX_PWRON_STRAP_SPI0F18 | \
|
||||
|
|
|
@ -45,6 +45,8 @@
|
|||
#include "hw/loader.h"
|
||||
#include "hw/sysbus.h"
|
||||
#include "qemu/log.h"
|
||||
#include "qemu/error-report.h"
|
||||
|
||||
|
||||
/* Nokia N8x0 support */
|
||||
struct n800_s {
|
||||
|
|
|
@ -37,6 +37,8 @@
|
|||
#include "exec/address-spaces.h"
|
||||
#include "cpu.h"
|
||||
#include "qemu/cutils.h"
|
||||
#include "qemu/error-report.h"
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Siemens SX1 Cellphone V1 */
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
#include "qemu/units.h"
|
||||
#include "exec/address-spaces.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "hw/boards.h"
|
||||
#include "hw/qdev-properties.h"
|
||||
#include "hw/arm/allwinner-h3.h"
|
||||
|
|
|
@ -32,6 +32,8 @@
|
|||
#include "cpu.h"
|
||||
#include "qemu/cutils.h"
|
||||
#include "qom/object.h"
|
||||
#include "qemu/error-report.h"
|
||||
|
||||
|
||||
static uint64_t static_read(void *opaque, hwaddr offset, unsigned size)
|
||||
{
|
||||
|
|
|
@ -44,6 +44,7 @@
|
|||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qemu/datadir.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qapi/qapi-commands-machine.h"
|
||||
#include "qapi/type-helpers.h"
|
||||
|
|
|
@ -20,6 +20,8 @@
|
|||
#include "qemu/osdep.h"
|
||||
#include "hw/boards.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/error-report.h"
|
||||
|
||||
|
||||
/*
|
||||
* Report information of a machine's supported CPU topology hierarchy.
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
#include "qemu/lockable.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "qemu/log.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "monitor/monitor.h"
|
||||
#include "monitor/hmp.h"
|
||||
#include "qapi/error.h"
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
#include "qemu/module.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "qemu/cutils.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qom/object.h"
|
||||
#include "migration/vmstate.h"
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
#include "monitor/monitor.h"
|
||||
#include "monitor/hmp-target.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "qapi/qapi-commands-misc-target.h"
|
||||
#include "exec/address-spaces.h"
|
||||
#include "sysemu/hw_accel.h"
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
*/
|
||||
#include "qemu/osdep.h"
|
||||
#include "qemu/thread.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "hw/i386/apic_internal.h"
|
||||
#include "hw/i386/apic.h"
|
||||
#include "hw/intc/ioapic.h"
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "qemu/bitmap.h"
|
||||
#include "hw/pci/pci.h"
|
||||
#include "hw/core/cpu.h"
|
||||
|
|
|
@ -44,6 +44,8 @@
|
|||
#include "sysemu/tpm.h"
|
||||
#include "sysemu/block-backend.h"
|
||||
#include "hw/block/flash.h"
|
||||
#include "qemu/error-report.h"
|
||||
|
||||
|
||||
static void virt_flash_create(LoongArchMachineState *lams)
|
||||
{
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
#include "hw/block/fdc.h"
|
||||
#include "hw/qdev-properties.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "ui/console.h"
|
||||
#include "target/m68k/cpu.h"
|
||||
#include "migration/vmstate.h"
|
||||
|
|
|
@ -45,6 +45,7 @@
|
|||
#include "hw/block/swim.h"
|
||||
#include "net/net.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "sysemu/qtest.h"
|
||||
#include "sysemu/runstate.h"
|
||||
#include "sysemu/reset.h"
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
#include "bootinfo.h"
|
||||
#include "net/net.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "sysemu/qtest.h"
|
||||
#include "sysemu/runstate.h"
|
||||
#include "sysemu/reset.h"
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "hw/mem/memory-device.h"
|
||||
#include "qapi/error.h"
|
||||
#include "hw/boards.h"
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qemu/error-report.h"
|
||||
|
||||
#include "hw/qdev-properties.h"
|
||||
#include "hw/sysbus.h"
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
#include "sysemu/device_tree.h"
|
||||
#include "sysemu/qtest.h"
|
||||
#include "sysemu/reset.h"
|
||||
#include "qemu/error-report.h"
|
||||
|
||||
#include <libfdt.h>
|
||||
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
#include "qemu/units.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/log.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "exec/address-spaces.h" /* get_system_memory() */
|
||||
#include "hw/irq.h"
|
||||
#include "hw/qdev-properties.h"
|
||||
|
|
|
@ -1,12 +1,14 @@
|
|||
#include "qemu/osdep.h"
|
||||
#include "qemu/cutils.h"
|
||||
#include "qemu/memalign.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "cpu.h"
|
||||
#include "helper_regs.h"
|
||||
#include "hw/ppc/spapr.h"
|
||||
#include "mmu-hash64.h"
|
||||
#include "mmu-book3s-v3.h"
|
||||
|
||||
|
||||
static inline bool valid_ptex(PowerPCCPU *cpu, target_ulong ptex)
|
||||
{
|
||||
/*
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
#include "qemu/cutils.h"
|
||||
#include "hw/riscv/opentitan.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "hw/boards.h"
|
||||
#include "hw/misc/unimp.h"
|
||||
#include "hw/riscv/boot.h"
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
#include "hw/boards.h"
|
||||
#include "hw/riscv/shakti_c.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "hw/intc/sifive_plic.h"
|
||||
#include "hw/intc/riscv_aclint.h"
|
||||
#include "sysemu/sysemu.h"
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
#include "hw/acpi/aml-build.h"
|
||||
#include "hw/acpi/utils.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "sysemu/reset.h"
|
||||
#include "migration/vmstate.h"
|
||||
#include "hw/riscv/virt.h"
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
#include <linux/vfio.h>
|
||||
#include <sys/ioctl.h>
|
||||
|
||||
#include "qemu/error-report.h"
|
||||
#include "hw/display/edid.h"
|
||||
#include "ui/console.h"
|
||||
#include "qapi/error.h"
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qemu/units.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "qapi/error.h"
|
||||
#include "hw/hw.h"
|
||||
#include "hw/nvram/fw_cfg.h"
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
#include "qemu/main-loop.h"
|
||||
#include "qemu/cutils.h"
|
||||
#include "qemu/units.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include <linux/vfio.h>
|
||||
#include <sys/ioctl.h>
|
||||
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
#include "qemu/rcu_queue.h"
|
||||
#include "qemu/queue.h"
|
||||
#include "qemu/thread.h"
|
||||
#include "qemu/plugin.h"
|
||||
#include "qemu/plugin-event.h"
|
||||
#include "qom/object.h"
|
||||
|
||||
typedef int (*WriteCoreDumpFunction)(const void *buf, size_t size,
|
||||
|
|
|
@ -0,0 +1,26 @@
|
|||
/*
|
||||
* Copyright (C) 2017, Emilio G. Cota <cota@braap.org>
|
||||
*
|
||||
* License: GNU GPL, version 2 or later.
|
||||
* See the COPYING file in the top-level directory.
|
||||
*/
|
||||
#ifndef QEMU_PLUGIN_EVENT_H
|
||||
#define QEMU_PLUGIN_EVENT_H
|
||||
|
||||
/*
|
||||
* Events that plugins can subscribe to.
|
||||
*/
|
||||
enum qemu_plugin_event {
|
||||
QEMU_PLUGIN_EV_VCPU_INIT,
|
||||
QEMU_PLUGIN_EV_VCPU_EXIT,
|
||||
QEMU_PLUGIN_EV_VCPU_TB_TRANS,
|
||||
QEMU_PLUGIN_EV_VCPU_IDLE,
|
||||
QEMU_PLUGIN_EV_VCPU_RESUME,
|
||||
QEMU_PLUGIN_EV_VCPU_SYSCALL,
|
||||
QEMU_PLUGIN_EV_VCPU_SYSCALL_RET,
|
||||
QEMU_PLUGIN_EV_FLUSH,
|
||||
QEMU_PLUGIN_EV_ATEXIT,
|
||||
QEMU_PLUGIN_EV_MAX, /* total number of plugin events we support */
|
||||
};
|
||||
|
||||
#endif /* QEMU_PLUGIN_EVENT_H */
|
|
@ -12,23 +12,9 @@
|
|||
#include "qemu/error-report.h"
|
||||
#include "qemu/queue.h"
|
||||
#include "qemu/option.h"
|
||||
#include "qemu/plugin-event.h"
|
||||
#include "exec/memopidx.h"
|
||||
|
||||
/*
|
||||
* Events that plugins can subscribe to.
|
||||
*/
|
||||
enum qemu_plugin_event {
|
||||
QEMU_PLUGIN_EV_VCPU_INIT,
|
||||
QEMU_PLUGIN_EV_VCPU_EXIT,
|
||||
QEMU_PLUGIN_EV_VCPU_TB_TRANS,
|
||||
QEMU_PLUGIN_EV_VCPU_IDLE,
|
||||
QEMU_PLUGIN_EV_VCPU_RESUME,
|
||||
QEMU_PLUGIN_EV_VCPU_SYSCALL,
|
||||
QEMU_PLUGIN_EV_VCPU_SYSCALL_RET,
|
||||
QEMU_PLUGIN_EV_FLUSH,
|
||||
QEMU_PLUGIN_EV_ATEXIT,
|
||||
QEMU_PLUGIN_EV_MAX, /* total number of plugin events we support */
|
||||
};
|
||||
#include "hw/core/cpu.h"
|
||||
|
||||
/*
|
||||
* Option parsing/processing.
|
||||
|
@ -59,8 +45,6 @@ get_plugin_meminfo_rw(qemu_plugin_meminfo_t i)
|
|||
#ifdef CONFIG_PLUGIN
|
||||
extern QemuOptsList qemu_plugin_opts;
|
||||
|
||||
#define QEMU_PLUGIN_ASSERT(cond) g_assert(cond)
|
||||
|
||||
static inline void qemu_plugin_add_opts(void)
|
||||
{
|
||||
qemu_add_opts(&qemu_plugin_opts);
|
||||
|
@ -221,7 +205,10 @@ void qemu_plugin_atexit_cb(void);
|
|||
|
||||
void qemu_plugin_add_dyn_cb_arr(GArray *arr);
|
||||
|
||||
void qemu_plugin_disable_mem_helpers(CPUState *cpu);
|
||||
static inline void qemu_plugin_disable_mem_helpers(CPUState *cpu)
|
||||
{
|
||||
cpu->plugin_mem_cbs = NULL;
|
||||
}
|
||||
|
||||
/**
|
||||
* qemu_plugin_user_exit(): clean-up callbacks before calling exit callbacks
|
||||
|
@ -252,8 +239,6 @@ void qemu_plugin_user_postfork(bool is_child);
|
|||
|
||||
#else /* !CONFIG_PLUGIN */
|
||||
|
||||
#define QEMU_PLUGIN_ASSERT(cond)
|
||||
|
||||
static inline void qemu_plugin_add_opts(void)
|
||||
{ }
|
||||
|
||||
|
|
|
@ -481,17 +481,56 @@ uint64_t qemu_plugin_hwaddr_phys_addr(const struct qemu_plugin_hwaddr *haddr);
|
|||
*/
|
||||
const char *qemu_plugin_hwaddr_device_name(const struct qemu_plugin_hwaddr *h);
|
||||
|
||||
typedef void
|
||||
(*qemu_plugin_vcpu_mem_cb_t)(unsigned int vcpu_index,
|
||||
qemu_plugin_meminfo_t info, uint64_t vaddr,
|
||||
void *userdata);
|
||||
/**
|
||||
* typedef qemu_plugin_vcpu_mem_cb_t - memory callback function type
|
||||
* @vcpu_index: the executing vCPU
|
||||
* @info: an opaque handle for further queries about the memory
|
||||
* @vaddr: the virtual address of the transaction
|
||||
* @userdata: any user data attached to the callback
|
||||
*/
|
||||
typedef void (*qemu_plugin_vcpu_mem_cb_t) (unsigned int vcpu_index,
|
||||
qemu_plugin_meminfo_t info,
|
||||
uint64_t vaddr,
|
||||
void *userdata);
|
||||
|
||||
/**
|
||||
* qemu_plugin_register_vcpu_mem_cb() - register memory access callback
|
||||
* @insn: handle for instruction to instrument
|
||||
* @cb: callback of type qemu_plugin_vcpu_mem_cb_t
|
||||
* @flags: (currently unused) callback flags
|
||||
* @rw: monitor reads, writes or both
|
||||
* @userdata: opaque pointer for userdata
|
||||
*
|
||||
* This registers a full callback for every memory access generated by
|
||||
* an instruction. If the instruction doesn't access memory no
|
||||
* callback will be made.
|
||||
*
|
||||
* The callback reports the vCPU the access took place on, the virtual
|
||||
* address of the access and a handle for further queries. The user
|
||||
* can attach some userdata to the callback for additional purposes.
|
||||
*
|
||||
* Other execution threads will continue to execute during the
|
||||
* callback so the plugin is responsible for ensuring it doesn't get
|
||||
* confused by making appropriate use of locking if required.
|
||||
*/
|
||||
void qemu_plugin_register_vcpu_mem_cb(struct qemu_plugin_insn *insn,
|
||||
qemu_plugin_vcpu_mem_cb_t cb,
|
||||
enum qemu_plugin_cb_flags flags,
|
||||
enum qemu_plugin_mem_rw rw,
|
||||
void *userdata);
|
||||
|
||||
/**
|
||||
* qemu_plugin_register_vcpu_mem_inline() - register an inline op to any memory access
|
||||
* @insn: handle for instruction to instrument
|
||||
* @rw: apply to reads, writes or both
|
||||
* @op: the op, of type qemu_plugin_op
|
||||
* @ptr: pointer memory for the op
|
||||
* @imm: immediate data for @op
|
||||
*
|
||||
* This registers a inline op every memory access generated by the
|
||||
* instruction. This provides for a lightweight but not thread-safe
|
||||
* way of counting the number of operations done.
|
||||
*/
|
||||
void qemu_plugin_register_vcpu_mem_inline(struct qemu_plugin_insn *insn,
|
||||
enum qemu_plugin_mem_rw rw,
|
||||
enum qemu_plugin_op op, void *ptr,
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
#define SYSCALL_TRACE_H
|
||||
|
||||
#include "exec/user/abitypes.h"
|
||||
#include "qemu/plugin.h"
|
||||
#include "trace/trace-root.h"
|
||||
|
||||
/*
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
#include "qemu/units.h"
|
||||
#include "qemu/selfmap.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "target_signal.h"
|
||||
#include "accel/tcg/debuginfo.h"
|
||||
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
#include "gdbstub/syscalls.h"
|
||||
#include "qemu.h"
|
||||
#include "user-internals.h"
|
||||
#include "qemu/plugin.h"
|
||||
#ifdef CONFIG_GPROF
|
||||
#include <sys/gmon.h>
|
||||
#endif
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
#include "qemu/path.h"
|
||||
#include "qemu/memfd.h"
|
||||
#include "qemu/queue.h"
|
||||
#include "qemu/plugin.h"
|
||||
#include "target_mman.h"
|
||||
#include <elf.h>
|
||||
#include <endian.h>
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include <zlib.h>
|
||||
#include "qapi/error.h"
|
||||
#include "cpu.h"
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "channel.h"
|
||||
#include "exec.h"
|
||||
#include "migration.h"
|
||||
|
|
|
@ -553,17 +553,6 @@ void qemu_plugin_user_postfork(bool is_child)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Call this function after longjmp'ing to the main loop. It's possible that the
|
||||
* last instruction of a TB might have used helpers, and therefore the
|
||||
* "disable" instruction will never execute because it ended up as dead code.
|
||||
*/
|
||||
void qemu_plugin_disable_mem_helpers(CPUState *cpu)
|
||||
{
|
||||
cpu->plugin_mem_cbs = NULL;
|
||||
}
|
||||
|
||||
static bool plugin_dyn_cb_arr_cmp(const void *ap, const void *bp)
|
||||
{
|
||||
return ap == bp;
|
||||
|
|
|
@ -55,6 +55,7 @@
|
|||
- librados-devel
|
||||
- librbd-devel
|
||||
- libseccomp-devel
|
||||
- libslirp-devel
|
||||
- libssh-devel
|
||||
- libxkbcommon-devel
|
||||
- lzo-devel
|
||||
|
|
|
@ -48,13 +48,29 @@
|
|||
- debug:
|
||||
msg: gitlab-runner arch is {{ gitlab_runner_arch }}
|
||||
|
||||
- name: Download the matching gitlab-runner
|
||||
- name: Download the matching gitlab-runner (DEB)
|
||||
get_url:
|
||||
dest: "/root/"
|
||||
url: "https://gitlab-runner-downloads.s3.amazonaws.com/latest/deb/gitlab-runner_{{ gitlab_runner_arch }}.deb"
|
||||
when:
|
||||
- ansible_facts['distribution'] == 'Ubuntu'
|
||||
|
||||
- name: Install gitlab-runner via package manager
|
||||
- name: Download the matching gitlab-runner (RPM)
|
||||
get_url:
|
||||
dest: "/root/"
|
||||
url: "https://gitlab-runner-downloads.s3.amazonaws.com/latest/rpm/gitlab-runner_{{ gitlab_runner_arch }}.rpm"
|
||||
when:
|
||||
- ansible_facts['distribution'] == 'CentOS'
|
||||
|
||||
- name: Install gitlab-runner via package manager (DEB)
|
||||
apt: deb="/root/gitlab-runner_{{ gitlab_runner_arch }}.deb"
|
||||
when:
|
||||
- ansible_facts['distribution'] == 'Ubuntu'
|
||||
|
||||
- name: Install gitlab-runner via package manager (RPM)
|
||||
yum: name="/root/gitlab-runner_{{ gitlab_runner_arch }}.rpm"
|
||||
when:
|
||||
- ansible_facts['distribution'] == 'CentOS'
|
||||
|
||||
- name: Register the gitlab-runner
|
||||
command: "/usr/bin/gitlab-runner register --non-interactive --url {{ gitlab_runner_server_url }} --registration-token {{ gitlab_runner_registration_token }} --executor shell --tag-list {{ ansible_facts[\"architecture\"] }},{{ ansible_facts[\"distribution\"]|lower }}_{{ ansible_facts[\"distribution_version\"] }} --description '{{ ansible_facts[\"distribution\"] }} {{ ansible_facts[\"distribution_version\"] }} {{ ansible_facts[\"architecture\"] }} ({{ ansible_facts[\"os_family\"] }})'"
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
#include "kvm/kvm_i386.h"
|
||||
#include "sev.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "qapi/qapi-visit-machine.h"
|
||||
#include "qapi/qmp/qerror.h"
|
||||
#include "standard-headers/asm-x86/kvm_para.h"
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
#include "cpu.h"
|
||||
#include "host-cpu.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "sysemu/sysemu.h"
|
||||
|
||||
/* Note: Only safe for use on x86(-64) hosts */
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
#include "qemu/osdep.h"
|
||||
#include "qemu/log.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "hw/xen/xen.h"
|
||||
#include "sysemu/kvm_int.h"
|
||||
#include "sysemu/kvm_xen.h"
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
#include "qemu/base64.h"
|
||||
#include "qemu/module.h"
|
||||
#include "qemu/uuid.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "crypto/hash.h"
|
||||
#include "sysemu/kvm.h"
|
||||
#include "sev.h"
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
* See the COPYING file in the top-level directory.
|
||||
*/
|
||||
#include "qemu/osdep.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "cpu.h"
|
||||
#include "hw/i386/apic_internal.h"
|
||||
#include "hw/i386/apic-msidef.h"
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
#include "qemu/osdep.h"
|
||||
#include "qemu/cutils.h"
|
||||
#include "qemu/qemu-print.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "qapi/error.h"
|
||||
#include "cpu.h"
|
||||
#include "internal.h"
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "qapi/error.h"
|
||||
#include "cpu.h"
|
||||
#include "s390x-internal.h"
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
#include "sysemu/kvm.h"
|
||||
#include "sysemu/tcg.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "qapi/visitor.h"
|
||||
#include "qemu/module.h"
|
||||
#include "qemu/hw-version.h"
|
||||
|
|
|
@ -22,6 +22,8 @@
|
|||
#include "hw/s390x/pv.h"
|
||||
#include "sysemu/kvm.h"
|
||||
#include "kvm/kvm_s390x.h"
|
||||
#include "qemu/error-report.h"
|
||||
|
||||
|
||||
int handle_diag_288(CPUS390XState *env, uint64_t r1, uint64_t r3)
|
||||
{
|
||||
|
|
|
@ -2808,7 +2808,6 @@ void tcg_gen_exit_tb(const TranslationBlock *tb, unsigned idx)
|
|||
tcg_debug_assert(idx == TB_EXIT_REQUESTED);
|
||||
}
|
||||
|
||||
plugin_gen_disable_mem_helpers();
|
||||
tcg_gen_op1i(INDEX_op_exit_tb, val);
|
||||
}
|
||||
|
||||
|
|
|
@ -309,6 +309,16 @@ class QemuSystemTest(QemuBaseTest):
|
|||
if netdevhelp.find('\n' + netdevname + '\n') < 0:
|
||||
self.cancel('no support for user networking')
|
||||
|
||||
def require_multiprocess(self):
|
||||
"""
|
||||
Test for the presence of the x-pci-proxy-dev which is required
|
||||
to support multiprocess.
|
||||
"""
|
||||
devhelp = run_cmd([self.qemu_bin,
|
||||
'-M', 'none', '-device', 'help'])[0];
|
||||
if devhelp.find('x-pci-proxy-dev') < 0:
|
||||
self.cancel('no support for multiprocess device emulation')
|
||||
|
||||
def _new_vm(self, name, *args):
|
||||
self._sd = tempfile.TemporaryDirectory(prefix="qemu_")
|
||||
vm = QEMUMachine(self.qemu_bin, base_temp_dir=self.workdir,
|
||||
|
|
|
@ -1,38 +0,0 @@
|
|||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
# ethtool tests for igb registers, interrupts, etc
|
||||
|
||||
from avocado_qemu import LinuxTest
|
||||
|
||||
class IGB(LinuxTest):
|
||||
"""
|
||||
:avocado: tags=accel:kvm
|
||||
:avocado: tags=arch:x86_64
|
||||
:avocado: tags=distro:fedora
|
||||
:avocado: tags=distro_version:31
|
||||
:avocado: tags=machine:q35
|
||||
"""
|
||||
|
||||
timeout = 180
|
||||
|
||||
def test(self):
|
||||
self.require_accelerator('kvm')
|
||||
kernel_url = self.distro.pxeboot_url + 'vmlinuz'
|
||||
kernel_hash = '5b6f6876e1b5bda314f93893271da0d5777b1f3c'
|
||||
kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
|
||||
initrd_url = self.distro.pxeboot_url + 'initrd.img'
|
||||
initrd_hash = 'dd0340a1b39bd28f88532babd4581c67649ec5b1'
|
||||
initrd_path = self.fetch_asset(initrd_url, asset_hash=initrd_hash)
|
||||
|
||||
# Ideally we want to test MSI as well, but it is blocked by a bug
|
||||
# fixed with:
|
||||
# https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=28e96556baca7056d11d9fb3cdd0aba4483e00d8
|
||||
kernel_params = self.distro.default_kernel_params + ' pci=nomsi'
|
||||
|
||||
self.vm.add_args('-kernel', kernel_path,
|
||||
'-initrd', initrd_path,
|
||||
'-append', kernel_params,
|
||||
'-accel', 'kvm',
|
||||
'-device', 'igb')
|
||||
self.launch_and_wait()
|
||||
self.ssh_command('dnf -y install ethtool')
|
||||
self.ssh_command('ethtool -t eth1 offline')
|
|
@ -38,11 +38,11 @@ class Aarch64VirtMachine(QemuSystemTest):
|
|||
:avocado: tags=accel:tcg
|
||||
"""
|
||||
iso_url = ('https://dl-cdn.alpinelinux.org/'
|
||||
'alpine/v3.16/releases/aarch64/'
|
||||
'alpine-virt-3.16.3-aarch64.iso')
|
||||
'alpine/v3.17/releases/aarch64/'
|
||||
'alpine-standard-3.17.2-aarch64.iso')
|
||||
|
||||
# Alpine use sha256 so I recalculated this myself
|
||||
iso_sha1 = '0683bc089486d55c91bf6607d5ecb93925769bc0'
|
||||
iso_sha1 = '76284fcd7b41fe899b0c2375ceb8470803eea839'
|
||||
iso_path = self.fetch_asset(iso_url, asset_hash=iso_sha1)
|
||||
|
||||
self.vm.set_console()
|
||||
|
@ -65,7 +65,7 @@ class Aarch64VirtMachine(QemuSystemTest):
|
|||
self.vm.add_args('-object', 'rng-random,id=rng0,filename=/dev/urandom')
|
||||
|
||||
self.vm.launch()
|
||||
self.wait_for_console_pattern('Welcome to Alpine Linux 3.16')
|
||||
self.wait_for_console_pattern('Welcome to Alpine Linux 3.17')
|
||||
|
||||
|
||||
def common_aarch64_virt(self, machine):
|
||||
|
|
|
@ -22,6 +22,7 @@ class Multiprocess(QemuSystemTest):
|
|||
machine_type):
|
||||
"""Main test method"""
|
||||
self.require_accelerator('kvm')
|
||||
self.require_multiprocess()
|
||||
|
||||
# Create socketpair to connect proxy and remote processes
|
||||
proxy_sock, remote_sock = socket.socketpair(socket.AF_UNIX,
|
||||
|
|
|
@ -0,0 +1,116 @@
|
|||
# ethtool tests for emulated network devices
|
||||
#
|
||||
# This test leverages ethtool's --test sequence to validate network
|
||||
# device behaviour.
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-2.0-or-late
|
||||
|
||||
from avocado import skip
|
||||
from avocado_qemu import QemuSystemTest
|
||||
from avocado_qemu import exec_command, exec_command_and_wait_for_pattern
|
||||
from avocado_qemu import wait_for_console_pattern
|
||||
|
||||
class NetDevEthtool(QemuSystemTest):
|
||||
"""
|
||||
:avocado: tags=arch:x86_64
|
||||
:avocado: tags=machine:q35
|
||||
"""
|
||||
|
||||
# Runs in about 17s under KVM, 19s under TCG, 25s under GCOV
|
||||
timeout = 45
|
||||
|
||||
# Fetch assets from the netdev-ethtool subdir of my shared test
|
||||
# images directory on fileserver.linaro.org.
|
||||
def get_asset(self, name, sha1):
|
||||
base_url = ('https://fileserver.linaro.org/s/'
|
||||
'kE4nCFLdQcoBF9t/download?'
|
||||
'path=%2Fnetdev-ethtool&files=' )
|
||||
url = base_url + name
|
||||
# use explicit name rather than failing to neatly parse the
|
||||
# URL into a unique one
|
||||
return self.fetch_asset(name=name, locations=(url), asset_hash=sha1)
|
||||
|
||||
def common_test_code(self, netdev, extra_args=None, kvm=False):
|
||||
|
||||
# This custom kernel has drivers for all the supported network
|
||||
# devices we can emulate in QEMU
|
||||
kernel = self.get_asset("bzImage",
|
||||
"33469d7802732d5815226166581442395cb289e2")
|
||||
|
||||
rootfs = self.get_asset("rootfs.squashfs",
|
||||
"9793cea7021414ae844bda51f558bd6565b50cdc")
|
||||
|
||||
append = 'printk.time=0 console=ttyS0 '
|
||||
append += 'root=/dev/sr0 rootfstype=squashfs '
|
||||
|
||||
# any additional kernel tweaks for the test
|
||||
if extra_args:
|
||||
append += extra_args
|
||||
|
||||
# finally invoke ethtool directly
|
||||
append += ' init=/usr/sbin/ethtool -- -t eth1 offline'
|
||||
|
||||
# add the rootfs via a readonly cdrom image
|
||||
drive = f"file={rootfs},if=ide,index=0,media=cdrom"
|
||||
|
||||
self.vm.add_args('-kernel', kernel,
|
||||
'-append', append,
|
||||
'-drive', drive,
|
||||
'-device', netdev)
|
||||
|
||||
if kvm:
|
||||
self.vm.add_args('-accel', 'kvm')
|
||||
|
||||
self.vm.set_console(console_index=0)
|
||||
self.vm.launch()
|
||||
|
||||
wait_for_console_pattern(self,
|
||||
"The test result is PASS",
|
||||
"The test result is FAIL",
|
||||
vm=None)
|
||||
# no need to gracefully shutdown, just finish
|
||||
self.vm.kill()
|
||||
|
||||
# Skip testing for MSI for now. Allegedly it was fixed by:
|
||||
# 28e96556ba (igb: Allocate MSI-X vector when testing)
|
||||
# but I'm seeing oops in the kernel
|
||||
@skip("Kernel bug with MSI enabled")
|
||||
def test_igb(self):
|
||||
"""
|
||||
:avocado: tags=device:igb
|
||||
"""
|
||||
self.common_test_code("igb")
|
||||
|
||||
def test_igb_nomsi(self):
|
||||
"""
|
||||
:avocado: tags=device:igb
|
||||
"""
|
||||
self.common_test_code("igb", "pci=nomsi")
|
||||
|
||||
def test_igb_nomsi_kvm(self):
|
||||
"""
|
||||
:avocado: tags=device:igb
|
||||
"""
|
||||
self.require_accelerator('kvm')
|
||||
self.common_test_code("igb", "pci=nomsi", True)
|
||||
|
||||
# It seems the other popular cards we model in QEMU currently fail
|
||||
# the pattern test with:
|
||||
#
|
||||
# pattern test failed (reg 0x00178): got 0x00000000 expected 0x00005A5A
|
||||
#
|
||||
# So for now we skip them.
|
||||
|
||||
@skip("Incomplete reg 0x00178 support")
|
||||
def test_e1000(self):
|
||||
"""
|
||||
:avocado: tags=device:e1000
|
||||
"""
|
||||
self.common_test_code("e1000")
|
||||
|
||||
@skip("Incomplete reg 0x00178 support")
|
||||
def test_i82550(self):
|
||||
"""
|
||||
:avocado: tags=device:i82550
|
||||
"""
|
||||
self.common_test_code("i82550")
|
|
@ -67,9 +67,6 @@ class TuxRunBaselineTest(QemuSystemTest):
|
|||
# The name of the kernel Image file
|
||||
self.image = self.get_tag('image', "Image")
|
||||
|
||||
# The block device drive type
|
||||
self.drive = self.get_tag('drive', "virtio-blk-device")
|
||||
|
||||
self.root = self.get_tag('root', "vda")
|
||||
|
||||
# Occasionally we need extra devices to hook things up
|
||||
|
@ -99,7 +96,7 @@ class TuxRunBaselineTest(QemuSystemTest):
|
|||
|
||||
return (kernel_image, self.workdir + "/rootfs.ext4", dtb)
|
||||
|
||||
def prepare_run(self, kernel, disk, dtb=None, console_index=0):
|
||||
def prepare_run(self, kernel, disk, drive, dtb=None, console_index=0):
|
||||
"""
|
||||
Setup to run and add the common parameters to the system
|
||||
"""
|
||||
|
@ -121,10 +118,8 @@ class TuxRunBaselineTest(QemuSystemTest):
|
|||
if self.extradev:
|
||||
self.vm.add_args('-device', self.extradev)
|
||||
|
||||
# Some machines already define a drive device
|
||||
if self.drive != "none":
|
||||
self.vm.add_args('-device',
|
||||
f"{self.drive},drive=hd0")
|
||||
self.vm.add_args('-device',
|
||||
f"{drive},drive=hd0")
|
||||
|
||||
# Some machines need an explicit DTB
|
||||
if dtb:
|
||||
|
@ -154,7 +149,9 @@ class TuxRunBaselineTest(QemuSystemTest):
|
|||
else:
|
||||
self.vm.wait()
|
||||
|
||||
def common_tuxrun(self, dt=None, haltmsg="reboot: System halted",
|
||||
def common_tuxrun(self, dt=None,
|
||||
drive="virtio-blk-device",
|
||||
haltmsg="reboot: System halted",
|
||||
console_index=0):
|
||||
"""
|
||||
Common path for LKFT tests. Unless we need to do something
|
||||
|
@ -163,7 +160,7 @@ class TuxRunBaselineTest(QemuSystemTest):
|
|||
"""
|
||||
(kernel, disk, dtb) = self.fetch_tuxrun_assets(dt)
|
||||
|
||||
self.prepare_run(kernel, disk, dtb, console_index)
|
||||
self.prepare_run(kernel, disk, drive, dtb, console_index)
|
||||
self.vm.launch()
|
||||
self.run_tuxtest_tests(haltmsg)
|
||||
|
||||
|
@ -206,11 +203,11 @@ class TuxRunBaselineTest(QemuSystemTest):
|
|||
:avocado: tags=machine:versatilepb
|
||||
:avocado: tags=tuxboot:armv5
|
||||
:avocado: tags=image:zImage
|
||||
:avocado: tags=drive:virtio-blk-pci
|
||||
:avocado: tags=console:ttyAMA0
|
||||
:avocado: tags=shutdown:nowait
|
||||
"""
|
||||
self.common_tuxrun(dt="versatile-pb.dtb")
|
||||
self.common_tuxrun(drive="virtio-blk-pci",
|
||||
dt="versatile-pb.dtb")
|
||||
|
||||
def test_armv7(self):
|
||||
"""
|
||||
|
@ -244,10 +241,9 @@ class TuxRunBaselineTest(QemuSystemTest):
|
|||
:avocado: tags=machine:q35
|
||||
:avocado: tags=tuxboot:i386
|
||||
:avocado: tags=image:bzImage
|
||||
:avocado: tags=drive:virtio-blk-pci
|
||||
:avocado: tags=shutdown:nowait
|
||||
"""
|
||||
self.common_tuxrun()
|
||||
self.common_tuxrun(drive="virtio-blk-pci")
|
||||
|
||||
def test_mips32(self):
|
||||
"""
|
||||
|
@ -257,11 +253,10 @@ class TuxRunBaselineTest(QemuSystemTest):
|
|||
:avocado: tags=endian:big
|
||||
:avocado: tags=tuxboot:mips32
|
||||
:avocado: tags=image:vmlinux
|
||||
:avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0
|
||||
:avocado: tags=root:sda
|
||||
:avocado: tags=shutdown:nowait
|
||||
"""
|
||||
self.common_tuxrun()
|
||||
self.common_tuxrun(drive="driver=ide-hd,bus=ide.0,unit=0")
|
||||
|
||||
def test_mips32el(self):
|
||||
"""
|
||||
|
@ -270,11 +265,10 @@ class TuxRunBaselineTest(QemuSystemTest):
|
|||
:avocado: tags=cpu:mips32r6-generic
|
||||
:avocado: tags=tuxboot:mips32el
|
||||
:avocado: tags=image:vmlinux
|
||||
:avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0
|
||||
:avocado: tags=root:sda
|
||||
:avocado: tags=shutdown:nowait
|
||||
"""
|
||||
self.common_tuxrun()
|
||||
self.common_tuxrun(drive="driver=ide-hd,bus=ide.0,unit=0")
|
||||
|
||||
@skip("QEMU currently broken") # regression against stable QEMU
|
||||
def test_mips64(self):
|
||||
|
@ -284,11 +278,10 @@ class TuxRunBaselineTest(QemuSystemTest):
|
|||
:avocado: tags=tuxboot:mips64
|
||||
:avocado: tags=endian:big
|
||||
:avocado: tags=image:vmlinux
|
||||
:avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0
|
||||
:avocado: tags=root:sda
|
||||
:avocado: tags=shutdown:nowait
|
||||
"""
|
||||
self.common_tuxrun()
|
||||
self.common_tuxrun(drive="driver=ide-hd,bus=ide.0,unit=0")
|
||||
|
||||
def test_mips64el(self):
|
||||
"""
|
||||
|
@ -296,11 +289,10 @@ class TuxRunBaselineTest(QemuSystemTest):
|
|||
:avocado: tags=machine:malta
|
||||
:avocado: tags=tuxboot:mips64el
|
||||
:avocado: tags=image:vmlinux
|
||||
:avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0
|
||||
:avocado: tags=root:sda
|
||||
:avocado: tags=shutdown:nowait
|
||||
"""
|
||||
self.common_tuxrun()
|
||||
self.common_tuxrun(drive="driver=ide-hd,bus=ide.0,unit=0")
|
||||
|
||||
def test_ppc32(self):
|
||||
"""
|
||||
|
@ -309,10 +301,9 @@ class TuxRunBaselineTest(QemuSystemTest):
|
|||
:avocado: tags=cpu:e500mc
|
||||
:avocado: tags=tuxboot:ppc32
|
||||
:avocado: tags=image:uImage
|
||||
:avocado: tags=drive:virtio-blk-pci
|
||||
:avocado: tags=shutdown:nowait
|
||||
"""
|
||||
self.common_tuxrun()
|
||||
self.common_tuxrun(drive="virtio-blk-pci")
|
||||
|
||||
def test_ppc64(self):
|
||||
"""
|
||||
|
@ -324,10 +315,9 @@ class TuxRunBaselineTest(QemuSystemTest):
|
|||
:avocado: tags=tuxboot:ppc64
|
||||
:avocado: tags=image:vmlinux
|
||||
:avocado: tags=extradev:driver=spapr-vscsi
|
||||
:avocado: tags=drive:scsi-hd
|
||||
:avocado: tags=root:sda
|
||||
"""
|
||||
self.common_tuxrun()
|
||||
self.common_tuxrun(drive="scsi-hd")
|
||||
|
||||
def test_ppc64le(self):
|
||||
"""
|
||||
|
@ -338,10 +328,9 @@ class TuxRunBaselineTest(QemuSystemTest):
|
|||
:avocado: tags=tuxboot:ppc64le
|
||||
:avocado: tags=image:vmlinux
|
||||
:avocado: tags=extradev:driver=spapr-vscsi
|
||||
:avocado: tags=drive:scsi-hd
|
||||
:avocado: tags=root:sda
|
||||
"""
|
||||
self.common_tuxrun()
|
||||
self.common_tuxrun(drive="scsi-hd")
|
||||
|
||||
def test_riscv32(self):
|
||||
"""
|
||||
|
@ -365,10 +354,10 @@ class TuxRunBaselineTest(QemuSystemTest):
|
|||
:avocado: tags=endian:big
|
||||
:avocado: tags=tuxboot:s390
|
||||
:avocado: tags=image:bzImage
|
||||
:avocado: tags=drive:virtio-blk-ccw
|
||||
:avocado: tags=shutdown:nowait
|
||||
"""
|
||||
self.common_tuxrun(haltmsg="Requesting system halt")
|
||||
self.common_tuxrun(drive="virtio-blk-ccw",
|
||||
haltmsg="Requesting system halt")
|
||||
|
||||
# Note: some segfaults caused by unaligned userspace access
|
||||
@skipIf(os.getenv('GITLAB_CI'), 'Skipping unstable test on GitLab')
|
||||
|
@ -380,7 +369,6 @@ class TuxRunBaselineTest(QemuSystemTest):
|
|||
:avocado: tags=tuxboot:sh4
|
||||
:avocado: tags=image:zImage
|
||||
:avocado: tags=root:sda
|
||||
:avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0
|
||||
:avocado: tags=console:ttySC1
|
||||
"""
|
||||
# The test is currently too unstable to do much in userspace
|
||||
|
@ -388,7 +376,9 @@ class TuxRunBaselineTest(QemuSystemTest):
|
|||
(kernel, disk, dtb) = self.fetch_tuxrun_assets()
|
||||
|
||||
# the console comes on the second serial port
|
||||
self.prepare_run(kernel, disk, console_index=1)
|
||||
self.prepare_run(kernel, disk,
|
||||
"driver=ide-hd,bus=ide.0,unit=0",
|
||||
console_index=1)
|
||||
self.vm.launch()
|
||||
|
||||
self.wait_for_console_pattern("Welcome to TuxTest")
|
||||
|
@ -404,10 +394,9 @@ class TuxRunBaselineTest(QemuSystemTest):
|
|||
:avocado: tags=tuxboot:sparc64
|
||||
:avocado: tags=image:vmlinux
|
||||
:avocado: tags=root:sda
|
||||
:avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0
|
||||
:avocado: tags=shutdown:nowait
|
||||
"""
|
||||
self.common_tuxrun()
|
||||
self.common_tuxrun(drive="driver=ide-hd,bus=ide.0,unit=0")
|
||||
|
||||
def test_x86_64(self):
|
||||
"""
|
||||
|
@ -417,7 +406,6 @@ class TuxRunBaselineTest(QemuSystemTest):
|
|||
:avocado: tags=tuxboot:x86_64
|
||||
:avocado: tags=image:bzImage
|
||||
:avocado: tags=root:sda
|
||||
:avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0
|
||||
:avocado: tags=shutdown:nowait
|
||||
"""
|
||||
self.common_tuxrun()
|
||||
self.common_tuxrun(drive="driver=ide-hd,bus=ide.0,unit=0")
|
||||
|
|
|
@ -1,43 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
if [ "$#" -eq 0 ]; then
|
||||
echo "Usage: $0 fmt..." >&2
|
||||
exit 99
|
||||
fi
|
||||
|
||||
# Honor the SPEED environment variable, just like we do it for "meson test"
|
||||
format_list="$@"
|
||||
if [ "$SPEED" = "slow" ] || [ "$SPEED" = "thorough" ]; then
|
||||
group=
|
||||
else
|
||||
group="-g auto"
|
||||
fi
|
||||
|
||||
skip() {
|
||||
echo "1..0 #SKIP $*"
|
||||
exit 0
|
||||
}
|
||||
|
||||
if [ -z "$(find . -name 'qemu-system-*' -print)" ]; then
|
||||
skip "No qemu-system binary available ==> Not running the qemu-iotests."
|
||||
fi
|
||||
|
||||
cd tests/qemu-iotests
|
||||
|
||||
# QEMU_CHECK_BLOCK_AUTO is used to disable some unstable sub-tests
|
||||
export QEMU_CHECK_BLOCK_AUTO=1
|
||||
export PYTHONUTF8=1
|
||||
# If make was called with -jN we want to call ./check with -j N. Extract the
|
||||
# flag from MAKEFLAGS, so that if it absent (or MAKEFLAGS is not defined), JOBS
|
||||
# would be an empty line otherwise JOBS is prepared string of flag with value:
|
||||
# "-j N"
|
||||
# Note, that the following works even if make was called with "-j N" or even
|
||||
# "--jobs N", as all these variants becomes simply "-jN" in MAKEFLAGS variable.
|
||||
JOBS=$(echo "$MAKEFLAGS" | sed -n 's/\(^\|.* \)-j\([0-9]\+\)\( .*\|$\)/-j \2/p')
|
||||
|
||||
ret=0
|
||||
for fmt in $format_list ; do
|
||||
${PYTHON} ./check $JOBS -tap -$fmt $group || ret=1
|
||||
done
|
||||
|
||||
exit $ret
|
|
@ -39,7 +39,7 @@ docker-qemu-src: $(DOCKER_SRC_COPY)
|
|||
# General rule for building docker images.
|
||||
docker-image-%: $(DOCKER_FILES_DIR)/%.docker
|
||||
$(call quiet-command, \
|
||||
$(RUNC) build \
|
||||
DOCKER_BUILDKIT=1 $(RUNC) build \
|
||||
$(if $V,,--quiet) \
|
||||
$(if $(NOCACHE),--no-cache, \
|
||||
$(if $(DOCKER_REGISTRY),--cache-from $(DOCKER_REGISTRY)/qemu/$*)) \
|
||||
|
|
|
@ -26,9 +26,23 @@ from findtests import TestFinder
|
|||
from testenv import TestEnv
|
||||
from testrunner import TestRunner
|
||||
|
||||
def get_default_path(follow_link=False):
|
||||
"""
|
||||
Try to automagically figure out the path we are running from.
|
||||
"""
|
||||
# called from the build tree?
|
||||
if os.path.islink(sys.argv[0]):
|
||||
if follow_link:
|
||||
return os.path.dirname(os.readlink(sys.argv[0]))
|
||||
else:
|
||||
return os.path.dirname(os.path.abspath(sys.argv[0]))
|
||||
else: # or source tree?
|
||||
return os.getcwd()
|
||||
|
||||
def make_argparser() -> argparse.ArgumentParser:
|
||||
p = argparse.ArgumentParser(description="Test run options")
|
||||
p = argparse.ArgumentParser(
|
||||
description="Test run options",
|
||||
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
|
||||
|
||||
p.add_argument('-n', '--dry-run', action='store_true',
|
||||
help='show me, do not run tests')
|
||||
|
@ -113,6 +127,11 @@ def make_argparser() -> argparse.ArgumentParser:
|
|||
'middle of the process.')
|
||||
g_sel.add_argument('tests', metavar='TEST_FILES', nargs='*',
|
||||
help='tests to run, or "--" followed by a command')
|
||||
g_sel.add_argument('--build-dir', default=get_default_path(),
|
||||
help='Path to iotests build directory')
|
||||
g_sel.add_argument('--source-dir',
|
||||
default=get_default_path(follow_link=True),
|
||||
help='Path to iotests build directory')
|
||||
|
||||
return p
|
||||
|
||||
|
@ -120,11 +139,14 @@ def make_argparser() -> argparse.ArgumentParser:
|
|||
if __name__ == '__main__':
|
||||
args = make_argparser().parse_args()
|
||||
|
||||
env = TestEnv(imgfmt=args.imgfmt, imgproto=args.imgproto,
|
||||
env = TestEnv(source_dir=args.source_dir,
|
||||
build_dir=args.build_dir,
|
||||
imgfmt=args.imgfmt, imgproto=args.imgproto,
|
||||
aiomode=args.aiomode, cachemode=args.cachemode,
|
||||
imgopts=args.imgopts, misalign=args.misalign,
|
||||
debug=args.debug, valgrind=args.valgrind,
|
||||
gdb=args.gdb, qprint=args.print)
|
||||
gdb=args.gdb, qprint=args.print,
|
||||
dry_run=args.dry_run)
|
||||
|
||||
if len(sys.argv) > 1 and sys.argv[-len(args.tests)-1] == '--':
|
||||
if not args.tests:
|
||||
|
@ -162,7 +184,7 @@ if __name__ == '__main__':
|
|||
sys.exit(str(e))
|
||||
|
||||
if args.dry_run:
|
||||
print('\n'.join(tests))
|
||||
print('\n'.join([os.path.basename(t) for t in tests]))
|
||||
else:
|
||||
with TestRunner(env, tap=args.tap,
|
||||
color=args.color) as tr:
|
||||
|
|
|
@ -32,16 +32,39 @@ foreach k, v : emulators
|
|||
endif
|
||||
endforeach
|
||||
|
||||
qemu_iotests_check_cmd = files('check')
|
||||
|
||||
foreach format, speed: qemu_iotests_formats
|
||||
if speed == 'quick'
|
||||
suites = 'block'
|
||||
else
|
||||
suites = ['block-' + speed, speed]
|
||||
endif
|
||||
test('qemu-iotests ' + format, sh, args: [files('../check-block.sh'), format],
|
||||
depends: qemu_iotests_binaries, env: qemu_iotests_env,
|
||||
protocol: 'tap',
|
||||
suite: suites,
|
||||
timeout: 0,
|
||||
is_parallel: false)
|
||||
|
||||
args = ['-tap', '-' + format]
|
||||
if speed == 'quick'
|
||||
args += ['-g', 'auto']
|
||||
endif
|
||||
|
||||
rc = run_command(
|
||||
[qemu_iotests_check_cmd] + args + ['-n'],
|
||||
check: true,
|
||||
)
|
||||
|
||||
foreach item: rc.stdout().strip().split()
|
||||
args = ['-tap', '-' + format, item,
|
||||
'--source-dir', meson.current_source_dir(),
|
||||
'--build-dir', meson.current_build_dir()]
|
||||
# Some individual tests take as long as 45 seconds
|
||||
# Bump the timeout to 3 minutes for some headroom
|
||||
# on slow machines to minimize spurious failures
|
||||
test('io-' + format + '-' + item,
|
||||
qemu_iotests_check_cmd,
|
||||
args: args,
|
||||
depends: qemu_iotests_binaries,
|
||||
env: qemu_iotests_env,
|
||||
protocol: 'tap',
|
||||
timeout: 180,
|
||||
suite: suites)
|
||||
endforeach
|
||||
endforeach
|
||||
|
|
|
@ -170,14 +170,16 @@ class TestEnv(ContextManager['TestEnv']):
|
|||
if not isxfile(b):
|
||||
sys.exit('Not executable: ' + b)
|
||||
|
||||
def __init__(self, imgfmt: str, imgproto: str, aiomode: str,
|
||||
def __init__(self, source_dir: str, build_dir: str,
|
||||
imgfmt: str, imgproto: str, aiomode: str,
|
||||
cachemode: Optional[str] = None,
|
||||
imgopts: Optional[str] = None,
|
||||
misalign: bool = False,
|
||||
debug: bool = False,
|
||||
valgrind: bool = False,
|
||||
gdb: bool = False,
|
||||
qprint: bool = False) -> None:
|
||||
qprint: bool = False,
|
||||
dry_run: bool = False) -> None:
|
||||
self.imgfmt = imgfmt
|
||||
self.imgproto = imgproto
|
||||
self.aiomode = aiomode
|
||||
|
@ -211,18 +213,16 @@ class TestEnv(ContextManager['TestEnv']):
|
|||
# which are needed to initialize some environment variables. They are
|
||||
# used by init_*() functions as well.
|
||||
|
||||
if os.path.islink(sys.argv[0]):
|
||||
# called from the build tree
|
||||
self.source_iotests = os.path.dirname(os.readlink(sys.argv[0]))
|
||||
self.build_iotests = os.path.dirname(os.path.abspath(sys.argv[0]))
|
||||
else:
|
||||
# called from the source tree
|
||||
self.source_iotests = os.getcwd()
|
||||
self.build_iotests = self.source_iotests
|
||||
self.source_iotests = source_dir
|
||||
self.build_iotests = build_dir
|
||||
|
||||
self.build_root = os.path.join(self.build_iotests, '..', '..')
|
||||
|
||||
self.init_directories()
|
||||
|
||||
if dry_run:
|
||||
return
|
||||
|
||||
self.init_binaries()
|
||||
|
||||
self.malloc_perturb_ = os.getenv('MALLOC_PERTURB_',
|
||||
|
|
|
@ -24,12 +24,10 @@ import difflib
|
|||
import subprocess
|
||||
import contextlib
|
||||
import json
|
||||
import termios
|
||||
import shutil
|
||||
import sys
|
||||
from multiprocessing import Pool
|
||||
from contextlib import contextmanager
|
||||
from typing import List, Optional, Iterator, Any, Sequence, Dict, \
|
||||
from typing import List, Optional, Any, Sequence, Dict, \
|
||||
ContextManager
|
||||
|
||||
from testenv import TestEnv
|
||||
|
@ -56,22 +54,6 @@ def file_diff(file1: str, file2: str) -> List[str]:
|
|||
return res
|
||||
|
||||
|
||||
# We want to save current tty settings during test run,
|
||||
# since an aborting qemu call may leave things screwed up.
|
||||
@contextmanager
|
||||
def savetty() -> Iterator[None]:
|
||||
isterm = sys.stdin.isatty()
|
||||
if isterm:
|
||||
fd = sys.stdin.fileno()
|
||||
attr = termios.tcgetattr(fd)
|
||||
|
||||
try:
|
||||
yield
|
||||
finally:
|
||||
if isterm:
|
||||
termios.tcsetattr(fd, termios.TCSADRAIN, attr)
|
||||
|
||||
|
||||
class LastElapsedTime(ContextManager['LastElapsedTime']):
|
||||
""" Cache for elapsed time for tests, to show it during new test run
|
||||
|
||||
|
@ -169,7 +151,6 @@ class TestRunner(ContextManager['TestRunner']):
|
|||
self._stack = contextlib.ExitStack()
|
||||
self._stack.enter_context(self.env)
|
||||
self._stack.enter_context(self.last_elapsed)
|
||||
self._stack.enter_context(savetty())
|
||||
return self
|
||||
|
||||
def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None:
|
||||
|
@ -247,13 +228,11 @@ class TestRunner(ContextManager['TestRunner']):
|
|||
|
||||
return f'{test}.out'
|
||||
|
||||
def do_run_test(self, test: str, mp: bool) -> TestResult:
|
||||
def do_run_test(self, test: str) -> TestResult:
|
||||
"""
|
||||
Run one test
|
||||
|
||||
:param test: test file path
|
||||
:param mp: if true, we are in a multiprocessing environment, use
|
||||
personal subdirectories for test run
|
||||
|
||||
Note: this method may be called from subprocess, so it does not
|
||||
change ``self`` object in any way!
|
||||
|
@ -276,12 +255,14 @@ class TestRunner(ContextManager['TestRunner']):
|
|||
|
||||
args = [str(f_test.resolve())]
|
||||
env = self.env.prepare_subprocess(args)
|
||||
if mp:
|
||||
# Split test directories, so that tests running in parallel don't
|
||||
# break each other.
|
||||
for d in ['TEST_DIR', 'SOCK_DIR']:
|
||||
env[d] = os.path.join(env[d], f_test.name)
|
||||
Path(env[d]).mkdir(parents=True, exist_ok=True)
|
||||
|
||||
# Split test directories, so that tests running in parallel don't
|
||||
# break each other.
|
||||
for d in ['TEST_DIR', 'SOCK_DIR']:
|
||||
env[d] = os.path.join(
|
||||
env[d],
|
||||
f"{self.env.imgfmt}-{self.env.imgproto}-{f_test.name}")
|
||||
Path(env[d]).mkdir(parents=True, exist_ok=True)
|
||||
|
||||
test_dir = env['TEST_DIR']
|
||||
f_bad = Path(test_dir, f_test.name + '.out.bad')
|
||||
|
@ -294,6 +275,7 @@ class TestRunner(ContextManager['TestRunner']):
|
|||
t0 = time.time()
|
||||
with f_bad.open('w', encoding="utf-8") as f:
|
||||
with subprocess.Popen(args, cwd=str(f_test.parent), env=env,
|
||||
stdin=subprocess.DEVNULL,
|
||||
stdout=f, stderr=subprocess.STDOUT) as proc:
|
||||
try:
|
||||
proc.wait()
|
||||
|
@ -365,7 +347,7 @@ class TestRunner(ContextManager['TestRunner']):
|
|||
testname = os.path.basename(test)
|
||||
print(f'# running {self.env.imgfmt} {testname}')
|
||||
|
||||
res = self.do_run_test(test, mp)
|
||||
res = self.do_run_test(test)
|
||||
|
||||
end = datetime.datetime.now().strftime('%H:%M:%S')
|
||||
self.test_print_one_line(test=test,
|
||||
|
@ -391,6 +373,7 @@ class TestRunner(ContextManager['TestRunner']):
|
|||
casenotrun = []
|
||||
|
||||
if self.tap:
|
||||
print('TAP version 13')
|
||||
self.env.print_env('# ')
|
||||
print('1..%d' % len(tests))
|
||||
else:
|
||||
|
|
|
@ -2462,14 +2462,18 @@ static bool kvm_dirty_ring_supported(void)
|
|||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
const bool has_kvm = qtest_has_accel("kvm");
|
||||
const bool has_uffd = ufd_version_check();
|
||||
const char *arch = qtest_get_arch();
|
||||
bool has_kvm;
|
||||
bool has_uffd;
|
||||
const char *arch;
|
||||
g_autoptr(GError) err = NULL;
|
||||
int ret;
|
||||
|
||||
g_test_init(&argc, &argv, NULL);
|
||||
|
||||
has_kvm = qtest_has_accel("kvm");
|
||||
has_uffd = ufd_version_check();
|
||||
arch = qtest_get_arch();
|
||||
|
||||
/*
|
||||
* On ppc64, the test only works with kvm-hv, but not with kvm-pr and TCG
|
||||
* is touchy due to race conditions on dirty bits (especially on PPC for
|
||||
|
|
|
@ -201,3 +201,10 @@ clean:
|
|||
|
||||
distclean:
|
||||
rm -f config-cc.mak config-target.mak ../config-$(TARGET).mak
|
||||
|
||||
.PHONY: help
|
||||
help:
|
||||
@echo "TCG tests help $(TARGET_NAME)"
|
||||
@echo "Built with $(CC)"
|
||||
@echo "Available tests:"
|
||||
@$(foreach t,$(RUN_TESTS),echo " $t";)
|
||||
|
|
|
@ -106,8 +106,7 @@ class OpenBSDVM(basevm.BaseVM):
|
|||
self.console_wait("Password for root account")
|
||||
self.console_send("%s\n" % self._config["root_pass"])
|
||||
self.console_wait_send("Start sshd(8)", "yes\n")
|
||||
self.console_wait_send("X Window System", "\n")
|
||||
self.console_wait_send("xenodm", "\n")
|
||||
self.console_wait_send("X Window System", "no\n")
|
||||
self.console_wait_send("console to com0", "\n")
|
||||
self.console_wait_send("Which speed", "\n")
|
||||
|
||||
|
@ -124,7 +123,32 @@ class OpenBSDVM(basevm.BaseVM):
|
|||
self.console_wait_send("timezone", "UTC\n")
|
||||
self.console_wait_send("root disk", "\n")
|
||||
self.console_wait_send("(W)hole disk", "\n")
|
||||
self.console_wait_send("(A)uto layout", "\n")
|
||||
self.console_wait_send("(A)uto layout", "c\n")
|
||||
|
||||
# 4000 MB / as /dev/sd0a, at start of disk
|
||||
self.console_wait_send("sd0>", "a a\n")
|
||||
self.console_wait_send("offset:", "\n")
|
||||
self.console_wait_send("size:", "4000M\n")
|
||||
self.console_wait_send("FS type", "4.2BSD\n")
|
||||
self.console_wait_send("mount point:", "/\n")
|
||||
|
||||
# 256 MB swap as /dev/sd0b
|
||||
self.console_wait_send("sd0*>", "a b\n")
|
||||
self.console_wait_send("offset:", "\n")
|
||||
self.console_wait_send("size:", "256M\n")
|
||||
self.console_wait_send("FS type", "swap\n")
|
||||
|
||||
# All remaining space for /home as /dev/sd0d
|
||||
# NB, 'c' isn't allowed to be used.
|
||||
self.console_wait_send("sd0*>", "a d\n")
|
||||
self.console_wait_send("offset:", "\n")
|
||||
self.console_wait_send("size:", "\n")
|
||||
self.console_wait_send("FS type", "4.2BSD\n")
|
||||
self.console_wait_send("mount point:", "/home\n")
|
||||
|
||||
self.console_wait_send("sd0*>", "q\n")
|
||||
self.console_wait_send("Write new label?:", "y\n")
|
||||
|
||||
self.console_wait_send("Location of sets", "cd0\n")
|
||||
self.console_wait_send("Pathname to the sets", "\n")
|
||||
self.console_wait_send("Set name(s)", "\n")
|
||||
|
|
|
@ -46,6 +46,7 @@
|
|||
#include "qemu/cutils.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "qemu/module.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include <Carbon/Carbon.h>
|
||||
#include "hw/core/cpu.h"
|
||||
|
||||
|
|
Loading…
Reference in New Issue